Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1245)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateTest.java

Issue 2860843002: Revert of Reland: Convert ChromeActivityTestCaseBase direct children to JUnit4 (Closed)
Patch Set: Created 3 years, 8 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
Download patch
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/tab/SadTabTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateTest.java
index c2887ed5128322e4fdf46e0019a5f975207f3f06..e4ac29c69c3614c4fa267042c7af27c0739719f9 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/tab/InterceptNavigationDelegateTest.java
@@ -4,26 +4,15 @@
package org.chromium.chrome.browser.tab;
-import android.support.test.InstrumentationRegistry;
import android.support.test.filters.MediumTest;
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.ThreadUtils;
-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.externalnav.ExternalNavigationHandler;
import org.chromium.chrome.browser.externalnav.ExternalNavigationParams;
-import org.chromium.chrome.test.ChromeActivityTestRule;
-import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.chrome.test.ChromeActivityTestCaseBase;
import org.chromium.components.navigation_interception.NavigationParams;
import org.chromium.content.browser.test.util.Criteria;
import org.chromium.content.browser.test.util.CriteriaHelper;
@@ -38,15 +27,8 @@
/**
* Tests for InterceptNavigationDelegate
*/
-@RunWith(ChromeJUnit4ClassRunner.class)
@RetryOnFailure
-@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
- ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG})
-public class InterceptNavigationDelegateTest {
- @Rule
- public ChromeActivityTestRule<ChromeActivity> mActivityTestRule =
- new ChromeActivityTestRule<>(ChromeActivity.class);
-
+public class InterceptNavigationDelegateTest extends ChromeActivityTestCaseBase<ChromeActivity> {
private static final String BASE_PAGE = "/chrome/test/data/navigation_interception/";
private static final String NAVIGATION_FROM_TIMEOUT_PAGE =
BASE_PAGE + "navigation_from_timer.html";
@@ -96,6 +78,15 @@
}
}
+ public InterceptNavigationDelegateTest() {
+ super(ChromeActivity.class);
+ }
+
+ @Override
+ public void startMainActivity() throws InterruptedException {
+ startMainActivityOnBlankPage();
+ }
+
private void waitTillExpectedCallsComplete(int count, long timeout) {
CriteriaHelper.pollUiThread(
Criteria.equals(count, new Callable<Integer>() {
@@ -106,10 +97,10 @@
}), timeout, CriteriaHelper.DEFAULT_POLLING_INTERVAL);
}
- @Before
- public void setUp() throws Exception {
- mActivityTestRule.startMainActivityOnBlankPage();
- mActivity = mActivityTestRule.getActivity();
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ mActivity = getActivity();
mInterceptNavigationDelegate = new TestInterceptNavigationDelegate();
ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@Override
@@ -118,104 +109,95 @@
tab.setInterceptNavigationDelegate(mInterceptNavigationDelegate);
}
});
- mTestServer = EmbeddedTestServer.createAndStartServer(
- InstrumentationRegistry.getInstrumentation().getContext());
- }
-
- @After
- public void tearDown() throws Exception {
+ mTestServer = EmbeddedTestServer.createAndStartServer(getInstrumentation().getContext());
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
mTestServer.stopAndDestroyServer();
- }
-
- @Test
+ super.tearDown();
+ }
+
@SmallTest
public void testNavigationFromTimer() throws InterruptedException {
- mActivityTestRule.loadUrl(mTestServer.getURL(NAVIGATION_FROM_TIMEOUT_PAGE));
- Assert.assertEquals(1, mNavParamHistory.size());
-
- waitTillExpectedCallsComplete(2, DEFAULT_MAX_TIME_TO_WAIT_IN_MS);
- Assert.assertFalse(mNavParamHistory.get(1).hasUserGesture);
- Assert.assertFalse(mNavParamHistory.get(1).hasUserGestureCarryover);
- }
-
- @Test
+ loadUrl(mTestServer.getURL(NAVIGATION_FROM_TIMEOUT_PAGE));
+ assertEquals(1, mNavParamHistory.size());
+
+ waitTillExpectedCallsComplete(2, DEFAULT_MAX_TIME_TO_WAIT_IN_MS);
+ assertFalse(mNavParamHistory.get(1).hasUserGesture);
+ assertFalse(mNavParamHistory.get(1).hasUserGestureCarryover);
+ }
+
@SmallTest
public void testNavigationFromUserGesture() throws InterruptedException, TimeoutException {
- mActivityTestRule.loadUrl(mTestServer.getURL(NAVIGATION_FROM_USER_GESTURE_PAGE));
- Assert.assertEquals(1, mNavParamHistory.size());
-
- DOMUtils.clickNode(mActivity.getActivityTab().getContentViewCore(), "first");
- waitTillExpectedCallsComplete(2, DEFAULT_MAX_TIME_TO_WAIT_IN_MS);
- Assert.assertTrue(mNavParamHistory.get(1).hasUserGesture);
- Assert.assertFalse(mNavParamHistory.get(1).hasUserGestureCarryover);
- }
-
- @Test
+ loadUrl(mTestServer.getURL(NAVIGATION_FROM_USER_GESTURE_PAGE));
+ assertEquals(1, mNavParamHistory.size());
+
+ DOMUtils.clickNode(mActivity.getActivityTab().getContentViewCore(), "first");
+ waitTillExpectedCallsComplete(2, DEFAULT_MAX_TIME_TO_WAIT_IN_MS);
+ assertTrue(mNavParamHistory.get(1).hasUserGesture);
+ assertFalse(mNavParamHistory.get(1).hasUserGestureCarryover);
+ }
+
@SmallTest
public void testNavigationFromXHRCallback() throws InterruptedException, TimeoutException {
- mActivityTestRule.loadUrl(mTestServer.getURL(NAVIGATION_FROM_XHR_CALLBACK_PAGE));
- Assert.assertEquals(1, mNavParamHistory.size());
-
- DOMUtils.clickNode(mActivity.getActivityTab().getContentViewCore(), "first");
- waitTillExpectedCallsComplete(2, DEFAULT_MAX_TIME_TO_WAIT_IN_MS);
- Assert.assertFalse(mNavParamHistory.get(1).hasUserGesture);
- Assert.assertTrue(mNavParamHistory.get(1).hasUserGestureCarryover);
- }
-
- @Test
+ loadUrl(mTestServer.getURL(NAVIGATION_FROM_XHR_CALLBACK_PAGE));
+ assertEquals(1, mNavParamHistory.size());
+
+ DOMUtils.clickNode(mActivity.getActivityTab().getContentViewCore(), "first");
+ waitTillExpectedCallsComplete(2, DEFAULT_MAX_TIME_TO_WAIT_IN_MS);
+ assertFalse(mNavParamHistory.get(1).hasUserGesture);
+ assertTrue(mNavParamHistory.get(1).hasUserGestureCarryover);
+ }
+
@SmallTest
public void testNavigationFromXHRCallbackAndShortTimeout()
throws InterruptedException, TimeoutException {
- mActivityTestRule.loadUrl(
- mTestServer.getURL(NAVIGATION_FROM_XHR_CALLBACK_AND_SHORT_TIMEOUT_PAGE));
- Assert.assertEquals(1, mNavParamHistory.size());
-
- DOMUtils.clickNode(mActivity.getActivityTab().getContentViewCore(), "first");
- waitTillExpectedCallsComplete(2, DEFAULT_MAX_TIME_TO_WAIT_IN_MS);
- Assert.assertFalse(mNavParamHistory.get(1).hasUserGesture);
- Assert.assertTrue(mNavParamHistory.get(1).hasUserGestureCarryover);
- }
-
- @Test
+ loadUrl(mTestServer.getURL(NAVIGATION_FROM_XHR_CALLBACK_AND_SHORT_TIMEOUT_PAGE));
+ assertEquals(1, mNavParamHistory.size());
+
+ DOMUtils.clickNode(mActivity.getActivityTab().getContentViewCore(), "first");
+ waitTillExpectedCallsComplete(2, DEFAULT_MAX_TIME_TO_WAIT_IN_MS);
+ assertFalse(mNavParamHistory.get(1).hasUserGesture);
+ assertTrue(mNavParamHistory.get(1).hasUserGestureCarryover);
+ }
+
@SmallTest
public void testNavigationFromXHRCallbackAndLongTimeout()
throws InterruptedException, TimeoutException {
- mActivityTestRule.loadUrl(
+ loadUrl(
mTestServer.getURL(NAVIGATION_FROM_XHR_CALLBACK_AND_LONG_TIMEOUT_PAGE));
- Assert.assertEquals(1, mNavParamHistory.size());
+ assertEquals(1, mNavParamHistory.size());
DOMUtils.clickNode(mActivity.getActivityTab().getContentViewCore(), "first");
waitTillExpectedCallsComplete(2, LONG_MAX_TIME_TO_WAIT_IN_MS);
- Assert.assertFalse(mNavParamHistory.get(1).hasUserGesture);
- Assert.assertFalse(mNavParamHistory.get(1).hasUserGestureCarryover);
- }
-
- @Test
+ assertFalse(mNavParamHistory.get(1).hasUserGesture);
+ assertFalse(mNavParamHistory.get(1).hasUserGestureCarryover);
+ }
+
@SmallTest
public void testNavigationFromImageOnLoad() throws InterruptedException, TimeoutException {
- mActivityTestRule.loadUrl(mTestServer.getURL(NAVIGATION_FROM_IMAGE_ONLOAD_PAGE));
- Assert.assertEquals(1, mNavParamHistory.size());
-
- DOMUtils.clickNode(mActivity.getActivityTab().getContentViewCore(), "first");
- waitTillExpectedCallsComplete(2, DEFAULT_MAX_TIME_TO_WAIT_IN_MS);
- Assert.assertFalse(mNavParamHistory.get(1).hasUserGesture);
- Assert.assertTrue(mNavParamHistory.get(1).hasUserGestureCarryover);
- }
-
- @Test
+ loadUrl(mTestServer.getURL(NAVIGATION_FROM_IMAGE_ONLOAD_PAGE));
+ assertEquals(1, mNavParamHistory.size());
+
+ DOMUtils.clickNode(mActivity.getActivityTab().getContentViewCore(), "first");
+ waitTillExpectedCallsComplete(2, DEFAULT_MAX_TIME_TO_WAIT_IN_MS);
+ assertFalse(mNavParamHistory.get(1).hasUserGesture);
+ assertTrue(mNavParamHistory.get(1).hasUserGestureCarryover);
+ }
+
@MediumTest
public void testExternalAppIframeNavigation() throws InterruptedException, TimeoutException {
- mActivityTestRule.loadUrl(mTestServer.getURL(NAVIGATION_FROM_USER_GESTURE_IFRAME_PAGE));
- Assert.assertEquals(1, mNavParamHistory.size());
+ loadUrl(mTestServer.getURL(NAVIGATION_FROM_USER_GESTURE_IFRAME_PAGE));
+ assertEquals(1, mNavParamHistory.size());
DOMUtils.clickNode(mActivity.getActivityTab().getContentViewCore(), "first");
waitTillExpectedCallsComplete(3, DEFAULT_MAX_TIME_TO_WAIT_IN_MS);
- Assert.assertEquals(3, mExternalNavParamHistory.size());
-
- Assert.assertTrue(mNavParamHistory.get(2).isExternalProtocol);
- Assert.assertFalse(mNavParamHistory.get(2).isMainFrame);
- Assert.assertTrue(
- mExternalNavParamHistory.get(2).getRedirectHandler().shouldStayInChrome(true));
+ assertEquals(3, mExternalNavParamHistory.size());
+
+ assertTrue(mNavParamHistory.get(2).isExternalProtocol);
+ assertFalse(mNavParamHistory.get(2).isMainFrame);
+ assertTrue(mExternalNavParamHistory.get(2).getRedirectHandler().shouldStayInChrome(true));
}
}
« no previous file with comments | « chrome/android/javatests/src/org/chromium/chrome/browser/superviseduser/SupervisedUserContentProviderTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/tab/SadTabTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698