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

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/CrashTest.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
Index: chrome/android/javatests/src/org/chromium/chrome/browser/CrashTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/CrashTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/CrashTest.java
index 51d03315e315427d9000eaf2274e68e418de7d60..25c42d188682983ac28e3425821d3b8bd2e622c3 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/CrashTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/CrashTest.java
@@ -6,35 +6,31 @@
import android.support.test.filters.SmallTest;
-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.DisabledTest;
-import org.chromium.chrome.test.ChromeActivityTestRule;
-import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
+import org.chromium.chrome.test.ChromeActivityTestCaseBase;
/**
* The class contains a testcase that intentionally crashes.
*/
-@RunWith(ChromeJUnit4ClassRunner.class)
-@CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE,
- ChromeActivityTestRule.DISABLE_NETWORK_PREDICTION_FLAG})
-public class CrashTest {
- @Rule
- public ChromeActivityTestRule<ChromeActivity> mActivityTestRule =
- new ChromeActivityTestRule<>(ChromeActivity.class);
+public class CrashTest extends ChromeActivityTestCaseBase<ChromeActivity> {
+
+ public CrashTest() {
+ super(ChromeActivity.class);
+ }
+
+ @Override
+ public void startMainActivity() {
+ // Don't launch activity automatically.
+ }
/**
* Intentionally crashing the test. The testcase should be
* disabled the majority of time.
*/
- @Test
@DisabledTest
@SmallTest
public void testIntentionalBrowserCrash() throws Exception {
- mActivityTestRule.startMainActivityFromLauncher();
- mActivityTestRule.loadUrl("chrome://inducebrowsercrashforrealz");
+ startMainActivityFromLauncher();
+ loadUrl("chrome://inducebrowsercrashforrealz");
}
}

Powered by Google App Engine
This is Rietveld 408576698