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

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/AudioTest.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
« no previous file with comments | « no previous file | chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerIntegrationTest.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/AudioTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/AudioTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/AudioTest.java
index 2465227c6ca82c89361a36453d2191cbbb7ef9b2..f2a69ea8fcaa5058ab263f4b3781392c7fd7fa4d 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/AudioTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/AudioTest.java
@@ -4,9 +4,20 @@
package org.chromium.chrome.browser;
+import android.support.test.InstrumentationRegistry;
+
+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.util.CommandLineFlags;
import org.chromium.base.test.util.FlakyTest;
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.browser.TabTitleObserver;
import org.chromium.content.browser.test.util.DOMUtils;
import org.chromium.net.test.EmbeddedTestServer;
@@ -16,24 +27,26 @@ import java.util.concurrent.TimeoutException;
/**
* Simple HTML5 audio tests.
*/
-public class AudioTest extends ChromeActivityTestCaseBase<ChromeActivity> {
+@RunWith(ChromeJUnit4ClassRunner.class)
+@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
+ ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG})
+public class AudioTest {
+ @Rule
+ public ChromeActivityTestRule<ChromeActivity> mActivityTestRule =
+ new ChromeActivityTestRule<>(ChromeActivity.class);
private EmbeddedTestServer mTestServer;
- public AudioTest() {
- super(ChromeActivity.class);
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- mTestServer = EmbeddedTestServer.createAndStartServer(getInstrumentation().getContext());
+ @Before
+ public void setUp() throws Exception {
+ mActivityTestRule.startMainActivityOnBlankPage();
+ mTestServer = EmbeddedTestServer.createAndStartServer(
+ InstrumentationRegistry.getInstrumentation().getContext());
}
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
mTestServer.stopAndDestroyServer();
- super.tearDown();
}
/**
@@ -42,24 +55,21 @@ public class AudioTest extends ChromeActivityTestCaseBase<ChromeActivity> {
* @MediumTest
*/
// TODO(jbudorick): Attempt to reenable this after the server switch has stabilized.
+ @Test
@FlakyTest(message = "crbug.com/331122")
public void testPlayMp3() throws InterruptedException, TimeoutException {
- Tab tab = getActivity().getActivityTab();
+ Tab tab = mActivityTestRule.getActivity().getActivityTab();
TabTitleObserver titleObserver = new TabTitleObserver(tab, "ready_to_play");
- loadUrl(mTestServer.getURL("/chrome/test/data/android/media/audio-play.html"));
+ mActivityTestRule.loadUrl(
+ mTestServer.getURL("/chrome/test/data/android/media/audio-play.html"));
titleObserver.waitForTitleUpdate(5);
- assertEquals("ready_to_play", tab.getTitle());
+ Assert.assertEquals("ready_to_play", tab.getTitle());
titleObserver = new TabTitleObserver(tab, "ended");
DOMUtils.clickNode(tab.getContentViewCore(), "button1");
// Make sure that the audio playback "ended" and title is changed.
titleObserver.waitForTitleUpdate(15);
- assertEquals("ended", tab.getTitle());
- }
-
- @Override
- public void startMainActivity() throws InterruptedException {
- startMainActivityOnBlankPage();
+ Assert.assertEquals("ended", tab.getTitle());
}
}
« no previous file with comments | « no previous file | chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerIntegrationTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698