1
0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-04-20 09:40:50 +01:00

Fix inverted swipe up/down gestures

Tested on Chromebook and Mate 8
This commit is contained in:
James Hartley 2016-12-15 15:01:38 +00:00
parent f76c00dd99
commit b4026ae390
4 changed files with 10 additions and 10 deletions

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);
} }

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();
@ -291,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 =