[Embeddingapi] Fix canZoomInOnUiThread fail issue

Impacted tests(approved): new 0, update 2, delete 0 Unit test platform: Crosswalk Project for Android 21.50.537.0 Unit test result summary: pass 2, fail 0, block 0 BUG=https://crosswalk-project.org/jira/browse/CTS-1769
crosswalk-project · Jun 24, 2016 · 5b4fb35 · 5b4fb35
1 parent af6e21b
commit 5b4fb35
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/...edding-api-android-tests/embeddingapi/src/org/xwalk/embedding/base/XWalkViewTestBase.java b/...edding-api-android-tests/embeddingapi/src/org/xwalk/embedding/base/XWalkViewTestBase.java
@@ -558,7 +558,7 @@ public boolean isSatisfied() {
                     return false;
                 }
             }
-        });
+        }, WAIT_TIMEOUT_MS, CHECK_INTERVAL);
     }
 
     protected void checkHistoryItemList(XWalkView restoreXWalkView) throws Throwable {
@@ -1529,4 +1529,13 @@ public String call() throws Exception {
             }
         });
     }
+
+    protected void waitForScaleToBecome(final float expectedScale) throws Throwable {
+    	pollOnUiThread(new Callable<Boolean>() {
+            @Override
+            public Boolean call() throws Exception {
+                return expectedScale == getPixelScale();
+            }
+        });
+    }
 }
diff --git a/...bedding-api-android-tests/embeddingapi/src/org/xwalk/embedding/test/v5/XWalkViewTest.java b/...bedding-api-android-tests/embeddingapi/src/org/xwalk/embedding/test/v5/XWalkViewTest.java
@@ -13,7 +13,6 @@
 import org.xwalk.embedding.base.XWalkViewTestBase;
 import android.annotation.SuppressLint;
 import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Pair;
 
 
@@ -146,16 +145,10 @@ public void testOnCanZoomInAndOut() {
         try {
             final float mPageMinimumScale = 0.5f;
             String url = "file:///android_asset/zoom.html";
+            setUseWideViewPortOnUiThreadByXWalkView(true, mXWalkView);
             assertFalse("Should not be able to zoom in", canZoomInOnUiThread());
             loadUrlSync(url);
-            pollOnUiThread(new Callable<Boolean>() {
-                @Override
-                public Boolean call() throws Exception {
-                    return mPageMinimumScale == mTestHelperBridge.getOnScaleChangedHelper().getNewScale();
-                }
-            });
-
-            Thread.sleep(500);
+            waitForScaleToBecome(mPageMinimumScale);
 
             assertTrue("Should be able to zoom in", canZoomInOnUiThread());
             assertFalse("Should not be able to zoom out", canZoomOutOnUiThread());
@@ -164,7 +157,6 @@ public Boolean call() throws Exception {
             assertTrue(false);
             e.printStackTrace();
         } catch (Throwable e) {
-            // TODO: handle exception
             assertTrue(false);
             e.printStackTrace();
         }

diff --git a/...i-android-tests/embeddingapi/src/org/xwalk/embedding/asynctest/v5/XWalkViewTestAsync.java b/...i-android-tests/embeddingapi/src/org/xwalk/embedding/asynctest/v5/XWalkViewTestAsync.java
@@ -146,16 +146,10 @@ public void testOnCanZoomInAndOut() {
         try {
             final float mPageMinimumScale = 0.5f;
             String url = "file:///android_asset/zoom.html";
+            setUseWideViewPortOnUiThreadByXWalkView(true, mXWalkView);
             assertFalse("Should not be able to zoom in", canZoomInOnUiThread());
             loadUrlSync(url);
-            pollOnUiThread(new Callable<Boolean>() {
-                @Override
-                public Boolean call() throws Exception {
-                    return mPageMinimumScale == mTestHelperBridge.getOnScaleChangedHelper().getNewScale();
-                }
-            });
-
-            Thread.sleep(500);
+            waitForScaleToBecome(mPageMinimumScale);
 
             assertTrue("Should be able to zoom in", canZoomInOnUiThread());
             assertFalse("Should not be able to zoom out", canZoomOutOnUiThread());
@@ -164,7 +158,6 @@ public Boolean call() throws Exception {
             assertTrue(false);
             e.printStackTrace();
         } catch (Throwable e) {
-            // TODO: handle exception
             assertTrue(false);
             e.printStackTrace();
         }

diff --git a/...g-asyncapi-android-tests/embeddingapi/src/org/xwalk/embedding/base/XWalkViewTestBase.java b/...g-asyncapi-android-tests/embeddingapi/src/org/xwalk/embedding/base/XWalkViewTestBase.java
@@ -523,7 +523,7 @@ public boolean isSatisfied() {
                     return false;
                 }
             }
-        });
+        }, WAIT_TIMEOUT_MS, CHECK_INTERVAL);
     }
 
     protected void checkHistoryItemList(XWalkView restoreXWalkView) throws Throwable {
@@ -1497,4 +1497,13 @@ public String call() throws Exception {
             }
         });
     }
+
+    protected void waitForScaleToBecome(final float expectedScale) throws Throwable {
+    	pollOnUiThread(new Callable<Boolean>() {
+            @Override
+            public Boolean call() throws Exception {
+                return expectedScale == getPixelScale();
+            }
+        });
+    }
 }