commit 2537ffdefc988e4f763a84dfe3cc5d88ff832718
author Yoland Yan <yolandyan@google.com> Tue Jan 03 16:28:33 2017 -0800
committer Yoland Yan <yolandyan@google.com> Thu Jan 05 23:24:48 2017 +0000
tree 6e95ff9383a6b0e50d874cff16c2e5f67d953aed
parent 3a305c3279000b78d468321de470221fedfcbffd

Fix testOnReceivedLoginRequest assertion error bug

Bug: 33810973

Change-Id: I0b7696c567cc951733e24c8581fd79a507c5847a

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 98d175f..e8a6397 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
@@ -232,7 +232,6 @@
             String url = testServer.setResponse(path, page, headers);
             assertFalse(webViewClient.hasOnReceivedLoginRequest());
             mOnUiThread.loadUrlAndWaitForCompletion(url);
-            assertTrue(webViewClient.hasOnReceivedLoginRequest());
             new PollingCheck(TEST_TIMEOUT) {
                 @Override
                 protected boolean check() {
@@ -647,6 +646,16 @@
         }
 
         @Override
+        public void onReceivedLoginRequest(WebView view, String realm, String account,
+                String args) {
+            super.onReceivedLoginRequest(view, realm, account, args);
+            mOnReceivedLoginRequest = true;
+            mOnReceivedLoginRealm = realm;
+            mOnReceivedLoginAccount = account;
+            mOnReceivedLoginArgs = args;
+        }
+
+        @Override
         public void onFormResubmission(WebView view, Message dontResend, Message resend) {
             mOnFormResubmissionCalled = true;
             dontResend.sendToTarget();