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

Commit 1d45573e authored by Neil Fuller's avatar Neil Fuller Committed by Gerrit Code Review
Browse files

Merge "Track core platform API change"

parents 46a50b35 d1c4ea90

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

+10 −5
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.when;



import static java.util.Collections.emptyList;



import com.android.i18n.timezone.CountryTimeZones;

import com.android.i18n.timezone.CountryTimeZones.TimeZoneMapping;

import com.android.i18n.timezone.CountryZonesFinder;
@@ -49,7 +51,7 @@ public class TimeZoneDataTest { 
    public void testRegionsWithTimeZone() {

        TimeZoneData timeZoneData = new TimeZoneData(mCountryZonesFinder);

        CountryTimeZones countryTimeZones = mock(CountryTimeZones.class);

        when(countryTimeZones.getTimeZoneMappings()).thenReturn(Collections.emptyList());

        when(countryTimeZones.getTimeZoneMappings()).thenReturn(emptyList());

        when(mCountryZonesFinder.lookupCountryTimeZones("US")).thenReturn(countryTimeZones);

        assertThat(timeZoneData.lookupCountryTimeZones("US").getCountryTimeZones())

                .isSameAs(countryTimeZones);
@@ -57,7 +59,7 @@ public class TimeZoneDataTest { 


    @Test

    public void testGetRegionIds() {

        when(mCountryZonesFinder.lookupAllCountryIsoCodes()).thenReturn(Collections.emptyList());

        when(mCountryZonesFinder.lookupAllCountryIsoCodes()).thenReturn(emptyList());

        TimeZoneData timeZoneData = new TimeZoneData(mCountryZonesFinder);

        assertThat(timeZoneData.getRegionIds()).isEmpty();
@@ -73,13 +75,16 @@ 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, null /* notUsedAfter */),

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

                TimeZoneMapping.createForTests(

                        "Unknown/Secret_City", true, null /* notUsedAfter */, emptyList()),

                TimeZoneMapping.createForTests(

                        "Unknown/Secret_City2", false, null /* notUsedAfter */, emptyList())

        ));

        CountryTimeZones GB = mock(CountryTimeZones.class);

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

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

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

                TimeZoneMapping.createForTests(

                        "Unknown/Secret_City", true, null /* notUsedAfter */, emptyList())

        ));

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

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