Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea2ef1af authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "Track changes in libcore" into pi-dev

parents 34bfe742 6fd477de

tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java

+3 −3
Original line number Diff line number Diff line
@@ -73,13 +73,13 @@ public class TimeZoneDataTest { 
        CountryTimeZones US = mock(CountryTimeZones.class);

        when(US.getCountryIso()).thenReturn("us");

        when(US.getTimeZoneMappings()).thenReturn(Arrays.asList(

           TimeZoneMapping.createForTests("Unknown/Secret_City", true),

           TimeZoneMapping.createForTests("Unknown/Secret_City2", false)

           TimeZoneMapping.createForTests("Unknown/Secret_City", true, null /* notUsedAfter */),

           TimeZoneMapping.createForTests("Unknown/Secret_City2", false, null /* notUsedAfter */)

        ));

        CountryTimeZones GB = mock(CountryTimeZones.class);

        when(GB.getCountryIso()).thenReturn("gb");

        when(GB.getTimeZoneMappings()).thenReturn(Collections.singletonList(

            TimeZoneMapping.createForTests("Unknown/Secret_City", true)

            TimeZoneMapping.createForTests("Unknown/Secret_City", true, null /* notUsedAfter */)

        ));

        when(mCountryZonesFinder.lookupCountryTimeZonesForZoneId("Unknown/Secret_City"))

                .thenReturn(Arrays.asList(US, GB));