Upstream version 9.38.204.0

[platform/framework/web/crosswalk.git] / src / xwalk / test / android / core / javatests / src / org / xwalk / core / xwview / test / ShouldOverrideUrlLoadingTest.java

diff --git a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/ShouldOverrideUrlLoadingTest.java b/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/ShouldOverrideUrlLoadingTest.java
index 683a59c..130745e 100644 (file)
--- a/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/ShouldOverrideUrlLoadingTest.java
+++ b/src/xwalk/test/android/core/javatests/src/org/xwalk/core/xwview/test/ShouldOverrideUrlLoadingTest.java
@@ -172,7 +172,7 @@ public class ShouldOverrideUrlLoadingTest extends XWalkViewTestBase {
         final int shouldOverrideUrlLoadingCallCount = mShouldOverrideUrlLoadingHelper.getCallCount();
         final int onPageStartedCallCount = onPageStartedHelper.getCallCount();
         setShouldOverrideUrlLoadingReturnValueOnUiThread(true);
-        clickOnElementId("link");
+        clickOnElementId("link", null);
 
         mShouldOverrideUrlLoadingHelper.waitForCallback(shouldOverrideUrlLoadingCallCount);
         assertEquals(onPageStartedCallCount, onPageStartedHelper.getCallCount());
@@ -191,7 +191,7 @@ public class ShouldOverrideUrlLoadingTest extends XWalkViewTestBase {
 
         setShouldOverrideUrlLoadingReturnValueOnUiThread(true);
 
-        clickOnElementId("link");
+        clickOnElementId("link", null);
 
         mShouldOverrideUrlLoadingHelper.waitForCallback(shouldOverrideUrlLoadingCallCount);
 
@@ -231,7 +231,7 @@ public class ShouldOverrideUrlLoadingTest extends XWalkViewTestBase {
 
         final int shouldOverrideUrlLoadingCallCount = mShouldOverrideUrlLoadingHelper.getCallCount();
 
-        clickOnElementId("link");
+        clickOnElementId("link", null);
 
         // After we load this URL we're certain that any in-flight callbacks for the previous
         // navigation have been delivered.
@@ -250,7 +250,7 @@ public class ShouldOverrideUrlLoadingTest extends XWalkViewTestBase {
 
         int callCount = mShouldOverrideUrlLoadingHelper.getCallCount();
 
-        clickOnElementId("link");
+        clickOnElementId("link", null);
 
         mShouldOverrideUrlLoadingHelper.waitForCallback(callCount);
     }
@@ -267,7 +267,7 @@ public class ShouldOverrideUrlLoadingTest extends XWalkViewTestBase {
 
         int callCount = mShouldOverrideUrlLoadingHelper.getCallCount();
 
-        clickOnElementId("link");
+        clickOnElementId("link", null);
 
         mShouldOverrideUrlLoadingHelper.waitForCallback(callCount);
         assertEquals(httpPathOnServer,
@@ -284,7 +284,7 @@ public class ShouldOverrideUrlLoadingTest extends XWalkViewTestBase {
 
         int callCount = mShouldOverrideUrlLoadingHelper.getCallCount();
 
-        clickOnElementId("link");
+        clickOnElementId("link", null);
 
         mShouldOverrideUrlLoadingHelper.waitForCallback(callCount);
     }
@@ -298,7 +298,7 @@ public class ShouldOverrideUrlLoadingTest extends XWalkViewTestBase {
                 getHtmlForPageWithJsReplaceLinkTo(redirectTargetUrl), "text/html", false);
 
         int callCount = mShouldOverrideUrlLoadingHelper.getCallCount();
-        clickOnElementId("link");
+        clickOnElementId("link", null);
         mShouldOverrideUrlLoadingHelper.waitForCallback(callCount);
     }
 
@@ -310,7 +310,7 @@ public class ShouldOverrideUrlLoadingTest extends XWalkViewTestBase {
                 CommonResources.makeHtmlPageWithSimpleLinkTo(redirectTargetUrl), "text/html", false);
 
         int callCount = mShouldOverrideUrlLoadingHelper.getCallCount();
-        clickOnElementId("link");
+        clickOnElementId("link", null);
         mShouldOverrideUrlLoadingHelper.waitForCallback(callCount);
         assertEquals(redirectTargetUrl,
                 mShouldOverrideUrlLoadingHelper.getShouldOverrideUrlLoadingUrl());
@@ -334,7 +334,7 @@ public class ShouldOverrideUrlLoadingTest extends XWalkViewTestBase {
         setShouldOverrideUrlLoadingReturnValueOnUiThread(true);
 
         int callCount = mShouldOverrideUrlLoadingHelper.getCallCount();
-        clickOnElementId("link");
+        clickOnElementId("link", null);
         // Some time around here true should be returned from the shouldOverrideUrlLoading
         // callback causing the navigation caused by calling clickOnElementId to be ignored.
         // We validate this by checking which pages were loaded on the server.
@@ -360,7 +360,7 @@ public class ShouldOverrideUrlLoadingTest extends XWalkViewTestBase {
                 CommonResources.makeHtmlPageWithSimpleLinkTo(dataUrl), "text/html", false);
 
         int callCount = mShouldOverrideUrlLoadingHelper.getCallCount();
-        clickOnElementId("link");
+        clickOnElementId("link", null);
 
         mShouldOverrideUrlLoadingHelper.waitForCallback(callCount);
         assertTrue("Expected URL that starts with 'data:' but got: <" +
@@ -378,7 +378,7 @@ public class ShouldOverrideUrlLoadingTest extends XWalkViewTestBase {
                         false);
 
         int callCount = mShouldOverrideUrlLoadingHelper.getCallCount();
-        clickOnElementId("link");
+        clickOnElementId("link", null);
 
         mShouldOverrideUrlLoadingHelper.waitForCallback(callCount);
         assertEquals(unsupportedSchemeUrl,
@@ -399,7 +399,7 @@ public class ShouldOverrideUrlLoadingTest extends XWalkViewTestBase {
             mShouldOverrideUrlLoadingHelper.getCallCount();
 
         assertEquals(0, mWebServer.getRequestCount(REDIRECT_TARGET_PATH));
-        clickOnElementId("link");
+        clickOnElementId("link", null);
 
         // Wait for the target URL to be fetched from the server.
         pollOnUiThread(new Callable<Boolean>() {
@@ -429,7 +429,7 @@ public class ShouldOverrideUrlLoadingTest extends XWalkViewTestBase {
 
         final int shouldOverrideUrlLoadingCallCount = mShouldOverrideUrlLoadingHelper.getCallCount();
 
-        clickOnElementId("link");
+        clickOnElementId("link", null);
 
         mShouldOverrideUrlLoadingHelper.waitForCallback(shouldOverrideUrlLoadingCallCount);
 
@@ -490,7 +490,7 @@ public class ShouldOverrideUrlLoadingTest extends XWalkViewTestBase {
         int indirectLoadCallCount = mShouldOverrideUrlLoadingHelper.getCallCount();
         loadUrlSync(pageWithLinkToRedirectUrl);
 
-        clickOnElementId("link");
+        clickOnElementId("link", null);
 
         mShouldOverrideUrlLoadingHelper.waitForCallback(indirectLoadCallCount, 3);
         assertEquals(redirectTarget,