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

Unified Diff: base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java

Issue 2815453003: Create ChromeActivityTestRule for converting JUnit4 tests (Closed)
Patch Set: nits and rebase 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/customtabs/CustomTabActivityTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java
diff --git a/base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java b/base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java
index 465c23a5d17afdb653cf9646d67813a4dd00d5c3..123545294772b3b0c7c667946ef031d1110dde25 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java
@@ -13,6 +13,7 @@ import org.junit.runner.notification.RunNotifier;
import org.junit.runners.model.FrameworkMethod;
import org.junit.runners.model.InitializationError;
+import org.chromium.base.CollectionUtil;
import org.chromium.base.test.BaseTestResult.PreTestHook;
import org.chromium.base.test.util.DisableIfSkipCheck;
import org.chromium.base.test.util.MinAndroidSdkLevelSkipCheck;
@@ -21,7 +22,6 @@ import org.chromium.base.test.util.SkipCheck;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
/**
@@ -29,8 +29,8 @@ import java.util.List;
*
* This ClassRunner imports from AndroidJUnit4ClassRunner which is a hidden but accessible
* class. The reason is that default JUnit4 runner for Android is a final class,
- * {@link AndroidJUnit4}. We need to extends an inheritable class to change {@link runChild}
- * and {@link isIgnored} to add SkipChecks and PreTesthook.
+ * AndroidJUnit4. We need to extends an inheritable class to change {@link #runChild}
+ * and {@link #isIgnored} to add SkipChecks and PreTesthook.
*/
public class BaseJUnit4ClassRunner extends AndroidJUnit4ClassRunner {
private final List<SkipCheck> mSkipChecks;
@@ -108,11 +108,9 @@ public class BaseJUnit4ClassRunner extends AndroidJUnit4ClassRunner {
* Change this static function to add or take out default {@code SkipCheck}s.
*/
private static List<SkipCheck> defaultSkipChecks() {
- return Arrays.asList(new SkipCheck[]{
+ return CollectionUtil.newArrayList(
new RestrictionSkipCheck(InstrumentationRegistry.getTargetContext()),
- new MinAndroidSdkLevelSkipCheck(),
- new DisableIfSkipCheck()
- });
+ new MinAndroidSdkLevelSkipCheck(), new DisableIfSkipCheck());
}
/**
« no previous file with comments | « no previous file | chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698