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

Enable new time zone picker

Browse Source 
- Change the UI test due to UI changes

Bug: 73952488
Test: m RunSettingsRoboTest
Test: atest SettingsUITests:ZonePickerSettingsTest
Change-Id: I6d5716347e9debf429b757f1edd4118e86b70fab
(cherry picked from commit 335c0621d2)
This commit is contained in:
Victor Chang
2018-02-28 19:43:03 +00:00
parent 368b5a6b2c
commit 7cf7fe4f9e
2 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
tests/uitests/src/com/android/settings/ui/ZonePickerSettingsTest.java
View File

@@ -32,8 +32,6 @@ import android.support.test.uiautomator.UiSelector;
import android.support.test.uiautomator.Until;
import android.system.helpers.SettingsHelper;
import android.system.helpers.SettingsHelper.SettingsType;
import android.widget.ListView;
import android.widget.Spinner;
import org.junit.After;
import org.junit.Before;
@@ -102,16 +100,16 @@ public class ZonePickerSettingsTest {
// Test 2 time zones with no DST
@Test
public void testSelectReykjavik() throws Exception {
testSelectTimeZone("Iceland", "Reykjavik", "GMT+00:00", "Atlantic/Reykjavik");
testSelectTimeZone("Iceland", "Reykjavik", "GMT+00:00", "Atlantic/Reykjavik", true);
}
@Test
public void testSelectPhoenix() throws Exception {
testSelectTimeZone("United States", "Phoenix", "GMT-07:00", "America/Phoenix");
testSelectTimeZone("United States", "Phoenix", "GMT-07:00", "America/Phoenix", false);
}
private void testSelectTimeZone(String region, String timezone, String expectedTimeZoneOffset,
String expectedTimeZoneId) throws Exception {
String expectedTimeZoneId, boolean assumeOneTimeZoneInRegion) throws Exception {
mHelper.setIntSetting(SettingsType.GLOBAL, Settings.Global.AUTO_TIME_ZONE, 0);
SettingsHelper.launchSettingsPage(
@@ -121,16 +119,21 @@ public class ZonePickerSettingsTest {
assertTrue(selectTimeZone.isEnabled());
selectTimeZone.click();
// Select region in the dropdown list
selectScrollableItem(selectDropDownInSpinner(By.clazz(Spinner.class)),
new UiSelector().textContains(region))
wait(By.text("Region")).click();
// Speed-up the test by searching with the first 2 characters of the region name
wait(By.res("android", "search_src_text")).setText(region.substring(0, 2));
// Select region in the list
selectItemInList(new UiSelector().textContains(region))
.click();
// Select time zone
selectScrollableItem(selectTimeZoneList(),
new UiSelector().textContains(timezone))
.click();
// Only select time zone explicitly if there are more than one time zones in a region
if (!assumeOneTimeZoneInRegion) {
wait(By.text("Time Zone"));
selectItemInList(new UiSelector().textContains(timezone))
.click();
}
mDevice.pressBack();
// The select button should include the GMT offset in the summary
BySelector summarySelector = By.res("android:id/summary");
UiObject2 selectedTimeZone = selectTimeZone.findObject(summarySelector);
@@ -162,21 +165,10 @@ public class ZonePickerSettingsTest {
assertEquals(expectedTimeZoneId, TimeZone.getDefault().getID());
}
/**
* Perform click on {@link Spinner} and return the pop-up dropdown list.
* @return UiScrollable representing the pop-up dropdown after clicking on the spinner
*/
private UiScrollable selectDropDownInSpinner(BySelector spinnerSelector)
throws UiObjectNotFoundException {
UiObject2 spinner = wait(spinnerSelector);
spinner.click();
UiSelector dropDownSelector = new UiSelector().className(ListView.class);
return new UiScrollable(dropDownSelector);
}
private UiScrollable selectTimeZoneList() {
return new UiScrollable(new UiSelector().resourceId(SETTINGS_PACKAGE + ":id/tz_list"));
private UiObject selectItemInList(UiSelector childSelector) throws UiObjectNotFoundException {
UiScrollable recyclerView = new UiScrollable(
new UiSelector().resourceId(SETTINGS_PACKAGE + ":id/recycler_view"));
return selectScrollableItem(recyclerView, childSelector);
}
/**