commit b78af3a57a966eec0e3c41983a1a72216f10f0d8
author Allen Hair <allenhair@google.com> Fri Nov 08 22:03:10 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 08 22:03:11 2013 +0000
tree 24eea543fdbf26768a1d5dc217017f696d267db8
parent 461806f0eb9c2ba96fef95898775864f41f98b2e
parent 0cc7943b871f170e8344889ead5c1db06dae84f9

Merge "Fixed testPinchIn to calculate expected touch down points correctly." into klp-dev

tests/uiautomator/src/com/android/cts/uiautomatortest/CtsUiAutomatorTest.java

diff --git a/tests/uiautomator/src/com/android/cts/uiautomatortest/CtsUiAutomatorTest.java b/tests/uiautomator/src/com/android/cts/uiautomatortest/CtsUiAutomatorTest.java
index 8c3cc8f..7e44e49 100644
--- a/tests/uiautomator/src/com/android/cts/uiautomatortest/CtsUiAutomatorTest.java
+++ b/tests/uiautomator/src/com/android/cts/uiautomatortest/CtsUiAutomatorTest.java
@@ -51,6 +51,9 @@
 
     private static final String SCREEN_SHOT_FILE_PATH_NAME = "/data/local/tmp/ctsScreenShot";
 
+    // Should match the value defined in UiObject
+    private static final int FINGER_TOUCH_HALF_WIDTH = 20;
+
     @Override
     protected void setUp() throws Exception {
         super.setUp();
@@ -885,10 +888,10 @@
                 withinMarginOfError(0.1f, screenRect.right, p2s.x));
 
         assertTrue("Touch-up X coordinate for pointer 1 is invalid",
-                withinMarginOfError(0.1f, screenRect.centerX(), p1e.x));
+                withinMarginOfError(0.1f, screenRect.centerX() - FINGER_TOUCH_HALF_WIDTH, p1e.x));
 
         assertTrue("Touch-up X coordinate for pointer 2 is invalid",
-                withinMarginOfError(0.1f, screenRect.centerX(), p2e.x));
+                withinMarginOfError(0.1f, screenRect.centerX() + FINGER_TOUCH_HALF_WIDTH, p2e.x));
     }
 
     /**