commit 165b5f2c56f4f0bc38842751e9932912c155bd05
author Nate Fischer <ntfschr@google.com> Mon Aug 21 18:00:44 2017 -0700
committer Nate Fischer <ntfschr@google.com> Mon Aug 21 18:00:44 2017 -0700
tree 7109ece86460c604a264d2b24a91a237066a506c
parent 5b5b371171f8f5987a246c9e3b95714c46637533

WebView: rename API in tests, remove obsolete tests

No change in logic.

This changes CTS tests to use the new names for the following API:

 * initSafeBrowsing -> startSafeBrowsing

Test names have been renamed accordingly.

This also removes an obsolete test, because stopSafeBrowsing has been
removed.

Bug: 64331900
Test: run cts -m CtsWebkitTestCases -t android.webkit.cts.WebViewTest
Change-Id: If4e4a307bd7974ac47bdd88bb9fd878ae3419ae6

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 a21e4cc..7718b64 100755
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -2752,10 +2752,10 @@
         }
     }
 
-    public void testInitSafeBrowsingUseApplicationContext() throws Exception {
+    public void testStartSafeBrowsingUseApplicationContext() throws Exception {
         final MockContext ctx = new MockContext(getActivity());
         final CountDownLatch resultLatch = new CountDownLatch(1);
-        WebView.initSafeBrowsing(ctx, new ValueCallback<Boolean>() {
+        WebView.startSafeBrowsing(ctx, new ValueCallback<Boolean>() {
             @Override
             public void onReceiveValue(Boolean value) {
                 assertTrue(ctx.wasGetApplicationContextCalled());
@@ -2766,21 +2766,21 @@
         assertTrue(resultLatch.await(TEST_TIMEOUT, TimeUnit.MILLISECONDS));
     }
 
-    public void testInitSafeBrowsingWithNullCallbackDoesntCrash() throws Exception {
+    public void testStartSafeBrowsingWithNullCallbackDoesntCrash() throws Exception {
         if (!NullWebViewUtils.isWebViewAvailable()) {
             return;
         }
 
-        WebView.initSafeBrowsing(getActivity().getApplicationContext(), null);
+        WebView.startSafeBrowsing(getActivity().getApplicationContext(), null);
     }
 
-    public void testInitSafeBrowsingInvokesCallback() throws Exception {
+    public void testStartSafeBrowsingInvokesCallback() throws Exception {
         if (!NullWebViewUtils.isWebViewAvailable()) {
             return;
         }
 
         final CountDownLatch resultLatch = new CountDownLatch(1);
-        WebView.initSafeBrowsing(getActivity().getApplicationContext(),
+        WebView.startSafeBrowsing(getActivity().getApplicationContext(),
                 new ValueCallback<Boolean>() {
             @Override
             public void onReceiveValue(Boolean value) {
@@ -2792,14 +2792,6 @@
         assertTrue(resultLatch.await(TEST_TIMEOUT, TimeUnit.MILLISECONDS));
     }
 
-    public void testShutdownSafeBrowsingDoesntCrash() throws Exception {
-        if (!NullWebViewUtils.isWebViewAvailable()) {
-            return;
-        }
-
-        WebView.shutdownSafeBrowsing();
-    }
-
     private void savePrintedPage(final PrintDocumentAdapter adapter,
             final ParcelFileDescriptor descriptor, final FutureTask<Boolean> result) {
         adapter.onWrite(new PageRange[] {PageRange.ALL_PAGES}, descriptor,