sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-01-31 10:11:17 +00:00
Code Issues Releases Wiki Activity

GooglePhotos: Navigate up only when needed. Use baseclass' selectGalleryFolder

Browse Source
This commit is contained in:
Michael McGeagh 2016-12-02 11:28:38 +00:00
parent 751970f991
commit 393abc267f
2 changed files with 15 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
wlauto/workloads/googlephotos/com.arm.wlauto.uiauto.googlephotos.jar
View File

Binary file not shown.

60
wlauto/workloads/googlephotos/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
View File

@ -54,21 +54,25 @@ public class UiAutomation extends UxPerfUiAutomation {
dismissWelcomeView(); dismissWelcomeView();
closePromotionPopUp(); closePromotionPopUp();
selectWorkingGallery("wa-1"); selectGalleryFolder("wa-1");
selectFirstImage();
gesturesTest(); gesturesTest();
navigateUp(); navigateUp();
selectWorkingGallery("wa-2"); selectGalleryFolder("wa-2");
selectFirstImage();
editPhotoColorTest(); editPhotoColorTest();
closeAndReturn(true); closeAndReturn(true);
navigateUp(); navigateUp();
selectWorkingGallery("wa-3"); selectGalleryFolder("wa-3");
selectFirstImage();
cropPhotoTest(); cropPhotoTest();
closeAndReturn(true); closeAndReturn(true);
navigateUp(); navigateUp();
selectWorkingGallery("wa-4"); selectGalleryFolder("wa-4");
selectFirstImage();
rotatePhotoTest(); rotatePhotoTest();
closeAndReturn(true); closeAndReturn(true);
@ -130,46 +134,8 @@ public class UiAutomation extends UxPerfUiAutomation {
} }
} }
// Helper to click on the wa-working gallery. // Helper to click on the first image
public void selectWorkingGallery(String directory) throws Exception { public void selectFirstImage() throws Exception {
UiObject workdir =
new UiObject(new UiSelector().text(directory)
.className("android.widget.TextView"));
UiScrollable scrollView =
new UiScrollable(new UiSelector().scrollable(true));
// If the wa-working gallery is not present wait for a short time for
// the media server to refresh its index.
boolean discovered = workdir.waitForExists(viewTimeout);
if (!discovered && scrollView.exists()) {
// First check if the wa-working directory is visible on the first
// screen and if not scroll to the bottom of the screen to look for it.
discovered = scrollView.scrollIntoView(workdir);
// If still not discovered scroll back to the top of the screen and
// wait for a longer amount of time for the media server to refresh
// its index.
if (!discovered) {
// scrollView.scrollToBeggining() doesn't work for this
// particular scrollable view so use device method instead
for (int i = 0; i < 10; i++) {
uiDeviceSwipeUp(20);
}
discovered = workdir.waitForExists(TimeUnit.SECONDS.toMillis(60));
// Scroll to the bottom of the screen one last time
if (!discovered) {
discovered = scrollView.scrollIntoView(workdir);
}
}
}
if (discovered) {
workdir.clickAndWaitForNewWindow();
} else {
throw new UiObjectNotFoundException("Could not find folder : " + directory);
}
UiObject photo = UiObject photo =
new UiObject(new UiSelector().resourceId(packageID + "recycler_view") new UiObject(new UiSelector().resourceId(packageID + "recycler_view")
.childSelector(new UiSelector() .childSelector(new UiSelector()
@ -221,9 +187,13 @@ public class UiAutomation extends UxPerfUiAutomation {
} }
public void navigateUp() throws Exception { public void navigateUp() throws Exception {
// Navigate up to go to folder
UiObject navigateUpButton = UiObject navigateUpButton =
clickUiObject(BY_DESC, "Navigate Up", "android.widget.ImageButton", true); clickUiObject(BY_DESC, "Navigate Up", "android.widget.ImageButton", true);
navigateUpButton.clickAndWaitForNewWindow(); // Navigate up again to go to gallery - if it exists
if (navigateUpButton.exists()) {
navigateUpButton.clickAndWaitForNewWindow();
}
} }
private void gesturesTest() throws Exception { private void gesturesTest() throws Exception {