Convert misc instrumentation tests to JUnit4

This CL converts misc instrumentation tests to JUnit4. For more on
JUnit4 migration, please check src/testing/android/docs/junit4.md

Bug: 640116
Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel
Change-Id: I8ea44992b48709550855459b9ff4f20bb3eec15a
Reviewed-on: https://chromium-review.googlesource.com/627672
Commit-Queue: Yoland Yan <yolandyan@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Reviewed-by: Andrei Kapishnikov <kapishnikov@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501470}

chrome/android/javatests/src/org/chromium/chrome/browser/document/LauncherActivityTest.java

@@ -13,14 +13,25 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import org.chromium.base.ApplicationState;
 import org.chromium.base.ApplicationStatus;
+import org.chromium.base.annotations.SuppressFBWarnings;
+import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.test.ChromeActivityTestCaseBase;
+import org.chromium.chrome.test.ChromeActivityTestRule;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 
@@ -33,22 +44,27 @@ import java.util.concurrent.atomic.AtomicReference;
 /**
  * Tests for launching Chrome.
  */
+@RunWith(ChromeJUnit4ClassRunner.class)
+@CommandLineFlags.Add({
+        ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
+        ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG,
+})
 @RetryOnFailure
-public class LauncherActivityTest extends ChromeActivityTestCaseBase<ChromeActivity> {
+public class LauncherActivityTest {
+    @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    @Rule
+    public ChromeActivityTestRule<ChromeActivity> mActivityTestRule =
+            new ChromeActivityTestRule<>(ChromeActivity.class);
 
     private Context mContext;
     private static final long DEVICE_STARTUP_TIMEOUT_MS = scaleTimeout(15000);
 
-    public LauncherActivityTest() {
-        super(ChromeActivity.class);
-    }
-
-    @Override
+    @Before
     public void setUp() throws Exception {
-        super.setUp();
-        mContext = getInstrumentation().getTargetContext();
+        mContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
     }
 
+    @Test
     @SmallTest
     public void testLaunchWithUrlNoScheme() {
         // Prepare intent
@@ -59,9 +75,10 @@ public class LauncherActivityTest extends ChromeActivityTestCaseBase<ChromeActiv
 
         final Activity startedActivity = tryLaunchingChrome(intent);
         final Intent activityIntent = startedActivity.getIntent();
-        assertEquals(intentUrl, activityIntent.getDataString());
+        Assert.assertEquals(intentUrl, activityIntent.getDataString());
     }
 
+    @Test
     @SmallTest
     public void testDoesNotCrashWithBadParcel() {
         // Prepare bad intent
@@ -78,10 +95,12 @@ public class LauncherActivityTest extends ChromeActivityTestCaseBase<ChromeActiv
 
         final Activity startedActivity = tryLaunchingChrome(intent);
         final Intent activityIntent = startedActivity.getIntent();
-        assertEquals("Data was not preserved", intent.getData(), activityIntent.getData());
-        assertEquals("Action was not preserved", intent.getAction(), activityIntent.getAction());
+        Assert.assertEquals("Data was not preserved", intent.getData(), activityIntent.getData());
+        Assert.assertEquals(
+                "Action was not preserved", intent.getAction(), activityIntent.getAction());
     }
 
+    @Test
     @SmallTest
     public void testDoesNotCrashWithNoUriInViewIntent() {
         // Prepare intent
@@ -128,10 +147,6 @@ public class LauncherActivityTest extends ChromeActivityTestCaseBase<ChromeActiv
         return launchedActivity.get();
     }
 
-    @Override
-    public void startMainActivity() throws InterruptedException {
-    }
-
     /**
      * This Parcelable does not adhere to the form standards of a well formed Parcelable and will
      * thus cause a BadParcelableException.  The lint suppression is needed since it detects that

chrome/android/javatests/src/org/chromium/chrome/browser/gcore/MockConnectedTaskTest.java

@@ -6,22 +6,27 @@ package org.chromium.chrome.browser.gcore;
 
 import android.support.test.filters.SmallTest;
 
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.test.gcore.MockChromeGoogleApiClient;
 
 /** Tests for {@link ConnectedTask} */
-public class MockConnectedTaskTest extends TestCase {
+@RunWith(BaseJUnit4ClassRunner.class)
+public class MockConnectedTaskTest {
     private MockChromeGoogleApiClient mClient;
     private MockConnectedTask<MockChromeGoogleApiClient> mTask;
 
-    @Override
-    protected void setUp() throws Exception {
+    @Before
+    public void setUp() throws Exception {
         mClient = new MockChromeGoogleApiClient();
         mTask = new MockConnectedTask<>(mClient);
     }
 
+    @Test
     @SmallTest
     @Feature({"GCore"})
     public void testConnectionSuccess() {
@@ -38,6 +43,7 @@ public class MockConnectedTaskTest extends TestCase {
         mClient.assertNoOtherMethodsCalled();
     }
 
+    @Test
     @SmallTest
     @Feature({"GCore"})
     public void testConnectionFailureWithGooglePlayServicesAvailable() {
@@ -54,6 +60,7 @@ public class MockConnectedTaskTest extends TestCase {
         mClient.assertNoOtherMethodsCalled();
     }
 
+    @Test
     @SmallTest
     @Feature({"GCore"})
     public void testConnectionFailureWithGooglePlayServicesUnavailable() {
@@ -70,6 +77,7 @@ public class MockConnectedTaskTest extends TestCase {
         mClient.assertNoOtherMethodsCalled();
     }
 
+    @Test
     @SmallTest
     @Feature({"GCore"})
     public void testRetryLimit() {

chrome/android/javatests/src/org/chromium/chrome/browser/input/TextSuggestionMenuTest.java

@@ -8,10 +8,17 @@ import android.support.test.filters.LargeTest;
 import android.view.View;
 
 import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
+import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeActivity;
-import org.chromium.chrome.test.ChromeActivityTestCaseBase;
+import org.chromium.chrome.browser.ChromeSwitches;
+import org.chromium.chrome.test.ChromeActivityTestRule;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.content.R;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.browser.input.SuggestionsPopupWindow;
@@ -27,24 +34,31 @@ import java.util.concurrent.TimeoutException;
 /**
  * Integration tests for the text suggestion menu.
  */
-public class TextSuggestionMenuTest extends ChromeActivityTestCaseBase<ChromeActivity> {
+@RunWith(ChromeJUnit4ClassRunner.class)
+@CommandLineFlags.Add({
+        ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
+        ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG,
+})
+public class TextSuggestionMenuTest {
+    @Rule
+    public ChromeActivityTestRule<ChromeActivity> mActivityTestRule =
+            new ChromeActivityTestRule<>(ChromeActivity.class);
+
     private static final String URL =
             "data:text/html, <div contenteditable id=\"div\">iuvwneaoanls</div>";
 
-    public TextSuggestionMenuTest() {
-        super(ChromeActivity.class);
-    }
-
-    @Override
-    public void startMainActivity() throws InterruptedException {
-        startMainActivityOnBlankPage();
+    @Before
+    public void setUp() throws InterruptedException {
+        mActivityTestRule.startMainActivityOnBlankPage();
     }
 
+    @Test
     @LargeTest
     @RetryOnFailure
     public void testDeleteMisspelledWord() throws InterruptedException, TimeoutException {
-        loadUrl(URL);
-        final ContentViewCore cvc = getActivity().getActivityTab().getContentViewCore();
+        mActivityTestRule.loadUrl(URL);
+        final ContentViewCore cvc =
+                mActivityTestRule.getActivity().getActivityTab().getContentViewCore();
         WebContents webContents = cvc.getWebContents();
 
         // The spell checker is called asynchronously, in an idle-time callback. By waiting for an

chrome/android/javatests/src/org/chromium/chrome/browser/metrics/UkmIncognitoTest.java

@@ -7,41 +7,57 @@ package org.chromium.chrome.browser.metrics;
 import android.support.test.filters.SmallTest;
 
 import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.RetryOnFailure;
+import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.test.ChromeTabbedActivityTestBase;
+import org.chromium.chrome.test.ChromeActivityTestRule;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
 import org.chromium.content.browser.test.util.JavaScriptUtils;
 import org.chromium.ui.base.PageTransition;
 
 /**
  * Tests for UKM monitoring of incognito activity.
  */
-@CommandLineFlags.Add({"force-enable-metrics-reporting"})
-public class UkmIncognitoTest extends ChromeTabbedActivityTestBase {
+@RunWith(ChromeJUnit4ClassRunner.class)
+@CommandLineFlags.Add({
+        ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
+        ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG,
+        "force-enable-metrics-reporting"})
+public class UkmIncognitoTest {
+    @Rule
+    public ChromeTabbedActivityTestRule mActivityTestRule = new ChromeTabbedActivityTestRule();
+
     private static final String DEBUG_PAGE = "chrome://ukm";
 
-    @Override
-    public void startMainActivity() throws InterruptedException {
-        startMainActivityOnBlankPage();
+    @Before
+    public void setUp() throws InterruptedException {
+        mActivityTestRule.startMainActivityOnBlankPage();
     }
 
     public String getUkmState(Tab normalTab) throws Exception {
-        loadUrlInTab(DEBUG_PAGE, PageTransition.TYPED | PageTransition.FROM_ADDRESS_BAR, normalTab);
+        mActivityTestRule.loadUrlInTab(
+                DEBUG_PAGE, PageTransition.TYPED | PageTransition.FROM_ADDRESS_BAR, normalTab);
         return JavaScriptUtils.executeJavaScriptAndWaitForResult(
                 normalTab.getContentViewCore().getWebContents(),
                 "document.getElementById('state').textContent");
     }
 
+    @Test
     @SmallTest
     @RetryOnFailure
     public void testUkmIncognito() throws Exception {
-        Tab normalTab = getActivity().getActivityTab();
+        Tab normalTab = mActivityTestRule.getActivity().getActivityTab();
 
         Assert.assertEquals("UKM State:", "\"True\"", getUkmState(normalTab));
 
-        newIncognitoTabFromMenu();
+        mActivityTestRule.newIncognitoTabFromMenu();
 
         Assert.assertEquals("UKM State:", "\"False\"", getUkmState(normalTab));
     }

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/SuggestionAnswerTest.java

@@ -6,32 +6,41 @@ package org.chromium.chrome.browser.omnibox;
 
 import android.support.test.filters.SmallTest;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-public class SuggestionAnswerTest extends TestCase {
+import org.chromium.base.test.BaseJUnit4ClassRunner;
+
+@RunWith(BaseJUnit4ClassRunner.class)
+public class SuggestionAnswerTest {
+    @Test
     @SmallTest
     public void testMalformedJsonReturnsNull() {
         String json = "} malformed json {";
         SuggestionAnswer answer = SuggestionAnswer.parseAnswerContents(json);
-        assertNull(answer);
+        Assert.assertNull(answer);
     }
 
+    @Test
     @SmallTest
     public void testEmpyJsonReturnsNull() {
         String json = "";
         SuggestionAnswer answer = SuggestionAnswer.parseAnswerContents(json);
-        assertNull(answer);
+        Assert.assertNull(answer);
     }
 
+    @Test
     @SmallTest
     public void testOneLineReturnsNull() {
         String json = "{ 'l': ["
                 + "  { 'il': { 't': [{ 't': 'text', 'tt': 8 }] } }, "
                 + "] }";
         SuggestionAnswer answer = SuggestionAnswer.parseAnswerContents(json);
-        assertNull(answer);
+        Assert.assertNull(answer);
     }
 
+    @Test
     @SmallTest
     public void testTwoLinesDoesntReturnNull() {
         String json = "{ 'l': ["
@@ -39,9 +48,10 @@ public class SuggestionAnswerTest extends TestCase {
                 + "  { 'il': { 't': [{ 't': 'other text', 'tt': 5 }] } }"
                 + "] }";
         SuggestionAnswer answer = SuggestionAnswer.parseAnswerContents(json);
-        assertNotNull(answer);
+        Assert.assertNotNull(answer);
     }
 
+    @Test
     @SmallTest
     public void testThreeLinesReturnsNull() {
         String json = "{ 'l': ["
@@ -50,9 +60,10 @@ public class SuggestionAnswerTest extends TestCase {
                 + "  { 'il': { 't': [{ 't': 'yet more text', 'tt': 13 }] } }"
                 + "] }";
         SuggestionAnswer answer = SuggestionAnswer.parseAnswerContents(json);
-        assertNull(answer);
+        Assert.assertNull(answer);
     }
 
+    @Test
     @SmallTest
     public void testFiveLinesReturnsNull() {
         String json = "{ 'l': ["
@@ -63,9 +74,10 @@ public class SuggestionAnswerTest extends TestCase {
                 + "  { 'il': { 't': [{ 't': 'line 5', 'tt': 5 }] } }"
                 + "] }";
         SuggestionAnswer answer = SuggestionAnswer.parseAnswerContents(json);
-        assertNull(answer);
+        Assert.assertNull(answer);
     }
 
+    @Test
     @SmallTest
     public void testPropertyPresence() {
         String json = "{ 'l': ["
@@ -78,18 +90,19 @@ public class SuggestionAnswerTest extends TestCase {
         SuggestionAnswer answer = SuggestionAnswer.parseAnswerContents(json);
 
         SuggestionAnswer.ImageLine firstLine = answer.getFirstLine();
-        assertEquals(2, firstLine.getTextFields().size());
-        assertFalse(firstLine.hasAdditionalText());
-        assertFalse(firstLine.hasStatusText());
-        assertTrue(firstLine.hasImage());
+        Assert.assertEquals(2, firstLine.getTextFields().size());
+        Assert.assertFalse(firstLine.hasAdditionalText());
+        Assert.assertFalse(firstLine.hasStatusText());
+        Assert.assertTrue(firstLine.hasImage());
 
         SuggestionAnswer.ImageLine secondLine = answer.getSecondLine();
-        assertEquals(1, secondLine.getTextFields().size());
-        assertTrue(secondLine.hasAdditionalText());
-        assertTrue(secondLine.hasStatusText());
-        assertFalse(secondLine.hasImage());
+        Assert.assertEquals(1, secondLine.getTextFields().size());
+        Assert.assertTrue(secondLine.hasAdditionalText());
+        Assert.assertTrue(secondLine.hasStatusText());
+        Assert.assertFalse(secondLine.hasImage());
     }
 
+    @Test
     @SmallTest
     public void testContents() {
         String json = "{ 'l': ["
@@ -102,18 +115,18 @@ public class SuggestionAnswerTest extends TestCase {
         SuggestionAnswer answer = SuggestionAnswer.parseAnswerContents(json);
 
         SuggestionAnswer.ImageLine firstLine = answer.getFirstLine();
-        assertEquals("text", firstLine.getTextFields().get(0).getText());
-        assertEquals(8, firstLine.getTextFields().get(0).getType());
-        assertEquals("moar", firstLine.getTextFields().get(1).getText());
-        assertEquals(0, firstLine.getTextFields().get(1).getType());
-        assertEquals("hi there", firstLine.getAdditionalText().getText());
-        assertEquals(7, firstLine.getAdditionalText().getType());
+        Assert.assertEquals("text", firstLine.getTextFields().get(0).getText());
+        Assert.assertEquals(8, firstLine.getTextFields().get(0).getType());
+        Assert.assertEquals("moar", firstLine.getTextFields().get(1).getText());
+        Assert.assertEquals(0, firstLine.getTextFields().get(1).getType());
+        Assert.assertEquals("hi there", firstLine.getAdditionalText().getText());
+        Assert.assertEquals(7, firstLine.getAdditionalText().getType());
 
         SuggestionAnswer.ImageLine secondLine = answer.getSecondLine();
-        assertEquals("ftw", secondLine.getTextFields().get(0).getText());
-        assertEquals(6006, secondLine.getTextFields().get(0).getType());
-        assertEquals("shop S-Mart", secondLine.getStatusText().getText());
-        assertEquals(666, secondLine.getStatusText().getType());
-        assertEquals("Npb24gZnJvbSBvdGhlciBhbmltYWxzLCB3aGlj", secondLine.getImage());
+        Assert.assertEquals("ftw", secondLine.getTextFields().get(0).getText());
+        Assert.assertEquals(6006, secondLine.getTextFields().get(0).getType());
+        Assert.assertEquals("shop S-Mart", secondLine.getStatusText().getText());
+        Assert.assertEquals(666, secondLine.getStatusText().getType());
+        Assert.assertEquals("Npb24gZnJvbSBvdGhlciBhbmltYWxzLCB3aGlj", secondLine.getImage());
     }
 }

chrome/android/javatests/src/org/chromium/chrome/browser/photo_picker/PhotoPickerDialogTest.java

@@ -6,18 +6,28 @@ package org.chromium.chrome.browser.photo_picker;
 
 import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
 
+import android.support.test.filters.LargeTest;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.Button;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CallbackHelper;
+import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.widget.selection.SelectionDelegate;
 import org.chromium.chrome.browser.widget.selection.SelectionDelegate.SelectionObserver;
-import org.chromium.chrome.test.ChromeActivityTestCaseBase;
+import org.chromium.chrome.test.ChromeActivityTestRule;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.browser.RecyclerViewTestUtils;
 import org.chromium.content.browser.test.util.TouchCommon;
 import org.chromium.ui.PhotoPickerListener;
@@ -31,12 +41,20 @@ import java.util.concurrent.TimeUnit;
 /**
  * Tests for the PhotoPickerDialog class.
  */
-public class PhotoPickerDialogTest extends ChromeActivityTestCaseBase<ChromeActivity>
-        implements PhotoPickerListener, DecoderServiceHost.ServiceReadyCallback,
-                   SelectionObserver<PickerBitmap> {
+@RunWith(ChromeJUnit4ClassRunner.class)
+@CommandLineFlags.Add({
+        ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
+        ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG,
+})
+public class PhotoPickerDialogTest implements PhotoPickerListener,
+        SelectionObserver<PickerBitmap>, DecoderServiceHost.ServiceReadyCallback {
     // The timeout (in seconds) to wait for the decoder service to be ready.
     private static final long WAIT_TIMEOUT_SECONDS = scaleTimeout(30);
 
+    @Rule
+    public ChromeActivityTestRule<ChromeActivity> mActivityTestRule =
+            new ChromeActivityTestRule<>(ChromeActivity.class);
+
     // The dialog we are testing.
     private PhotoPickerDialog mDialog;
 
@@ -66,16 +84,9 @@ public class PhotoPickerDialogTest extends ChromeActivityTestCaseBase<ChromeActi
     // A callback that fires when the decoder is ready.
     public final CallbackHelper onDecoderReadyCallback = new CallbackHelper();
 
-    public PhotoPickerDialogTest() {
-        super(ChromeActivity.class);
-    }
-
-    // ChromeActivityTestCaseBase:
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
+    @Before
+    public void setUp() throws Exception {
+        mActivityTestRule.startMainActivityOnBlankPage();
         mTestFiles = new ArrayList<>();
         mTestFiles.add(new PickerBitmap("a", 5L, PickerBitmap.PICTURE));
         mTestFiles.add(new PickerBitmap("b", 4L, PickerBitmap.PICTURE));
@@ -88,11 +99,6 @@ public class PhotoPickerDialogTest extends ChromeActivityTestCaseBase<ChromeActi
         DecoderServiceHost.setReadyCallback(this);
     }
 
-    @Override
-    public void startMainActivity() throws InterruptedException {
-        startMainActivityOnBlankPage();
-    }
-
     // PhotoPickerDialog.PhotoPickerListener:
 
     @Override
@@ -128,8 +134,9 @@ public class PhotoPickerDialogTest extends ChromeActivityTestCaseBase<ChromeActi
                 ThreadUtils.runOnUiThreadBlocking(new Callable<PhotoPickerDialog>() {
                     @Override
                     public PhotoPickerDialog call() {
-                        final PhotoPickerDialog dialog = new PhotoPickerDialog(
-                                getActivity(), PhotoPickerDialogTest.this, multiselect, mimeTypes);
+                        final PhotoPickerDialog dialog =
+                                new PhotoPickerDialog(mActivityTestRule.getActivity(),
+                                        PhotoPickerDialogTest.this, multiselect, mimeTypes);
                         dialog.show();
                         return dialog;
                     }
@@ -159,8 +166,8 @@ public class PhotoPickerDialogTest extends ChromeActivityTestCaseBase<ChromeActi
         onSelectionCallback.waitForCallback(callCount, 1);
 
         // Validate the correct selection took place.
-        assertEquals(expectedSelectionCount, mCurrentPhotoSelection.size());
-        assertTrue(mSelectionDelegate.isItemSelected(mTestFiles.get(position)));
+        Assert.assertEquals(expectedSelectionCount, mCurrentPhotoSelection.size());
+        Assert.assertTrue(mSelectionDelegate.isItemSelected(mTestFiles.get(position)));
     }
 
     private void clickDone() throws Exception {
@@ -171,18 +178,18 @@ public class PhotoPickerDialogTest extends ChromeActivityTestCaseBase<ChromeActi
         int callCount = onActionCallback.getCallCount();
         TouchCommon.singleClickView(done);
         onActionCallback.waitForCallback(callCount, 1);
-        assertEquals(PhotoPickerListener.Action.PHOTOS_SELECTED, mLastActionRecorded);
+        Assert.assertEquals(PhotoPickerListener.Action.PHOTOS_SELECTED, mLastActionRecorded);
     }
 
     public void clickCancel() throws Exception {
         mLastActionRecorded = null;
 
         PickerCategoryView categoryView = mDialog.getCategoryViewForTesting();
-        View cancel = new View(getActivity());
+        View cancel = new View(mActivityTestRule.getActivity());
         int callCount = onActionCallback.getCallCount();
         categoryView.onClick(cancel);
         onActionCallback.waitForCallback(callCount, 1);
-        assertEquals(PhotoPickerListener.Action.CANCEL, mLastActionRecorded);
+        Assert.assertEquals(PhotoPickerListener.Action.CANCEL, mLastActionRecorded);
     }
 
     private void dismissDialog() {
@@ -197,22 +204,21 @@ public class PhotoPickerDialogTest extends ChromeActivityTestCaseBase<ChromeActi
     /**
      * Continues to be flaky on bots which doesn't reproduce on local devices,
      * continuing to investigate offline.
-     *
-     * https://crbug.com/761060
-     * @LargeTest
      */
-    @DisabledTest
+    @Test
+    @DisabledTest(message = "crbug.com/761060")
+    @LargeTest
     public void testNoSelection() throws Throwable {
         createDialog(false, Arrays.asList("image/*")); // Multi-select = false.
-        assertTrue(mDialog.isShowing());
+        Assert.assertTrue(mDialog.isShowing());
         waitForDecoder();
 
         int expectedSelectionCount = 1;
         clickView(0, expectedSelectionCount);
         clickCancel();
 
-        assertEquals(null, mLastSelectedPhotos);
-        assertEquals(PhotoPickerListener.Action.CANCEL, mLastActionRecorded);
+        Assert.assertNull(mLastSelectedPhotos);
+        Assert.assertEquals(PhotoPickerListener.Action.CANCEL, mLastActionRecorded);
 
         dismissDialog();
     }
@@ -220,14 +226,13 @@ public class PhotoPickerDialogTest extends ChromeActivityTestCaseBase<ChromeActi
     /**
      * Continues to be flaky on bots which doesn't reproduce on local devices,
      * continuing to investigate offline.
-     *
-     * https://crbug.com/761060
-     * @LargeTest
      */
-    @DisabledTest
+    @Test
+    @DisabledTest(message = "crbug.com/761060")
+    @LargeTest
     public void testSingleSelectionPhoto() throws Throwable {
         createDialog(false, Arrays.asList("image/*")); // Multi-select = false.
-        assertTrue(mDialog.isShowing());
+        Assert.assertTrue(mDialog.isShowing());
         waitForDecoder();
 
         // Expected selection count is 1 because clicking on a new view unselects other.
@@ -236,9 +241,9 @@ public class PhotoPickerDialogTest extends ChromeActivityTestCaseBase<ChromeActi
         clickView(1, expectedSelectionCount);
         clickDone();
 
-        assertEquals(1, mLastSelectedPhotos.length);
-        assertEquals(PhotoPickerListener.Action.PHOTOS_SELECTED, mLastActionRecorded);
-        assertEquals(mTestFiles.get(1).getFilePath(), mLastSelectedPhotos[0]);
+        Assert.assertEquals(1, mLastSelectedPhotos.length);
+        Assert.assertEquals(PhotoPickerListener.Action.PHOTOS_SELECTED, mLastActionRecorded);
+        Assert.assertEquals(mTestFiles.get(1).getFilePath(), mLastSelectedPhotos[0]);
 
         dismissDialog();
     }
@@ -246,14 +251,13 @@ public class PhotoPickerDialogTest extends ChromeActivityTestCaseBase<ChromeActi
     /**
      * Continues to be flaky on bots which doesn't reproduce on local devices,
      * continuing to investigate offline.
-     *
-     * https://crbug.com/761060
-     * @LargeTest
      */
-    @DisabledTest
+    @Test
+    @DisabledTest(message = "crbug.com/761060")
+    @LargeTest
     public void testMultiSelectionPhoto() throws Throwable {
         createDialog(true, Arrays.asList("image/*")); // Multi-select = true.
-        assertTrue(mDialog.isShowing());
+        Assert.assertTrue(mDialog.isShowing());
         waitForDecoder();
 
         // Multi-selection is enabled, so each click is counted.
@@ -263,11 +267,11 @@ public class PhotoPickerDialogTest extends ChromeActivityTestCaseBase<ChromeActi
         clickView(4, expectedSelectionCount++);
         clickDone();
 
-        assertEquals(3, mLastSelectedPhotos.length);
-        assertEquals(PhotoPickerListener.Action.PHOTOS_SELECTED, mLastActionRecorded);
-        assertEquals(mTestFiles.get(0).getFilePath(), mLastSelectedPhotos[0]);
-        assertEquals(mTestFiles.get(2).getFilePath(), mLastSelectedPhotos[1]);
-        assertEquals(mTestFiles.get(4).getFilePath(), mLastSelectedPhotos[2]);
+        Assert.assertEquals(3, mLastSelectedPhotos.length);
+        Assert.assertEquals(PhotoPickerListener.Action.PHOTOS_SELECTED, mLastActionRecorded);
+        Assert.assertEquals(mTestFiles.get(0).getFilePath(), mLastSelectedPhotos[0]);
+        Assert.assertEquals(mTestFiles.get(2).getFilePath(), mLastSelectedPhotos[1]);
+        Assert.assertEquals(mTestFiles.get(4).getFilePath(), mLastSelectedPhotos[2]);
 
         dismissDialog();
     }

chrome/android/javatests/src/org/chromium/chrome/browser/suggestions/ContentSuggestionsTest.java

@@ -6,10 +6,17 @@ package org.chromium.chrome.browser.suggestions;
 
 import android.support.test.filters.SmallTest;
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.UrlConstants;
 import org.chromium.chrome.browser.ntp.NewTabPage;
 import org.chromium.chrome.browser.ntp.snippets.CategoryInt;
@@ -18,43 +25,53 @@ import org.chromium.chrome.browser.ntp.snippets.SnippetsBridge;
 import org.chromium.chrome.browser.ntp.snippets.SuggestionsSource;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.test.ChromeActivityTestCaseBase;
+import org.chromium.chrome.test.ChromeActivityTestRule;
+import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.util.NewTabPageTestUtils;
 
 /**
  * Misc. Content Suggestions instrumentation tests.
  */
-public class ContentSuggestionsTest extends ChromeActivityTestCaseBase<ChromeActivity> {
-    public ContentSuggestionsTest() {
-        super(ChromeActivity.class);
-    }
+@RunWith(ChromeJUnit4ClassRunner.class)
+@CommandLineFlags.Add({
+        ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
+        ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG,
+})
+public class ContentSuggestionsTest {
+    @Rule
+    public ChromeActivityTestRule<ChromeActivity> mActivityTestRule =
+            new ChromeActivityTestRule<>(ChromeActivity.class);
 
-    @Override
-    public void startMainActivity() throws InterruptedException {
-        startMainActivityOnBlankPage();
+    @Before
+    public void setUp() throws InterruptedException {
+        mActivityTestRule.startMainActivityOnBlankPage();
     }
 
+    @Test
     @SmallTest
     @Feature("Suggestions")
     @CommandLineFlags.Add("enable-features=ContentSuggestionsSettings")
     public void testRemoteSuggestionsEnabled() throws InterruptedException {
         NewTabPage ntp = loadNTPWithSearchSuggestState(true);
         SuggestionsUiDelegate uiDelegate = ntp.getManagerForTesting();
-        assertTrue(isCategoryEnabled(uiDelegate.getSuggestionsSource(), KnownCategories.ARTICLES));
+        Assert.assertTrue(
+                isCategoryEnabled(uiDelegate.getSuggestionsSource(), KnownCategories.ARTICLES));
     }
 
+    @Test
     @SmallTest
     @Feature("Suggestions")
     @CommandLineFlags.Add("enable-features=ContentSuggestionsSettings")
     public void testRemoteSuggestionsDisabled() throws InterruptedException {
         NewTabPage ntp = loadNTPWithSearchSuggestState(false);
         SuggestionsUiDelegate uiDelegate = ntp.getManagerForTesting();
-        assertFalse(isCategoryEnabled(uiDelegate.getSuggestionsSource(), KnownCategories.ARTICLES));
+        Assert.assertFalse(
+                isCategoryEnabled(uiDelegate.getSuggestionsSource(), KnownCategories.ARTICLES));
     }
 
     private NewTabPage loadNTPWithSearchSuggestState(final boolean enabled)
             throws InterruptedException {
-        Tab tab = getActivity().getActivityTab();
+        Tab tab = mActivityTestRule.getActivity().getActivityTab();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
@@ -62,10 +79,10 @@ public class ContentSuggestionsTest extends ChromeActivityTestCaseBase<ChromeAct
             }
         });
 
-        loadUrl(UrlConstants.NTP_URL);
+        mActivityTestRule.loadUrl(UrlConstants.NTP_URL);
         NewTabPageTestUtils.waitForNtpLoaded(tab);
 
-        assertTrue(tab.getNativePage() instanceof NewTabPage);
+        Assert.assertTrue(tab.getNativePage() instanceof NewTabPage);
         return (NewTabPage) tab.getNativePage();
     }
 

chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeTabUtils.java

@@ -278,7 +278,7 @@ public class ChromeTabUtils {
         }
 
         try {
-            createdCallback.waitForCallback(0);
+            createdCallback.waitForCallback(null, 0, 1, 10, TimeUnit.SECONDS);
         } catch (TimeoutException e) {
             Assert.fail("Never received tab creation event");
         }

components/cronet/android/BUILD.gn

@@ -457,6 +457,8 @@ instrumentation_test_apk("cronet_sample_test_apk") {
     "//base:base_java_test_support",
     "//net/android:net_java_test_support",
     "//third_party/android_support_test_runner:runner_java",
+    "//third_party/android_support_test_runner:rules_java",
+    "//third_party/junit",
   ]
   additional_apks = [ "//net/android:net_test_support_apk" ]
 
@@ -560,7 +562,7 @@ android_library("cronet_test_apk_java") {
 
 cronet_smoketests_platform_only_common_srcs = [
   "test/smoketests/src/org/chromium/net/smoke/ChromiumPlatformOnlyTestSupport.java",
-  "test/smoketests/src/org/chromium/net/smoke/CronetSmokeTestCase.java",
+  "test/smoketests/src/org/chromium/net/smoke/CronetSmokeTestRule.java",
   "test/smoketests/src/org/chromium/net/smoke/HttpTestServer.java",
   "test/smoketests/src/org/chromium/net/smoke/SmokeTestRequestCallback.java",
   "test/smoketests/src/org/chromium/net/smoke/TestSupport.java",
@@ -568,7 +570,7 @@ cronet_smoketests_platform_only_common_srcs = [
 
 cronet_smoketests_native_common_srcs = cronet_smoketests_platform_only_common_srcs + [
                                          "test/smoketests/src/org/chromium/net/smoke/ChromiumNativeTestSupport.java",
-                                         "test/smoketests/src/org/chromium/net/smoke/NativeCronetTestCase.java",
+                                         "test/smoketests/src/org/chromium/net/smoke/NativeCronetTestRule.java",
                                        ]
 
 android_library("cronet_smoketests_native_java") {
@@ -582,6 +584,8 @@ android_library("cronet_smoketests_native_java") {
     ":cronet_api_java",
     ":cronet_test_apk_java",
     "//base:base_java",
+    "//base:base_java_test_support",
+    "//third_party/junit",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/netty4:netty_all_java",
   ]
@@ -748,6 +752,8 @@ android_library("cronet_smoketests_platform_only_java") {
   java_files = [ "test/smoketests/src/org/chromium/net/smoke/PlatformOnlyEngineTest.java" ] + cronet_smoketests_platform_only_common_srcs
   deps = [
     ":cronet_api_java",
+    "//base:base_java_test_support",
+    "//third_party/junit",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/netty4:netty_all_java",
   ]
@@ -798,6 +804,8 @@ android_library("cronet_smoketests_missing_native_library_java") {
     ":cronet_api_java",
     ":cronet_test_apk_java",
     "//base:base_java",
+    "//base:base_java_test_support",
+    "//third_party/junit",
     "//third_party/android_support_test_runner:runner_java",
     "//third_party/netty4:netty_all_java",
   ]

components/cronet/android/sample/javatests/AndroidManifest.xml

@@ -16,6 +16,10 @@
     <application>
         <uses-library android:name="android.test.runner" />
     </application>
+    <instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
+        android:targetPackage="org.chromium.cronet_sample_apk"
+        android:label="Tests for org.chromium.cronet_sample_apk"
+        chromium-junit4="true"/>
     <instrumentation android:name="android.test.InstrumentationTestRunner"
         android:targetPackage="org.chromium.cronet_sample_apk"
         android:label="Tests for org.chromium.cronet_sample_apk"/>

components/cronet/android/sample/javatests/src/org/chromium/cronet_sample_apk/CronetSampleTest.java

@@ -8,47 +8,56 @@ import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.ConditionVariable;
+import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
-import android.test.ActivityInstrumentationTestCase2;
+import android.support.test.rule.ActivityTestRule;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.widget.TextView;
 
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.base.test.util.Feature;
 import org.chromium.net.test.EmbeddedTestServer;
 
 /**
  * Base test class for all CronetSample based tests.
  */
-public class CronetSampleTest extends
-        ActivityInstrumentationTestCase2<CronetSampleActivity> {
+@RunWith(BaseJUnit4ClassRunner.class)
+public class CronetSampleTest {
     private EmbeddedTestServer mTestServer;
     private String mUrl;
 
-    public CronetSampleTest() {
-        super(CronetSampleActivity.class);
-    }
+    @Rule
+    public ActivityTestRule<CronetSampleActivity> mActivityTestRule =
+            new ActivityTestRule<>(CronetSampleActivity.class, false, false);
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mTestServer = EmbeddedTestServer.createAndStartServer(getInstrumentation().getContext());
+    @Before
+    public void setUp() throws Exception {
+        mTestServer = EmbeddedTestServer.createAndStartServer(
+                InstrumentationRegistry.getInstrumentation().getContext());
         mUrl = mTestServer.getURL("/echo?status=200");
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         mTestServer.stopAndDestroyServer();
-        super.tearDown();
     }
 
+    @Test
     @SmallTest
     @Feature({"Cronet"})
     public void testLoadUrl() throws Exception {
         CronetSampleActivity activity = launchCronetSampleWithUrl(mUrl);
 
         // Make sure the activity was created as expected.
-        assertNotNull(activity);
+        Assert.assertNotNull(activity);
 
         // Verify successful fetch.
         final TextView textView = (TextView) activity.findViewById(R.id.resultView);
@@ -81,10 +90,9 @@ public class CronetSampleTest extends
         intent.addCategory(Intent.CATEGORY_LAUNCHER);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.setData(Uri.parse(url));
-        intent.setComponent(new ComponentName(
-                getInstrumentation().getTargetContext(),
-                CronetSampleActivity.class));
-        setActivityIntent(intent);
-        return getActivity();
+        intent.setComponent(
+                new ComponentName(InstrumentationRegistry.getInstrumentation().getTargetContext(),
+                        CronetSampleActivity.class));
+        return mActivityTestRule.launchActivity(intent);
     }
 }

components/cronet/android/test/smoketests/src/org/chromium/net/smoke/CronetSmokeTestCase.java → components/cronet/android/test/smoketests/src/org/chromium/net/smoke/CronetSmokeTestRule.java

@@ -5,7 +5,12 @@
 package org.chromium.net.smoke;
 
 import android.content.Context;
-import android.test.AndroidTestCase;
+import android.support.test.InstrumentationRegistry;
+
+import org.junit.Assert;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
 
 import org.chromium.net.CronetEngine;
 import org.chromium.net.ExperimentalCronetEngine;
@@ -14,33 +19,54 @@ import org.chromium.net.UrlResponseInfo;
 /**
  * Base test class. This class should not import any classes from the org.chromium.base package.
  */
-public class CronetSmokeTestCase extends AndroidTestCase {
+public class CronetSmokeTestRule implements TestRule {
     /**
      * The key in the string resource file that specifies {@link TestSupport} that should
      * be instantiated.
      */
     private static final String SUPPORT_IMPL_RES_KEY = "TestSupportImplClass";
 
-    protected ExperimentalCronetEngine.Builder mCronetEngineBuilder;
-    protected CronetEngine mCronetEngine;
-    protected TestSupport mTestSupport;
+    public ExperimentalCronetEngine.Builder mCronetEngineBuilder;
+    public CronetEngine mCronetEngine;
+    public TestSupport mTestSupport;
 
     @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mCronetEngineBuilder = new ExperimentalCronetEngine.Builder(getContext());
+    public Statement apply(final Statement base, Description desc) {
+        return new Statement() {
+            @Override
+            public void evaluate() throws Throwable {
+                ruleSetUp();
+                base.evaluate();
+                ruleTearDown();
+            }
+        };
+    }
+
+    public TestSupport getTestSupport() {
+        return mTestSupport;
+    }
+
+    public CronetEngine getCronetEngine() {
+        return mCronetEngine;
+    }
+
+    public ExperimentalCronetEngine.Builder getCronetEngineBuilder() {
+        return mCronetEngineBuilder;
+    }
+
+    private void ruleSetUp() throws Exception {
+        mCronetEngineBuilder =
+                new ExperimentalCronetEngine.Builder(InstrumentationRegistry.getTargetContext());
         initTestSupport();
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    private void ruleTearDown() throws Exception {
         if (mCronetEngine != null) {
             mCronetEngine.shutdown();
         }
-        super.tearDown();
     }
 
-    protected void initCronetEngine() {
+    public void initCronetEngine() {
         mCronetEngine = mCronetEngineBuilder.build();
     }
 
@@ -50,26 +76,28 @@ public class CronetSmokeTestCase extends AndroidTestCase {
             throw new RuntimeException(
                     "The request failed with an error", callback.getFailureError());
         }
-        assertEquals(SmokeTestRequestCallback.State.Succeeded, callback.getFinalState());
+        Assert.assertEquals(SmokeTestRequestCallback.State.Succeeded, callback.getFinalState());
 
         // Check the response info
         UrlResponseInfo responseInfo = callback.getResponseInfo();
-        assertNotNull(responseInfo);
-        assertFalse(responseInfo.wasCached());
-        assertEquals(url, responseInfo.getUrl());
-        assertEquals(url, responseInfo.getUrlChain().get(responseInfo.getUrlChain().size() - 1));
-        assertEquals(200, responseInfo.getHttpStatusCode());
-        assertTrue(responseInfo.toString().length() > 0);
+        Assert.assertNotNull(responseInfo);
+        Assert.assertFalse(responseInfo.wasCached());
+        Assert.assertEquals(url, responseInfo.getUrl());
+        Assert.assertEquals(
+                url, responseInfo.getUrlChain().get(responseInfo.getUrlChain().size() - 1));
+        Assert.assertEquals(200, responseInfo.getHttpStatusCode());
+        Assert.assertTrue(responseInfo.toString().length() > 0);
     }
 
     static void assertJavaEngine(CronetEngine engine) {
-        assertNotNull(engine);
-        assertEquals("org.chromium.net.impl.JavaCronetEngine", engine.getClass().getName());
+        Assert.assertNotNull(engine);
+        Assert.assertEquals("org.chromium.net.impl.JavaCronetEngine", engine.getClass().getName());
     }
 
     static void assertNativeEngine(CronetEngine engine) {
-        assertNotNull(engine);
-        assertEquals("org.chromium.net.impl.CronetUrlRequestContext", engine.getClass().getName());
+        Assert.assertNotNull(engine);
+        Assert.assertEquals(
+                "org.chromium.net.impl.CronetUrlRequestContext", engine.getClass().getName());
     }
 
     /**
@@ -80,7 +108,7 @@ public class CronetSmokeTestCase extends AndroidTestCase {
      * @throws Exception if the class cannot be instantiated.
      */
     private void initTestSupport() throws Exception {
-        Context ctx = getContext();
+        Context ctx = InstrumentationRegistry.getTargetContext();
         String packageName = ctx.getPackageName();
         int resId = ctx.getResources().getIdentifier(SUPPORT_IMPL_RES_KEY, "string", packageName);
         String className = ctx.getResources().getString(resId);

components/cronet/android/test/smoketests/src/org/chromium/net/smoke/Http2Test.java

@@ -4,41 +4,54 @@
 
 package org.chromium.net.smoke;
 
+import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.net.UrlRequest;
 
 /**
  * HTTP2 Tests.
  */
-public class Http2Test extends NativeCronetTestCase {
+@RunWith(BaseJUnit4ClassRunner.class)
+public class Http2Test {
     private TestSupport.TestServer mServer;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mServer = mTestSupport.createTestServer(getContext(), TestSupport.Protocol.HTTP2);
+    @Rule
+    public NativeCronetTestRule mRule = new NativeCronetTestRule();
+
+    @Before
+    public void setUp() throws Exception {
+        mServer = mRule.getTestSupport().createTestServer(
+                InstrumentationRegistry.getTargetContext(), TestSupport.Protocol.HTTP2);
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         mServer.shutdown();
-        super.tearDown();
     }
 
     // Test that HTTP/2 is enabled by default but QUIC is not.
+    @Test
     @SmallTest
     public void testHttp2() throws Exception {
-        mTestSupport.installMockCertVerifierForTesting(mCronetEngineBuilder);
-        initCronetEngine();
-        assertTrue(mServer.start());
+        mRule.getTestSupport().installMockCertVerifierForTesting(mRule.getCronetEngineBuilder());
+        mRule.initCronetEngine();
+        Assert.assertTrue(mServer.start());
         SmokeTestRequestCallback callback = new SmokeTestRequestCallback();
-        UrlRequest.Builder requestBuilder = mCronetEngine.newUrlRequestBuilder(
+        UrlRequest.Builder requestBuilder = mRule.getCronetEngine().newUrlRequestBuilder(
                 mServer.getSuccessURL(), callback, callback.getExecutor());
         requestBuilder.build().start();
         callback.blockForDone();
 
-        assertSuccessfulNonEmptyResponse(callback, mServer.getSuccessURL());
-        assertEquals("h2", callback.getResponseInfo().getNegotiatedProtocol());
+        CronetSmokeTestRule.assertSuccessfulNonEmptyResponse(callback, mServer.getSuccessURL());
+        Assert.assertEquals("h2", callback.getResponseInfo().getNegotiatedProtocol());
     }
 }

components/cronet/android/test/smoketests/src/org/chromium/net/smoke/MissingNativeLibraryTest.java

@@ -4,8 +4,17 @@
 
 package org.chromium.net.smoke;
 
+import static org.chromium.net.smoke.CronetSmokeTestRule.assertJavaEngine;
+
+import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.net.CronetEngine;
 import org.chromium.net.CronetProvider;
 import org.chromium.net.ExperimentalCronetEngine;
@@ -16,23 +25,28 @@ import java.util.List;
  *  Tests scenarios when the native shared library file is missing in the APK or was built for a
  *  wrong architecture.
  */
-public class MissingNativeLibraryTest extends CronetSmokeTestCase {
+@RunWith(BaseJUnit4ClassRunner.class)
+public class MissingNativeLibraryTest {
+    @Rule
+    public CronetSmokeTestRule mRule = new CronetSmokeTestRule();
+
     /**
      * If the ".so" file is missing, instantiating the Cronet engine should throw an exception.
      */
+    @Test
     @SmallTest
     public void testExceptionWhenSoFileIsAbsent() throws Exception {
         ExperimentalCronetEngine.Builder builder =
-                new ExperimentalCronetEngine.Builder(getContext());
+                new ExperimentalCronetEngine.Builder(InstrumentationRegistry.getTargetContext());
         try {
             builder.build();
-            fail("Expected exception since the shared library '.so' file is absent");
+            Assert.fail("Expected exception since the shared library '.so' file is absent");
         } catch (Throwable t) {
             // Find the root cause.
             while (t.getCause() != null) {
                 t = t.getCause();
             }
-            assertEquals(UnsatisfiedLinkError.class, t.getClass());
+            Assert.assertEquals(UnsatisfiedLinkError.class, t.getClass());
         }
     }
 
@@ -40,13 +54,15 @@ public class MissingNativeLibraryTest extends CronetSmokeTestCase {
      * Tests the embedder ability to select Java (platform) based implementation when
      * the native library is missing or doesn't load for some reason,
      */
+    @Test
     @SmallTest
     public void testForceChoiceOfJavaEngine() throws Exception {
-        List<CronetProvider> availableProviders = CronetProvider.getAllProviders(getContext());
+        List<CronetProvider> availableProviders =
+                CronetProvider.getAllProviders(InstrumentationRegistry.getTargetContext());
         boolean foundNativeProvider = false;
         CronetProvider platformProvider = null;
         for (CronetProvider provider : availableProviders) {
-            assertTrue(provider.isEnabled());
+            Assert.assertTrue(provider.isEnabled());
             if (provider.getName().equals(CronetProvider.PROVIDER_NAME_APP_PACKAGED)) {
                 foundNativeProvider = true;
             } else if (provider.getName().equals(CronetProvider.PROVIDER_NAME_FALLBACK)) {
@@ -54,18 +70,18 @@ public class MissingNativeLibraryTest extends CronetSmokeTestCase {
             }
         }
 
-        assertTrue("Unable to find the native cronet provider", foundNativeProvider);
-        assertNotNull("Unable to find the platform cronet provider", platformProvider);
+        Assert.assertTrue("Unable to find the native cronet provider", foundNativeProvider);
+        Assert.assertNotNull("Unable to find the platform cronet provider", platformProvider);
 
         CronetEngine.Builder builder = platformProvider.createBuilder();
         CronetEngine engine = builder.build();
         assertJavaEngine(engine);
 
-        assertTrue("It should be always possible to cast the created builder to"
+        Assert.assertTrue("It should be always possible to cast the created builder to"
                         + " ExperimentalCronetEngine.Builder",
                 builder instanceof ExperimentalCronetEngine.Builder);
 
-        assertTrue("It should be always possible to cast the created engine to"
+        Assert.assertTrue("It should be always possible to cast the created engine to"
                         + " ExperimentalCronetEngine.Builder",
                 engine instanceof ExperimentalCronetEngine);
     }

components/cronet/android/test/smoketests/src/org/chromium/net/smoke/NativeCronetTestCase.java → components/cronet/android/test/smoketests/src/org/chromium/net/smoke/NativeCronetTestRule.java

@@ -4,6 +4,11 @@
 
 package org.chromium.net.smoke;
 
+import android.support.test.InstrumentationRegistry;
+
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
 import org.chromium.base.ContextUtils;
 import org.chromium.base.PathUtils;
 
@@ -13,31 +18,40 @@ import java.io.File;
  * Test base class for testing native Engine implementation. This class can import classes from the
  * org.chromium.base package.
  */
-public class NativeCronetTestCase extends CronetSmokeTestCase {
+public class NativeCronetTestRule extends CronetSmokeTestRule {
     private static final String PRIVATE_DATA_DIRECTORY_SUFFIX = "cronet_test";
     private static final String LOGFILE_NAME = "cronet-netlog.json";
 
     @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        ContextUtils.initApplicationContext(getContext().getApplicationContext());
-        PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);
-        mTestSupport.loadTestNativeLibrary();
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        stopAndSaveNetLog();
-        super.tearDown();
+    public Statement apply(final Statement base, Description desc) {
+        return super.apply(new Statement() {
+            @Override
+            public void evaluate() throws Throwable {
+                ruleSetUp();
+                base.evaluate();
+                ruleTearDown();
+            }
+        }, desc);
     }
 
     @Override
-    protected void initCronetEngine() {
+    public void initCronetEngine() {
         super.initCronetEngine();
         assertNativeEngine(mCronetEngine);
         startNetLog();
     }
 
+    private void ruleSetUp() throws Exception {
+        ContextUtils.initApplicationContext(
+                InstrumentationRegistry.getTargetContext().getApplicationContext());
+        PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);
+        mTestSupport.loadTestNativeLibrary();
+    }
+
+    private void ruleTearDown() throws Exception {
+        stopAndSaveNetLog();
+    }
+
     private void startNetLog() {
         if (mCronetEngine != null) {
             mCronetEngine.startNetLogToFile(
@@ -50,6 +64,6 @@ public class NativeCronetTestCase extends CronetSmokeTestCase {
         mCronetEngine.stopNetLog();
         File netLogFile = new File(PathUtils.getDataDirectory(), LOGFILE_NAME);
         if (!netLogFile.exists()) return;
-        mTestSupport.processNetLog(getContext(), netLogFile);
+        mTestSupport.processNetLog(InstrumentationRegistry.getTargetContext(), netLogFile);
     }
 }

components/cronet/android/test/smoketests/src/org/chromium/net/smoke/PlatformOnlyEngineTest.java

@@ -4,42 +4,58 @@
 
 package org.chromium.net.smoke;
 
+import static org.chromium.net.smoke.CronetSmokeTestRule.assertJavaEngine;
+import static org.chromium.net.smoke.CronetSmokeTestRule.assertSuccessfulNonEmptyResponse;
+
+import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.net.UrlRequest;
 
 /**
  * Tests scenario when an app doesn't contain the native Cronet implementation.
  */
-public class PlatformOnlyEngineTest extends CronetSmokeTestCase {
+@RunWith(BaseJUnit4ClassRunner.class)
+public class PlatformOnlyEngineTest {
     private String mURL;
     private TestSupport.TestServer mServer;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Rule
+    public CronetSmokeTestRule mRule = new CronetSmokeTestRule();
+
+    @Before
+    public void setUp() throws Exception {
         // Java-only implementation of the Cronet engine only supports Http/1 protocol.
-        mServer = mTestSupport.createTestServer(getContext(), TestSupport.Protocol.HTTP1);
-        assertTrue(mServer.start());
+        mServer = mRule.getTestSupport().createTestServer(
+                InstrumentationRegistry.getTargetContext(), TestSupport.Protocol.HTTP1);
+        Assert.assertTrue(mServer.start());
         mURL = mServer.getSuccessURL();
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         mServer.shutdown();
-        super.tearDown();
     }
 
     /**
      * Test a successful response when a request is sent by the Java Cronet Engine.
      */
+    @Test
     @SmallTest
     public void testSuccessfulResponse() {
-        initCronetEngine();
-        assertJavaEngine(mCronetEngine);
+        mRule.initCronetEngine();
+        assertJavaEngine(mRule.getCronetEngine());
         SmokeTestRequestCallback callback = new SmokeTestRequestCallback();
-        UrlRequest.Builder requestBuilder =
-                mCronetEngine.newUrlRequestBuilder(mURL, callback, callback.getExecutor());
+        UrlRequest.Builder requestBuilder = mRule.getCronetEngine().newUrlRequestBuilder(
+                mURL, callback, callback.getExecutor());
         requestBuilder.build().start();
         callback.blockForDone();
         assertSuccessfulNonEmptyResponse(callback, mURL);

components/cronet/android/test/smoketests/src/org/chromium/net/smoke/QuicTest.java

@@ -4,12 +4,20 @@
 
 package org.chromium.net.smoke;
 
+import static org.chromium.net.smoke.TestSupport.Protocol.QUIC;
+
+import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
 
 import org.json.JSONObject;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-import static org.chromium.net.smoke.TestSupport.Protocol.QUIC;
-
+import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.net.UrlRequest;
 
 import java.net.URL;
@@ -17,37 +25,41 @@ import java.net.URL;
 /**
  * QUIC Tests.
  */
-public class QuicTest extends NativeCronetTestCase {
+@RunWith(BaseJUnit4ClassRunner.class)
+public class QuicTest {
     private TestSupport.TestServer mServer;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mServer = mTestSupport.createTestServer(getContext(), QUIC);
+    @Rule
+    public NativeCronetTestRule mRule = new NativeCronetTestRule();
+
+    @Before
+    public void setUp() throws Exception {
+        mServer = mRule.getTestSupport().createTestServer(
+                InstrumentationRegistry.getTargetContext(), QUIC);
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         mServer.shutdown();
-        super.tearDown();
     }
 
+    @Test
     @SmallTest
     public void testQuic() throws Exception {
-        assertTrue(mServer.start());
+        Assert.assertTrue(mServer.start());
         final String urlString = mServer.getSuccessURL();
         final URL url = new URL(urlString);
 
-        mCronetEngineBuilder.enableQuic(true);
-        mCronetEngineBuilder.addQuicHint(url.getHost(), url.getPort(), url.getPort());
-        mTestSupport.installMockCertVerifierForTesting(mCronetEngineBuilder);
+        mRule.getCronetEngineBuilder().enableQuic(true);
+        mRule.getCronetEngineBuilder().addQuicHint(url.getHost(), url.getPort(), url.getPort());
+        mRule.getTestSupport().installMockCertVerifierForTesting(mRule.getCronetEngineBuilder());
 
         JSONObject quicParams = new JSONObject();
         JSONObject experimentalOptions = new JSONObject().put("QUIC", quicParams);
-        mTestSupport.addHostResolverRules(experimentalOptions);
-        mCronetEngineBuilder.setExperimentalOptions(experimentalOptions.toString());
+        mRule.getTestSupport().addHostResolverRules(experimentalOptions);
+        mRule.getCronetEngineBuilder().setExperimentalOptions(experimentalOptions.toString());
 
-        initCronetEngine();
+        mRule.initCronetEngine();
 
         // QUIC is not guaranteed to win the race, so try multiple times.
         boolean quicNegotiated = false;
@@ -55,15 +67,16 @@ public class QuicTest extends NativeCronetTestCase {
         for (int i = 0; i < 5; i++) {
             SmokeTestRequestCallback callback = new SmokeTestRequestCallback();
             UrlRequest.Builder requestBuilder =
-                    mCronetEngine.newUrlRequestBuilder(urlString, callback, callback.getExecutor());
+                    mRule.getCronetEngine().newUrlRequestBuilder(
+                            urlString, callback, callback.getExecutor());
             requestBuilder.build().start();
             callback.blockForDone();
-            assertSuccessfulNonEmptyResponse(callback, urlString);
+            NativeCronetTestRule.assertSuccessfulNonEmptyResponse(callback, urlString);
             if (callback.getResponseInfo().getNegotiatedProtocol().startsWith("http/2+quic/")) {
                 quicNegotiated = true;
                 break;
             }
         }
-        assertTrue(quicNegotiated);
+        Assert.assertTrue(quicNegotiated);
     }
 }