Add tests for SwipePinchDetector.

remoting/android/javatests/src/org/chromium/chromoting/SwipePinchDetectorTest.java

Index: remoting/android/javatests/src/org/chromium/chromoting/SwipePinchDetectorTest.java
diff --git a/remoting/android/javatests/src/org/chromium/chromoting/SwipePinchDetectorTest.java b/remoting/android/javatests/src/org/chromium/chromoting/SwipePinchDetectorTest.java
index 1deee924bc80b94c7cf26485bb9e63b80a93dcdb..be13cb5ef9e625659e9fe31c9f7c7fb85994ea3f 100644
--- a/remoting/android/javatests/src/org/chromium/chromoting/SwipePinchDetectorTest.java
+++ b/remoting/android/javatests/src/org/chromium/chromoting/SwipePinchDetectorTest.java
@@ -4,54 +4,215 @@
 
 package org.chromium.chromoting;
 
+import android.content.Context;
 import android.os.SystemClock;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.view.InputDevice;
 import android.view.MotionEvent;
+import android.view.ViewConfiguration;
 
 import org.chromium.base.test.util.Feature;
 
 /** Tests for {@link SwipePinchDetector}. */
 public class SwipePinchDetectorTest extends InstrumentationTestCase {
     private SwipePinchDetector mDetector;
+    private float mTouchSlop;
     private MotionEvent.PointerProperties[] mPointers;
 
+    // Stores the current finger positions, for convenience in writing tests. These values are
+    // initialized during setUp().
+    private MotionEvent.PointerCoords[] mCurrentPositions;
+
     @Override
     public void setUp() {
-        mDetector = new SwipePinchDetector(getInstrumentation().getTargetContext());
+        Context context = getInstrumentation().getTargetContext();
+        mDetector = new SwipePinchDetector(context);
+        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
         MotionEvent.PointerProperties pointer0 = new MotionEvent.PointerProperties();
         pointer0.id = 0;
         MotionEvent.PointerProperties pointer1 = new MotionEvent.PointerProperties();
         pointer1.id = 1;
         mPointers = new MotionEvent.PointerProperties[] {pointer0, pointer1};
+
+        MotionEvent.PointerCoords position0 = new MotionEvent.PointerCoords();
+        MotionEvent.PointerCoords position1 = new MotionEvent.PointerCoords();
+        mCurrentPositions = new MotionEvent.PointerCoords[] {position0, position1};
+
+        // The starting points are arbitrary, but non-zero to ensure that the tests detect relative,
+        // not absolute, motion.
+        mCurrentPositions[0].x = 100;
+        mCurrentPositions[0].y = 200;
+        mCurrentPositions[1].x = 300;
+        mCurrentPositions[1].y = 400;
     }
 
-    /** Verify that a simple swipe gesture is recognized as a swipe. */
+    /**
+     * Simulates a 2-finger event. The action parameter should be MotionEvent.ACTION_POINTER_DOWN,
+     * MotionEvent.ACTION_MOVE or MotionEvent.ACTION_POINTER_UP.
+     */
+    private void injectEvent(int action) {
+        final long eventTime = SystemClock.uptimeMillis();
+        MotionEvent event = MotionEvent.obtain(eventTime, eventTime, action, 2, mPointers,
+                mCurrentPositions, 0, 0, 1, 1, 0, 0, InputDevice.SOURCE_TOUCHSCREEN, 0);
+        mDetector.onTouchEvent(event);
+    }
+
+    /** Verifies that a simple swipe gesture is recognized as a swipe. */
     @SmallTest
     @Feature({"Chromoting"})
     public void testSwipeRecognition() throws Exception {
-        final long eventTime = SystemClock.uptimeMillis();
-        MotionEvent.PointerCoords p0 = new MotionEvent.PointerCoords();
-        MotionEvent.PointerCoords p1 = new MotionEvent.PointerCoords();
-        p1.x = 50;
-        p1.y = 0;
-        MotionEvent.PointerCoords[] pointerCoords = {p0, p1};
-        MotionEvent event = MotionEvent.obtain(eventTime, eventTime,
-                MotionEvent.ACTION_POINTER_DOWN, 2, mPointers, pointerCoords, 0, 0, 1, 1, 0, 0,
-                InputDevice.SOURCE_TOUCHSCREEN , 0);
-        mDetector.onTouchEvent(event);
+        injectEvent(MotionEvent.ACTION_POINTER_DOWN);
         assertFalse(mDetector.isSwiping());
         assertFalse(mDetector.isPinching());
 
         // Any distance greater than the touch-slop threshold should work.
-        p0.y += 100;
-        p1.y += 100;
+        mCurrentPositions[0].y += mTouchSlop * 2;
+        mCurrentPositions[1].y += mTouchSlop * 2;
+        injectEvent(MotionEvent.ACTION_MOVE);
+        assertTrue(mDetector.isSwiping());
+        assertFalse(mDetector.isPinching());
+    }
+
+    /** Verifies that a simple pinch gesture is recognized. */
+    @SmallTest
+    @Feature({"Chromoting"})
+    public void testPinchRecognition() throws Exception {
+        injectEvent(MotionEvent.ACTION_POINTER_DOWN);
+        assertFalse(mDetector.isSwiping());
+        assertFalse(mDetector.isPinching());
+
+        // Any distance greater than the touch-slop threshold should work.
+        mCurrentPositions[0].x -= mTouchSlop * 2;
+        mCurrentPositions[1].x += mTouchSlop * 2;
+        injectEvent(MotionEvent.ACTION_MOVE);
+        assertFalse(mDetector.isSwiping());
+        assertTrue(mDetector.isPinching());
+    }
+
+    /** Verifies that motion less than touch-slop does not trigger anything. */
+    @SmallTest
+    @Feature({"Chromoting"})
+    public void testNoMotion() throws Exception {
+        injectEvent(MotionEvent.ACTION_POINTER_DOWN);
+        mCurrentPositions[0].x += mTouchSlop / 2;
+        mCurrentPositions[0].y += mTouchSlop / 2;
+        mCurrentPositions[1].x -= mTouchSlop / 2;
+        mCurrentPositions[1].y -= mTouchSlop / 2;
+        injectEvent(MotionEvent.ACTION_MOVE);
+        assertFalse(mDetector.isSwiping());
+        assertFalse(mDetector.isPinching());
+    }
+
+    /** Verifies that a pinch with one finger stationary is detected. */
+    @SmallTest
+    @Feature({"Chromoting"})
+    public void testOneFingerStationary() throws Exception {
+        injectEvent(MotionEvent.ACTION_POINTER_DOWN);
+
+        // The triggering threshold in this case (one finger stationary) is mTouchSlop * 2;
+        mCurrentPositions[1].x += mTouchSlop * 3;
+        injectEvent(MotionEvent.ACTION_MOVE);
+        assertFalse(mDetector.isSwiping());
+        assertTrue(mDetector.isPinching());
+
+        // Do the same test for the other finger.
+        injectEvent(MotionEvent.ACTION_POINTER_DOWN);
+        mCurrentPositions[0].x += mTouchSlop * 3;
+        injectEvent(MotionEvent.ACTION_MOVE);
+        assertFalse(mDetector.isSwiping());
+        assertTrue(mDetector.isPinching());
+    }
+
+    /**
+     * Verifies that a pinch is recognized, when the fingers cross the motion threshold at
+     * different times.
+     */
+    @SmallTest
+    @Feature({"Chromoting"})
+    public void testUnevenPinch() throws Exception {
+        injectEvent(MotionEvent.ACTION_POINTER_DOWN);
+        for (int i = 0; i < 50; i++) {
+            mCurrentPositions[0].x -= 2;
+            mCurrentPositions[1].x += 3;
+            injectEvent(MotionEvent.ACTION_MOVE);
+        }
+
+        assertFalse(mDetector.isSwiping());
+        assertTrue(mDetector.isPinching());
+    }
+
+    /** Same test as testUnevenPinch() except the slow/fast fingers are reversed. */
+    @SmallTest
+    @Feature({"Chromoting"})
+    public void testUnevenPinch2() throws Exception {
+        injectEvent(MotionEvent.ACTION_POINTER_DOWN);
+        for (int i = 0; i < 50; i++) {
+            mCurrentPositions[0].x -= 3;
+            mCurrentPositions[1].x += 2;
+            injectEvent(MotionEvent.ACTION_MOVE);
+        }
+
+        assertFalse(mDetector.isSwiping());
+        assertTrue(mDetector.isPinching());
+    }
+
+    /** Verifies that a swipe is recognized, even if the fingers move at different rates. */
+    @SmallTest
+    @Feature({"Chromoting"})
+    public void testUnevenSwipe() throws Exception {
+        injectEvent(MotionEvent.ACTION_POINTER_DOWN);
+        for (int i = 0; i < 50; i++) {
+            // The fingers need to move similarly enough so that one finger moves a distance of
+            // 2 * mTouchSlop after the other finger moves a distance of mTouchSlop.
+            // Otherwise the gesture would be mis-detected as a one-finger-stationary pinch.
+            mCurrentPositions[0].y += 2;
+            mCurrentPositions[1].y += 3;
+            injectEvent(MotionEvent.ACTION_MOVE);
+        }
+
+        assertTrue(mDetector.isSwiping());
+        assertFalse(mDetector.isPinching());
+    }
+
+    /** Same test as testUnevenSwipe() except the slow/fast fingers are reversed. */
+    @SmallTest
+    @Feature({"Chromoting"})
+    public void testUnevenSwipe2() throws Exception {
+        injectEvent(MotionEvent.ACTION_POINTER_DOWN);
+        for (int i = 0; i < 50; i++) {
+            // The fingers need to move similarly enough so that one finger moves a distance of
+            // 2 * mTouchSlop after the other finger moves a distance of mTouchSlop.
+            // Otherwise the gesture would be mis-detected as a one-finger-stationary pinch.
+            mCurrentPositions[0].y += 3;
+            mCurrentPositions[1].y += 2;
+            injectEvent(MotionEvent.ACTION_MOVE);
+        }
 
-        event = MotionEvent.obtain(eventTime, eventTime, MotionEvent.ACTION_MOVE, 2, mPointers,
-                pointerCoords, 0, 0, 1, 1, 0, 0, InputDevice.SOURCE_TOUCHSCREEN , 0);
-        mDetector.onTouchEvent(event);
         assertTrue(mDetector.isSwiping());
         assertFalse(mDetector.isPinching());
     }
+
+    /** Verifies that the detector is reset when a gesture terminates or a new gesture begins. */
+    @SmallTest
+    @Feature({"Chromoting"})
+    public void testDetectorReset() throws Exception {
+        injectEvent(MotionEvent.ACTION_POINTER_DOWN);
+        mCurrentPositions[0].x += mTouchSlop * 3;
+        injectEvent(MotionEvent.ACTION_MOVE);
+        assertTrue(mDetector.isPinching());
+
+        // ACTION_POINTER_UP should terminate the gesture.
+        injectEvent(MotionEvent.ACTION_POINTER_UP);
+        assertFalse(mDetector.isPinching());
+
+        // Repeat the same test, but use ACTION_POINTER_DOWN to start a new gesture, which should
+        // terminate the current one.
+        injectEvent(MotionEvent.ACTION_POINTER_DOWN);
+        mCurrentPositions[0].x += mTouchSlop * 3;
+        injectEvent(MotionEvent.ACTION_MOVE);
+        assertTrue(mDetector.isPinching());
+        injectEvent(MotionEvent.ACTION_POINTER_DOWN);
+        assertFalse(mDetector.isPinching());
+    }
 }