CTS changes to match changing a11y gestures.

Bug: 28378216
Change-Id: I116679c1ac25354b0c41f2fdbfafeeda59e4e017

tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityGestureDispatchTest.java

diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityGestureDispatchTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityGestureDispatchTest.java
index 7da7d37..df48a61 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityGestureDispatchTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityGestureDispatchTest.java
@@ -84,12 +84,11 @@
         GestureDescription click = createClick(clickX, clickY);
         mService.runOnServiceSync(() -> mService.doDispatchGesture(click, mCallback, null));
         mCallback.assertGestureCompletes(GESTURE_COMPLETION_TIMEOUT);
-        waitForMotionEvents(3);
+        waitForMotionEvents(2);
 
-        assertEquals(3, mMotionEvents.size());
+        assertEquals(2, mMotionEvents.size());
         MotionEvent clickDown = mMotionEvents.get(0);
-        MotionEvent clickMove = mMotionEvents.get(1);
-        MotionEvent clickUp = mMotionEvents.get(2);
+        MotionEvent clickUp = mMotionEvents.get(1);
 
         assertEquals(MotionEvent.ACTION_DOWN, clickDown.getActionMasked());
         assertEquals(0, clickDown.getActionIndex());
@@ -103,23 +102,13 @@
         assertEquals((float) clickYInsideView, clickDown.getY());
         assertEquals(clickDown.getDownTime(), clickDown.getEventTime());
 
-        assertEquals(MotionEvent.ACTION_MOVE, clickMove.getActionMasked());
-        assertEquals(clickDown.getDownTime(), clickMove.getDownTime());
-        assertEquals(ViewConfiguration.getTapTimeout(),
-                clickMove.getEventTime() - clickMove.getDownTime());
-        assertEquals(0, clickMove.getActionIndex());
-        assertEquals(1, clickMove.getPointerCount());
-        assertEquals((float) clickXInsideView + 1, clickMove.getX());
-        assertEquals((float) clickYInsideView, clickMove.getY());
-        assertEquals(clickDown.getPointerId(0),
-                clickMove.getPointerId(0));
-
         assertEquals(MotionEvent.ACTION_UP, clickUp.getActionMasked());
         assertEquals(clickDown.getDownTime(), clickUp.getDownTime());
-        assertEquals(clickMove.getEventTime(), clickUp.getEventTime());
+        assertEquals(ViewConfiguration.getTapTimeout(),
+                clickUp.getEventTime() - clickUp.getDownTime());
         assertTrue(clickDown.getEventTime() + ViewConfiguration.getLongPressTimeout()
                 > clickUp.getEventTime());
-        assertEquals((float) clickXInsideView + 1, clickUp.getX());
+        assertEquals((float) clickXInsideView, clickUp.getX());
         assertEquals((float) clickYInsideView, clickUp.getY());
     }
 
@@ -133,27 +122,20 @@
         mCallback.assertGestureCompletes(
                 ViewConfiguration.getLongPressTimeout() + GESTURE_COMPLETION_TIMEOUT);
 
-        waitForMotionEvents(3);
+        waitForMotionEvents(2);
         MotionEvent clickDown = mMotionEvents.get(0);
-        MotionEvent clickMove = mMotionEvents.get(1);
-        MotionEvent clickUp = mMotionEvents.get(2);
+        MotionEvent clickUp = mMotionEvents.get(1);
 
         assertEquals(MotionEvent.ACTION_DOWN, clickDown.getActionMasked());
 
         assertEquals((float) clickXInsideView, clickDown.getX());
         assertEquals((float) clickYInsideView, clickDown.getY());
 
-        assertEquals(MotionEvent.ACTION_MOVE, clickMove.getActionMasked());
-        assertEquals(clickDown.getDownTime(), clickMove.getDownTime());
-        assertEquals((float) clickXInsideView + 1, clickMove.getX());
-        assertEquals((float) clickYInsideView, clickMove.getY());
-        assertEquals(clickDown.getPointerId(0), clickMove.getPointerId(0));
-
         assertEquals(MotionEvent.ACTION_UP, clickUp.getActionMasked());
         assertTrue(clickDown.getEventTime() + ViewConfiguration.getLongPressTimeout()
                 <= clickUp.getEventTime());
         assertEquals(clickDown.getDownTime(), clickUp.getDownTime());
-        assertEquals((float) clickXInsideView + 1, clickUp.getX());
+        assertEquals((float) clickXInsideView, clickUp.getX());
         assertEquals((float) clickYInsideView, clickUp.getY());
     }
 
@@ -349,22 +331,17 @@
             assertTrue("Failed to reset", result.get());
         }
 
-        assertEquals(3, mMotionEvents.size());
+        assertEquals(2, mMotionEvents.size());
         MotionEvent clickDown = mMotionEvents.get(0);
-        MotionEvent clickMove = mMotionEvents.get(1);
-        MotionEvent clickUp = mMotionEvents.get(2);
+        MotionEvent clickUp = mMotionEvents.get(1);
 
         assertEquals(MotionEvent.ACTION_DOWN, clickDown.getActionMasked());
         assertEquals((float) clickXInsideView, clickDown.getX(), TOUCH_TOLERANCE);
         assertEquals((float) clickYInsideView, clickDown.getY(), TOUCH_TOLERANCE);
         assertEquals(clickDown.getDownTime(), clickDown.getEventTime());
 
-        assertEquals(MotionEvent.ACTION_MOVE, clickMove.getActionMasked());
-        assertEquals((float) clickXInsideView + 1, clickMove.getX(), TOUCH_TOLERANCE);
-        assertEquals((float) clickYInsideView, clickMove.getY(), TOUCH_TOLERANCE);
-
         assertEquals(MotionEvent.ACTION_UP, clickUp.getActionMasked());
-        assertEquals((float) clickXInsideView + 1, clickUp.getX(), TOUCH_TOLERANCE);
+        assertEquals((float) clickXInsideView, clickUp.getX(), TOUCH_TOLERANCE);
         assertEquals((float) clickYInsideView, clickUp.getY(), TOUCH_TOLERANCE);
     }
 
@@ -450,7 +427,6 @@
     private GestureDescription createClick(int x, int y) {
         Path clickPath = new Path();
         clickPath.moveTo(x, y);
-        clickPath.lineTo(x + 1, y);
         GestureDescription.StrokeDescription clickStroke =
                 new GestureDescription.StrokeDescription(clickPath, 0, ViewConfiguration.getTapTimeout());
         GestureDescription.Builder clickBuilder = new GestureDescription.Builder();
@@ -461,7 +437,6 @@
     private GestureDescription createLongClick(int x, int y) {
         Path clickPath = new Path();
         clickPath.moveTo(x, y);
-        clickPath.lineTo(x + 1, y);
         int longPressTime = ViewConfiguration.getLongPressTimeout();
 
         GestureDescription.StrokeDescription longClickStroke =

tests/accessibilityservice/src/android/accessibilityservice/cts/GestureDescriptionTest.java

diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/GestureDescriptionTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/GestureDescriptionTest.java
index b3fa9d2..234f66a 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/GestureDescriptionTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/GestureDescriptionTest.java
@@ -93,13 +93,11 @@
         }
     }
 
-    public void testCreateStroke_pathWithZeroLength_shouldThrow() {
-        Path zeroLengthPath = new Path();
-        zeroLengthPath.moveTo(0, 0);
-        zeroLengthPath.lineTo(0, 0);
+    public void testCreateStroke_withEmptyPath_shouldThrow() {
+        Path emptyPath = new Path();
         try {
-            new GestureDescription.StrokeDescription(zeroLengthPath, 0, NOMINAL_PATH_DURATION);
-            fail("Missing exception for stroke with path of zero length.");
+            new GestureDescription.StrokeDescription(emptyPath, 0, NOMINAL_PATH_DURATION);
+            fail("Missing exception for empty path.");
         } catch (IllegalArgumentException e) {
         }
     }