content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java - Issue 2708243004: Auto convert content shell tests to JUnit4

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java

Issue 2708243004: Auto convert content shell tests to JUnit4 (Closed)

Patch Set: rebase Created 3 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « content/public/android/javatests/src/org/chromium/content/browser/EncodeHtmlDataUriTest.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/ImportantFileWriterAndroidTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java b/content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java

index 497299d0e37ad378aed2caacbccea7050afcd81c..31c50fc39cae7945089af593e17ebc0666a8a556 100644

--- a/content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java

+++ b/content/public/android/javatests/src/org/chromium/content/browser/GestureDetectorResetTest.java

@@ -6,10 +6,16 @@ package org.chromium.content.browser;

import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;

+import android.support.test.InstrumentationRegistry;

import android.support.test.filters.LargeTest;

import junit.framework.Assert;

+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.base.test.util.RetryOnFailure;

import org.chromium.base.test.util.UrlUtils;

@@ -19,7 +25,7 @@ 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_public.browser.LoadUrlParams;

-import org.chromium.content_shell_apk.ContentShellTestBase;

+import org.chromium.content_shell_apk.ContentShellActivityTestRule;

import java.util.concurrent.TimeUnit;

@@ -27,7 +33,11 @@ import java.util.concurrent.TimeUnit;

* Provides test environment for Gesture Detector Reset for Content Shell.

* This is a helper class for Content Shell tests.

-public class GestureDetectorResetTest extends ContentShellTestBase {

+@RunWith(BaseJUnit4ClassRunner.class)

+public class GestureDetectorResetTest {

+ @Rule

+ public ContentShellActivityTestRule mActivityTestRule = new ContentShellActivityTestRule();

private static final long WAIT_TIMEOUT_SECONDS = scaleTimeout(2);

private static final String CLICK_TEST_URL = UrlUtils.encodeHtmlDataUri("<html><body>"

+ "<button id=\"button\" "

@@ -90,16 +100,17 @@ public class GestureDetectorResetTest extends ContentShellTestBase {

* Tests that showing a select popup and having the page reload while the popup is showing does

* not assert.

+ @Test

@LargeTest

@Feature({"Browser"})

@RetryOnFailure

public void testSeparateClicksAreRegisteredOnReload()

throws InterruptedException, Exception, Throwable {

// Load the test page.

- launchContentShellWithUrl(CLICK_TEST_URL);

- waitForActiveShellToBeDoneLoading();

+ mActivityTestRule.launchContentShellWithUrl(CLICK_TEST_URL);

+ mActivityTestRule.waitForActiveShellToBeDoneLoading();

- final ContentViewCore viewCore = getContentViewCore();

+ final ContentViewCore viewCore = mActivityTestRule.getContentViewCore();

final TestCallbackHelperContainer viewClient =

new TestCallbackHelperContainer(viewCore);

final OnPageFinishedHelper onPageFinishedHelper =

@@ -110,10 +121,10 @@ public class GestureDetectorResetTest extends ContentShellTestBase {

// Reload the test page.

int currentCallCount = onPageFinishedHelper.getCallCount();

- getInstrumentation().runOnMainSync(new Runnable() {

+ InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {

@Override

public void run() {

- getActivity().getActiveShell().loadUrl(CLICK_TEST_URL);

+ mActivityTestRule.getActivity().getActiveShell().loadUrl(CLICK_TEST_URL);

}

});

onPageFinishedHelper.waitForCallback(currentCallCount, 1,

@@ -124,12 +135,15 @@ public class GestureDetectorResetTest extends ContentShellTestBase {

// Directly navigate to the test page.

currentCallCount = onPageFinishedHelper.getCallCount();

- getInstrumentation().runOnMainSync(new Runnable() {

+ InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {

@Override

public void run() {

- getActivity().getActiveShell().getContentViewCore().getWebContents()

- .getNavigationController().loadUrl(

- new LoadUrlParams(CLICK_TEST_URL));

+ mActivityTestRule.getActivity()

+ .getActiveShell()

+ .getContentViewCore()

+ .getWebContents()

+ .getNavigationController()

+ .loadUrl(new LoadUrlParams(CLICK_TEST_URL));

}

});

onPageFinishedHelper.waitForCallback(currentCallCount, 1,