commit f6334c26fa9e8749666b6e953a45d2afd26f22cf
author Steve Block <steveblock@google.com> Thu Oct 20 23:00:31 2011 +0100
committer Steve Block <steveblock@google.com> Fri Oct 21 00:14:33 2011 +0100
tree 30c4b9ff5cb64bdc7ac3426cf3baa9a64eef4e3d
parent 676ec5e743b8d169db97ad6df599c12459549313

Fix some WebView SSL tests

We need to clear SSL preferences in any test where we depend upon
WebViewClient.onReceivedSslError() being called.

Also cleans up use of assertEquals().

Bug: 5484235
Change-Id: I8bf27826fa99691c83ae6e52f99b95ecb278e57b

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

diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
index f0e7d07..b06109a 100755
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -2267,13 +2267,14 @@
             public void run() {
                 mWebView.setWebViewClient(webViewClient);
                 mWebView.setWebChromeClient(new LoadCompleteWebChromeClient());
+                mWebView.clearSslPreferences();
                 mWebView.loadUrl(errorUrl);
             }
         });
         waitForUiThreadDone();
 
-        assertEquals(webViewClient.webView(), mWebView);
-        assertEquals(webViewClient.errorUrl(), errorUrl);
+        assertEquals(mWebView, webViewClient.webView());
+        assertEquals(errorUrl, webViewClient.errorUrl());
     }
 
     @TestTargetNew(
@@ -2301,7 +2302,7 @@
         waitForUiThreadDone();
         runTestOnUiThread(new Runnable() {
             public void run() {
-                assertEquals(mWebView.getTitle(), TestHtmlConstants.HELLO_WORLD_TITLE);
+                assertEquals(TestHtmlConstants.HELLO_WORLD_TITLE, mWebView.getTitle());
             }
         });
     }
@@ -2325,6 +2326,7 @@
             public void run() {
                 mWebView.setWebViewClient(new MockWebViewClient());
                 mWebView.setWebChromeClient(new LoadCompleteWebChromeClient());
+                mWebView.clearSslPreferences();
                 mWebView.loadUrl(url);
             }
         });
@@ -2351,6 +2353,7 @@
             public void run() {
                 mWebView.setWebViewClient(webViewClient);
                 mWebView.setWebChromeClient(new LoadCompleteWebChromeClient());
+                mWebView.clearSslPreferences();
                 mWebView.loadUrl(firstUrl);
             }
         });
@@ -2370,7 +2373,7 @@
         assertFalse(webViewClient.wasOnReceivedSslErrorCalled());
         runTestOnUiThread(new Runnable() {
             public void run() {
-                assertEquals(mWebView.getTitle(), "Second page");
+                assertEquals("Second page", mWebView.getTitle());
             }
         });
     }
@@ -2390,6 +2393,7 @@
             public void run() {
                 mWebView.setWebViewClient(webViewClient);
                 mWebView.setWebChromeClient(new LoadCompleteWebChromeClient());
+                mWebView.clearSslPreferences();
                 mWebView.loadUrl(firstUrl);
             }
         });
@@ -2412,7 +2416,7 @@
         assertTrue(webViewClient.wasOnReceivedSslErrorCalled());
         runTestOnUiThread(new Runnable() {
             public void run() {
-                assertEquals(mWebView.getTitle(), "Second page");
+                assertEquals("Second page", mWebView.getTitle());
             }
         });
     }