[Embeddingapi] Improve v6.XWalkViewTest.testSetInitialScale2 test case

zhuyongyong · zhuyongyong · commit 424ba91728a6 · 2016-06-12T15:57:17.000+08:00
- Fail Analyse: Need to confirm with developer for the feature support area 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 0, fail 2, block 0 BUG=https://crosswalk-project.org/jira/browse/CTS-848
diff --git a/embeddingapi/embedding-api-android-tests/embeddingapi/src/org/xwalk/embedding/base/XWalkViewTestBase.java b/embeddingapi/embedding-api-android-tests/embeddingapi/src/org/xwalk/embedding/base/XWalkViewTestBase.java
@@ -1527,4 +1527,13 @@ public String call() throws Exception {
             }
         });
     }
+
+    protected void setQuirksMode(final boolean value) throws Exception {
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                mXWalkView.getSettings().setSupportQuirksMode(value);
+            }
+        });
+    }
 }
diff --git a/embeddingapi/embedding-api-android-tests/embeddingapi/src/org/xwalk/embedding/test/v6/XWalkViewTest.java b/embeddingapi/embedding-api-android-tests/embeddingapi/src/org/xwalk/embedding/test/v6/XWalkViewTest.java
@@ -19,12 +19,10 @@
 import org.apache.http.Header;
 import org.apache.http.HttpRequest;
 import org.chromium.content.browser.test.util.CallbackHelper;
-
 import org.xwalk.embedding.base.XWalkViewTestBase;
 import org.xwalk.embedding.util.CommonResources;
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.os.SystemClock;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.view.WindowManager;
@@ -119,12 +117,12 @@ public void testSetInitialScale2() throws Throwable {
                 + "<p style='height:" + height + "px;width:" + width + "px'>"
                 + "testSetInitialScale</p></body></html>";
         final float defaultScaleFactor = 0;
-        final float defaultScale = 0.5f;
-        final float scaleFactor = 0.25f;
+        final float defaultScale = getInstrumentation().getTargetContext(
+                ).getResources().getDisplayMetrics().density;
 
         assertEquals(defaultScaleFactor, getScaleFactor(), .01f);
         loadDataSync(null, page, "text/html", false);
-        assertEquals(scaleFactor, getScaleFactor(), .01f);
+        assertEquals(defaultScale, getPixelScale(), .01f);
 
         int onScaleChangedCallCount = mTestHelperBridge.getOnScaleChangedHelper().getCallCount();
         setInitialScale(60);
diff --git a/embeddingapi/embedding-asyncapi-android-tests/embeddingapi/src/org/xwalk/embedding/base/XWalkViewTestBase.java b/embeddingapi/embedding-asyncapi-android-tests/embeddingapi/src/org/xwalk/embedding/base/XWalkViewTestBase.java
@@ -1495,4 +1495,13 @@ public String call() throws Exception {
             }
         });
     }
+
+    protected void setQuirksMode(final boolean value) throws Exception {
+        getInstrumentation().runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                mXWalkView.getSettings().setSupportQuirksMode(value);
+            }
+        });
+    }
 }
diff --git a/embeddingapi/embedding-asyncapi-android-tests/embeddingapi/src/org/xwalk/embedding/test/v6/XWalkViewTestAsync.java b/embeddingapi/embedding-asyncapi-android-tests/embeddingapi/src/org/xwalk/embedding/test/v6/XWalkViewTestAsync.java
@@ -22,6 +22,7 @@
 
 import org.xwalk.embedding.base.XWalkViewTestBase;
 import org.xwalk.embedding.util.CommonResources;
+
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.test.suitebuilder.annotation.SmallTest;
@@ -106,7 +107,7 @@ public void testSetInitialScale1() throws Throwable {
 
     @SmallTest
     public void testSetInitialScale2() throws Throwable {
-
+    	setQuirksMode(false);
         WindowManager wm = (WindowManager) getInstrumentation().getTargetContext()
                 .getSystemService(Context.WINDOW_SERVICE);
         Point screenSize = new Point();
@@ -117,13 +118,14 @@ public void testSetInitialScale2() throws Throwable {
         final String page = "<html><body>"
                 + "<p style='height:" + height + "px;width:" + width + "px'>"
                 + "testSetInitialScale</p></body></html>";
+        
         final float defaultScaleFactor = 0;
-        final float defaultScale = 0.5f;
-        final float scaleFactor = 0.25f;
+        final float defaultScale = getInstrumentation().getTargetContext(
+                ).getResources().getDisplayMetrics().density;
 
         assertEquals(defaultScaleFactor, getScaleFactor(), .01f);
         loadDataSync(null, page, "text/html", false);
-        assertEquals(scaleFactor, getScaleFactor(), .01f);
+        assertEquals(defaultScale, getPixelScale(), .01f);
 
         int onScaleChangedCallCount = mTestHelperBridge.getOnScaleChangedHelper().getCallCount();
         setInitialScale(60);

Original file line number	Diff line number	Diff line change
`@@ -1527,4 +1527,13 @@ public String call() throws Exception {`
`1527`	`1527`	`}`
`1528`	`1528`	`});`
`1529`	`1529`	`}`
	`1530`	`+`
	`1531`	`+ protected void setQuirksMode(final boolean value) throws Exception {`
	`1532`	`+ getInstrumentation().runOnMainSync(new Runnable() {`
	`1533`	`+ @Override`
	`1534`	`+ public void run() {`
	`1535`	`+ mXWalkView.getSettings().setSupportQuirksMode(value);`
	`1536`	`+ }`
	`1537`	`+ });`
	`1538`	`+ }`
`1530`	`1539`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1495,4 +1495,13 @@ public String call() throws Exception {`
`1495`	`1495`	`}`
`1496`	`1496`	`});`
`1497`	`1497`	`}`
	`1498`	`+`
	`1499`	`+ protected void setQuirksMode(final boolean value) throws Exception {`
	`1500`	`+ getInstrumentation().runOnMainSync(new Runnable() {`
	`1501`	`+ @Override`
	`1502`	`+ public void run() {`
	`1503`	`+ mXWalkView.getSettings().setSupportQuirksMode(value);`
	`1504`	`+ }`
	`1505`	`+ });`
	`1506`	`+ }`
`1498`	`1507`	`}`