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 
am: 6a3bac39bf

Change-Id: If54bf59a1969914c9fbbffaf17f4f687e85f2b71
This commit is contained in:
Victor Chang
2018-03-06 19:52:52 +00:00
committed by android-build-merger
parent 2ce9c0f870 6a3bac39bf
commit 1007fe2c0f
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));

45
tests/robotests/src/libcore/util/CountryTimeZones.java
View File

@@ -1,45 +0,0 @@
/*
* Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package libcore.util;
import java.util.List;
/**
* Empty implementation of CountryTimeZones for Robolectric test.
*/
public class CountryTimeZones {
public CountryTimeZones() {
}
public final static class TimeZoneMapping {
public final String timeZoneId;
public final boolean showInPicker;
public TimeZoneMapping(String timeZoneId, boolean showInPicker) {
this.timeZoneId = timeZoneId;
this.showInPicker = showInPicker;
}
}
public List<TimeZoneMapping> getTimeZoneMappings() {
return null;
}
public String getCountryIso() {
return null;
}
}

38
tests/robotests/src/libcore/util/CountryZonesFinder.java
View File

@@ -1,38 +0,0 @@
/*
* Copyright (C) 2018 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package libcore.util;
import java.util.List;
/**
* Empty implementation of CountryZonesFinder for Robolectric test.
*/
public class CountryZonesFinder {
public CountryZonesFinder(List<CountryTimeZones> countryTimeZonesList) {}
public List<String> lookupAllCountryIsoCodes() {
return null;
}
public List<CountryTimeZones> lookupCountryTimeZonesForZoneId(String zoneId) {
return null;
}
public CountryTimeZones lookupCountryTimeZones(String countryIso) {
return null;
}
}