sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2024-10-06 19:01:15 +01:00
Code Issues Releases Wiki Activity

Merge pull request #315 from jimboatarm/fix-adobereader

Browse Source 
Fix adobereader
This commit is contained in:
marcbonnici 2016-12-15 17:07:12 +00:00 committed by GitHub
commit e5c0ca85f0
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
wlauto/common/android/BaseUiAutomation.class
View File

Binary file not shown.

8
wlauto/external/uiauto/src/com/arm/wlauto/uiauto/BaseUiAutomation.java vendored
View File

@ -274,19 +274,19 @@ public class BaseUiAutomation extends UiAutomatorTestCase {
public void uiDeviceSwipeUp(int steps) { public void uiDeviceSwipeUp(int steps) {
UiDevice.getInstance().swipe( UiDevice.getInstance().swipe(
getDisplayCentreWidth(),
(getDisplayCentreHeight() / 2),
getDisplayCentreWidth(), getDisplayCentreWidth(),
(getDisplayCentreHeight() + (getDisplayCentreHeight() / 2)), (getDisplayCentreHeight() + (getDisplayCentreHeight() / 2)),
getDisplayCentreWidth(),
(getDisplayCentreHeight() / 2),
steps); steps);
} }
public void uiDeviceSwipeDown(int steps) { public void uiDeviceSwipeDown(int steps) {
UiDevice.getInstance().swipe( UiDevice.getInstance().swipe(
getDisplayCentreWidth(),
(getDisplayCentreHeight() + (getDisplayCentreHeight() / 2)),
getDisplayCentreWidth(), getDisplayCentreWidth(),
(getDisplayCentreHeight() / 2), (getDisplayCentreHeight() / 2),
getDisplayCentreWidth(),
(getDisplayCentreHeight() + (getDisplayCentreHeight() / 2)),
steps); steps);
} }

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

Binary file not shown.

21
wlauto/workloads/adobereader/uiauto/src/com/arm/wlauto/uiauto/UiAutomation.java
View File

@ -71,11 +71,11 @@ public class UiAutomation extends UxPerfUiAutomation {
UiObject onboarding_finish_button = UiObject onboarding_finish_button =
new UiObject(new UiSelector().resourceId("com.adobe.reader:id/onboarding_finish_button")); new UiObject(new UiSelector().resourceId("com.adobe.reader:id/onboarding_finish_button"));
if (!onboarding_finish_button.exists()) { if (!onboarding_finish_button.exists()) {
welcomeView.swipeLeft(10); welcomeView.swipeLeft(10);
} }
clickUiObject(BY_ID, packageID + "onboarding_finish_button", "android.widget.Button"); clickUiObject(BY_ID, packageID + "onboarding_finish_button", "android.widget.Button");
// Deal with popup dialog message promoting Dropbox access // Deal with popup dialog message promoting Dropbox access
@ -102,7 +102,7 @@ public class UiAutomation extends UxPerfUiAutomation {
private void openFile(final String filename) throws Exception { private void openFile(final String filename) throws Exception {
String testTag = "open_document"; String testTag = "open_document";
ActionLogger logger = new ActionLogger(testTag, parameters); ActionLogger logger = new ActionLogger(testTag, parameters);
// Select the local files list from the My Documents view // Select the local files list from the My Documents view
clickUiObject(BY_TEXT, "LOCAL", "android.widget.TextView"); clickUiObject(BY_TEXT, "LOCAL", "android.widget.TextView");
UiObject directoryPath = UiObject directoryPath =
@ -147,8 +147,8 @@ public class UiAutomation extends UxPerfUiAutomation {
// Perform a range of swipe tests at different speeds and on different views // Perform a range of swipe tests at different speeds and on different views
LinkedHashMap<String, GestureTestParams> testParams = new LinkedHashMap<String, GestureTestParams>(); LinkedHashMap<String, GestureTestParams> testParams = new LinkedHashMap<String, GestureTestParams>();
testParams.put("swipe_down", new GestureTestParams(GestureType.UIDEVICE_SWIPE, Direction.DOWN, 100));
testParams.put("swipe_up", new GestureTestParams(GestureType.UIDEVICE_SWIPE, Direction.UP, 100)); testParams.put("swipe_up", new GestureTestParams(GestureType.UIDEVICE_SWIPE, Direction.UP, 100));
testParams.put("swipe_down", new GestureTestParams(GestureType.UIDEVICE_SWIPE, Direction.DOWN, 100));
testParams.put("swipe_right", new GestureTestParams(GestureType.UIOBJECT_SWIPE, Direction.RIGHT, 50)); testParams.put("swipe_right", new GestureTestParams(GestureType.UIOBJECT_SWIPE, Direction.RIGHT, 50));
testParams.put("swipe_left", new GestureTestParams(GestureType.UIOBJECT_SWIPE, Direction.LEFT, 50)); testParams.put("swipe_left", new GestureTestParams(GestureType.UIOBJECT_SWIPE, Direction.LEFT, 50));
testParams.put("pinch_out", new GestureTestParams(GestureType.PINCH, PinchType.OUT, 100, 50)); testParams.put("pinch_out", new GestureTestParams(GestureType.PINCH, PinchType.OUT, 100, 50));
@ -246,7 +246,7 @@ public class UiAutomation extends UxPerfUiAutomation {
logger.stop(); logger.stop();
// Get back to the main document view by clicking twice on the close button // Get back to the main document view by clicking twice on the close button
UiObject searchCloseButton = UiObject searchCloseButton =
new UiObject(new UiSelector().resourceIdMatches(".*search_close_btn") new UiObject(new UiSelector().resourceIdMatches(".*search_close_btn")
.className("android.widget.ImageView")); .className("android.widget.ImageView"));
searchCloseButton.click(); searchCloseButton.click();
@ -266,7 +266,7 @@ public class UiAutomation extends UxPerfUiAutomation {
// Return from the document view to the file list view by pressing home and my documents. // Return from the document view to the file list view by pressing home and my documents.
UiObject actionBar = UiObject actionBar =
new UiObject(new UiSelector().resourceIdMatches(".*action_bar.*") new UiObject(new UiSelector().resourceIdMatches(".*action_bar.*")
.className("android.view.View")); .classNameMatches("android.view.View.*"));
if (!actionBar.exists()){ if (!actionBar.exists()){
tapDisplayCentre(); tapDisplayCentre();
} }
@ -274,14 +274,13 @@ public class UiAutomation extends UxPerfUiAutomation {
UiObject homeButton = UiObject homeButton =
new UiObject(new UiSelector().resourceId("android:id/home") new UiObject(new UiSelector().resourceId("android:id/home")
.className("android.widget.ImageView")); .className("android.widget.ImageView"));
// Newer version of app have a menu button instead of home button.
//Newer version of app have a menu button instead of home button.
UiObject menuButton = UiObject menuButton =
new UiObject(new UiSelector().description("Navigate up") new UiObject(new UiSelector().description("Navigate up")
.classNameMatches("android.widget.Image.*")); .classNameMatches("android.widget.Image.*"));
if (menuButton.exists()){ if (homeButton.exists()){
menuButton.clickAndWaitForNewWindow(); homeButton.clickAndWaitForNewWindow();
} }
else if (menuButton.exists()){ else if (menuButton.exists()){
menuButton.clickAndWaitForNewWindow(); menuButton.clickAndWaitForNewWindow();
@ -292,7 +291,7 @@ public class UiAutomation extends UxPerfUiAutomation {
.classNameMatches("android.widget.Image.*")); .classNameMatches("android.widget.Image.*"));
menuButton.clickAndWaitForNewWindow(); menuButton.clickAndWaitForNewWindow();
} }
clickUiObject(BY_DESC, "My Documents", "android.widget.LinearLayout", true); clickUiObject(BY_DESC, "My Documents", "android.widget.LinearLayout", true);
UiObject searchBackButton = UiObject searchBackButton =