Merge "Fix WebViewTest#testGetWebViewClient and WebViewTest#testGetWebChromeClient" into oc-dev
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
index 4ff8eef..48b519c 100755
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -2611,6 +2611,10 @@
@UiThreadTest
public void testGetWebViewClient() throws Exception {
+ if (!NullWebViewUtils.isWebViewAvailable()) {
+ return;
+ }
+
// getWebViewClient should return a default WebViewClient if it hasn't been set yet
WebView webView = new WebView(getActivity());
WebViewClient client = webView.getWebViewClient();
@@ -2626,6 +2630,10 @@
@UiThreadTest
public void testGetWebChromeClient() throws Exception {
+ if (!NullWebViewUtils.isWebViewAvailable()) {
+ return;
+ }
+
// getWebChromeClient should return null if the client hasn't been set yet
WebView webView = new WebView(getActivity());
WebChromeClient client = webView.getWebChromeClient();