Auto convert content shell tests to JUnit4

content/public/android/javatests/src/org/chromium/content/browser/ContentDetectionActivityTestRule.java

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.content.browser;
 
 import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
 
 import android.net.Uri;
 import android.support.test.InstrumentationRegistry;
 
+import org.junit.Assert;
+
+import org.chromium.base.Log;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.content.browser.test.util.DOMUtils;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageFinishedHelper;
 import org.chromium.content_shell.ShellViewAndroidDelegate.ContentIntentHandler;
 import org.chromium.content_shell_apk.ContentShellActivityTestRule;
 
 import java.util.concurrent.TimeUnit;
 
 /**
  * ActivityTestRule for content detection test suites.
  */
 public class ContentDetectionActivityTestRule extends ContentShellActivityTestRule {
-    private static final long WAIT_TIMEOUT_SECONDS = scaleTimeout(10);
+    private static final long WAIT_TIMEOUT_SECONDS = 60;
 
     private TestCallbackHelperContainer mCallbackHelper;
     private TestContentIntentHandler mContentIntentHandler;
 
     /**
      * CallbackHelper for OnStartContentIntent.
      */
     private static class OnStartContentIntentHelper extends CallbackHelper {
         private String mIntentUrl;
         public void notifyCalled(String intentUrl) {
@@ skipping 14 matching lines @@
 
         public OnStartContentIntentHelper getOnStartContentIntentHelper() {
             if (mOnStartContentIntentHelper == null) {
                 mOnStartContentIntentHelper = new OnStartContentIntentHelper();
             }
             return mOnStartContentIntentHelper;
         }
 
         @Override
         public void onIntentUrlReceived(String intentUrl) {
+            Log.d("#YOLAND", "called onIntentUrlReceived");

[jbudorick, 2017/03/01 23:10:19]

:)

I'm assuming that your intention was to remove these.

[the real yoland, 2017/03/08 23:35:31]

lol, just did
Done

             mOnStartContentIntentHelper.notifyCalled(intentUrl);
         }
     }
 
     /**
      * Returns the TestCallbackHelperContainer associated with this ContentView,
      * or creates it lazily.
      */
     public TestCallbackHelperContainer getTestCallbackHelperContainer() {
         if (mCallbackHelper == null) {
             mCallbackHelper = new TestCallbackHelperContainer(getContentViewCore());
         }
         return mCallbackHelper;
     }
 
     @Override
     protected void beforeActivityLaunched() {
+        Log.d("#YOLAND", "beforeActivityLaunched called");
         super.beforeActivityLaunched();
         mContentIntentHandler = new TestContentIntentHandler();
+        Log.d("#YOLAND", "instantiating handler");
     }
 
     @Override
     protected void afterActivityLaunched() {
+        Log.d("#YOLAND", "afterActivityLaunched called");
         getActivity()
                 .getShellManager()
                 .getActiveShell()
                 .getViewAndroidDelegate()
                 .setContentIntentHandler(mContentIntentHandler);
     }
 
     /**
      * Encodes the provided content string into an escaped url as intents do.
      * @param content Content to escape into a url.
@@ skipping 12 matching lines @@
         return UrlUtils.getIsolatedTestFileUrl(testUrl).equals(
                 getContentViewCore().getWebContents().getUrl());
     }
 
     /**
      * Scrolls to the node with the provided id, taps on it and waits for an intent to come.
      * @param id Id of the node to scroll and tap.
      * @return The content url of the received intent or null if none.
      */
     public String scrollAndTapExpectingIntent(String id) throws Throwable {
-        OnStartContentIntentHelper onStartContentIntentHelper =
+        ContentIntentHandler handler = getActivity()
+                .getShellManager()
+                .getActiveShell()
+                .getViewAndroidDelegate()
+                .getContentIntentHandler();
+        Log.d("#YOLAND", "hander one is " + handler.toString() + " handler two is " + mContentIntentHandler.toString());
+        Assert.assertEquals(handler, mContentIntentHandler);
+  OnStartContentIntentHelper onStartContentIntentHelper =
                 mContentIntentHandler.getOnStartContentIntentHelper();
         int currentCallCount = onStartContentIntentHelper.getCallCount();
 
-        DOMUtils.clickNode(getContentViewCore(), id);
+        Log.d("#YOLAND", "about to click, current count: " + Integer.toString(currentCallCount));
+        // DOMUtils.clickNode(getContentViewCore(), id);
 
         onStartContentIntentHelper.waitForCallback(
                 currentCallCount, 1, WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS);
         InstrumentationRegistry.getInstrumentation().waitForIdleSync();
         return onStartContentIntentHelper.getIntentUrl();
     }
 
     /**
      * Scrolls to the node with the provided id, taps on it and waits for a new page load to finish.
      * Useful when tapping on links that take to other pages.
      * @param id Id of the node to scroll and tap.
      * @return The content url of the received intent or null if none.
      */
     public void scrollAndTapNavigatingOut(String id) throws Throwable {
         TestCallbackHelperContainer callbackHelperContainer = getTestCallbackHelperContainer();
         OnPageFinishedHelper onPageFinishedHelper =
                 callbackHelperContainer.getOnPageFinishedHelper();
         int currentCallCount = onPageFinishedHelper.getCallCount();
 
         DOMUtils.clickNode(getContentViewCore(), id);
 
         onPageFinishedHelper.waitForCallback(
                 currentCallCount, 1, WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS);
         InstrumentationRegistry.getInstrumentation().waitForIdleSync();
     }
 }