commit 6fb4721451b9fa3b4692efb28dee59ed9da141df
author Hui Shu <hush@google.com> Mon Feb 03 23:51:43 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 03 23:51:43 2014 +0000
tree 6672401c65680492070a50b3c24c215b78333488
parent c361cd89f1684bd49cf90ccdfda687f857259bb6
parent f9844488c2e744b8bae07e06c159ab496c54f37d

Merge "Disable the shouldoverrideurlloading test for popup window"

tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java

diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
index 1027a59..458d5be 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
@@ -126,6 +126,8 @@
                 childWebViewClient.getLastShouldOverrideUrl());
 
         // Now test a navigation within the page
+        //TODO(hush) Enable this portion when b/12804986 is fixed.
+        /*
         WebViewOnUiThread childWebViewOnUiThread = new WebViewOnUiThread(this, childWebView);
         final int childCallCount = childWebViewClient.getShouldOverrideUrlLoadingCallCount();
         final int mainCallCount = mainWebViewClient.getShouldOverrideUrlLoadingCallCount();
@@ -138,6 +140,7 @@
         }.run();
         assertEquals(mainCallCount, mainWebViewClient.getShouldOverrideUrlLoadingCallCount());
         assertEquals(TEST_URL, childWebViewClient.getLastShouldOverrideUrl());
+        */
     }
 
     private void clickOnLinkUsingJs(final String linkId, WebViewOnUiThread webViewOnUiThread) {