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

Merge "Fix SettingsRoboTests build error with OpenJDK 9" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-06 19:24:48 +00:00
committed by Android (Google) Code Review
parent 59520b028a e10875210a
commit 6a3bac39bf
3 changed files with 3 additions and 86 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);
when(US.getCountryIso()).thenReturn("us");
when(US.getTimeZoneMappings()).thenReturn(Arrays.asList(
new CountryTimeZones.TimeZoneMapping("Unknown/Secret_City", true),
new CountryTimeZones.TimeZoneMapping("Unknown/Secret_City2", false)
TimeZoneMapping.createForTests("Unknown/Secret_City", true),
TimeZoneMapping.createForTests("Unknown/Secret_City2", false)
));
CountryTimeZones GB = mock(CountryTimeZones.class);
when(GB.getCountryIso()).thenReturn("gb");
when(GB.getTimeZoneMappings()).thenReturn(Collections.singletonList(
new TimeZoneMapping("Unknown/Secret_City", true)
TimeZoneMapping.createForTests("Unknown/Secret_City", true)
));
when(mCountryZonesFinder.lookupCountryTimeZonesForZoneId("Unknown/Secret_City"))
.thenReturn(Arrays.asList(US, GB));