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

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/video/FullscreenVideoTest.java

Issue 2831823003: Convert ChromeActivityTestCaseBase direct children to JUnit4 (Closed)
Patch Set: rebase and convert newly added test 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
Index: chrome/android/javatests/src/org/chromium/chrome/browser/video/FullscreenVideoTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/video/FullscreenVideoTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/video/FullscreenVideoTest.java
index eaa34dea315e19f15ae95466741459da58f18f08..14f44346153c3c0ff5e5babffef5aa891d90cd91 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/video/FullscreenVideoTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/video/FullscreenVideoTest.java
@@ -4,13 +4,23 @@
package org.chromium.chrome.browser.video;
+import android.support.test.InstrumentationRegistry;
import android.view.KeyEvent;
+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.FlakyTest;
import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.ChromeSwitches;
import org.chromium.chrome.browser.tab.EmptyTabObserver;
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;
import org.chromium.content.browser.test.util.KeyUtils;
@@ -20,7 +30,14 @@ import org.chromium.net.test.EmbeddedTestServer;
/**
* Test suite for fullscreen video implementation.
*/
-public class FullscreenVideoTest extends ChromeActivityTestCaseBase<ChromeActivity> {
+@RunWith(ChromeJUnit4ClassRunner.class)
+@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
+ ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG})
+public class FullscreenVideoTest {
+ @Rule
+ public ChromeActivityTestRule<ChromeActivity> mActivityTestRule =
+ new ChromeActivityTestRule<>(ChromeActivity.class);
+
private static final int TEST_TIMEOUT = 3000;
private boolean mIsTabFullscreen = false;
@@ -31,13 +48,9 @@ public class FullscreenVideoTest extends ChromeActivityTestCaseBase<ChromeActivi
}
}
- public FullscreenVideoTest() {
- super(ChromeActivity.class);
- }
-
- @Override
- public void startMainActivity() throws InterruptedException {
- startMainActivityOnBlankPage();
+ @Before
+ public void setUp() throws InterruptedException {
+ mActivityTestRule.startMainActivityOnBlankPage();
}
/**
@@ -46,27 +59,29 @@ public class FullscreenVideoTest extends ChromeActivityTestCaseBase<ChromeActivi
*
* @MediumTest
*/
+ @Test
@FlakyTest(message = "crbug.com/458368")
public void testExitFullscreenNotifiesTabObservers() throws InterruptedException {
EmbeddedTestServer testServer = EmbeddedTestServer.createAndStartServer(
- getInstrumentation().getContext());
+ InstrumentationRegistry.getInstrumentation().getContext());
try {
String url = testServer.getURL(
"/chrome/test/data/android/media/video-fullscreen.html");
- loadUrl(url);
- Tab tab = getActivity().getActivityTab();
+ mActivityTestRule.loadUrl(url);
+ Tab tab = mActivityTestRule.getActivity().getActivityTab();
FullscreenTabObserver observer = new FullscreenTabObserver();
tab.addObserver(observer);
- TestTouchUtils.singleClickView(getInstrumentation(), tab.getView(), 500, 500);
+ TestTouchUtils.singleClickView(
+ InstrumentationRegistry.getInstrumentation(), tab.getView(), 500, 500);
waitForVideoToEnterFullscreen();
// Key events have to be dispached on UI thread.
- KeyUtils.singleKeyEventActivity(
- getInstrumentation(), getActivity(), KeyEvent.KEYCODE_BACK);
+ KeyUtils.singleKeyEventActivity(InstrumentationRegistry.getInstrumentation(),
+ mActivityTestRule.getActivity(), KeyEvent.KEYCODE_BACK);
waitForTabToExitFullscreen();
- assertEquals("URL mismatch after exiting fullscreen video",
- url, getActivity().getActivityTab().getUrl());
+ Assert.assertEquals("URL mismatch after exiting fullscreen video", url,
+ mActivityTestRule.getActivity().getActivityTab().getUrl());
} finally {
testServer.stopAndDestroyServer();
}

Powered by Google App Engine
This is Rietveld 408576698