PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Track changes in libcore" into pi-dev am: ea2ef1af44

Browse Source 
am: 082dd24a7e

Change-Id: Id30429da4c06994f92bab507bc2e80ca6040f10c
This commit is contained in:
Neil Fuller
2018-03-15 19:09:56 +00:00
committed by android-build-merger
parent 33f3c7036b 082dd24a7e
commit 42123c413e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,13 +73,13 @@ public class TimeZoneDataTest {
CountryTimeZones US = mock(CountryTimeZones.class); CountryTimeZones US = mock(CountryTimeZones.class);
when(US.getCountryIso()).thenReturn("us"); when(US.getCountryIso()).thenReturn("us");
when(US.getTimeZoneMappings()).thenReturn(Arrays.asList( when(US.getTimeZoneMappings()).thenReturn(Arrays.asList(
TimeZoneMapping.createForTests("Unknown/Secret_City", true), TimeZoneMapping.createForTests("Unknown/Secret_City", true, null /* notUsedAfter */),
TimeZoneMapping.createForTests("Unknown/Secret_City2", false) TimeZoneMapping.createForTests("Unknown/Secret_City2", false, null /* notUsedAfter */)
)); ));
CountryTimeZones GB = mock(CountryTimeZones.class); CountryTimeZones GB = mock(CountryTimeZones.class);
when(GB.getCountryIso()).thenReturn("gb"); when(GB.getCountryIso()).thenReturn("gb");
when(GB.getTimeZoneMappings()).thenReturn(Collections.singletonList( 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")) when(mCountryZonesFinder.lookupCountryTimeZonesForZoneId("Unknown/Secret_City"))
.thenReturn(Arrays.asList(US, GB)); .thenReturn(Arrays.asList(US, GB));