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

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

Issue 2933623002: Create AwJUnit4ClassRunner AwActivityTestRule and convert AwContentsTest (Closed)
Patch Set: address bo's comments Created 3 years, 5 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: 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 080654f8bb00a9c3d1fea22f26aeae3ea3d72150..8a28d019bc6e20b212fff61963978916bd4af465 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
@@ -4,11 +4,14 @@
package org.chromium.base.test;
+import static org.chromium.base.test.BaseChromiumAndroidJUnitRunner.toListTests;
+
import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
import android.support.test.internal.util.AndroidRunnerParams;
+import org.junit.runner.Description;
import org.junit.runner.notification.RunNotifier;
import org.junit.runners.model.FrameworkMethod;
import org.junit.runners.model.InitializationError;
@@ -129,6 +132,21 @@ public class BaseJUnit4ClassRunner extends AndroidJUnit4ClassRunner {
return super.isIgnored(method) || shouldSkip(method);
}
+ /**
+ * Run test with or without execution based on bundle arguments.
+ */
+ @Override
+ public void run(RunNotifier notifier) {
+ if (toListTests(InstrumentationRegistry.getArguments())) {
+ for (Description child : getDescription().getChildren()) {
+ notifier.fireTestStarted(child);
+ notifier.fireTestFinished(child);
+ }
+ } else {
+ super.run(notifier);
+ }
+ }
+
@Override
protected void runChild(FrameworkMethod method, RunNotifier notifier) {
runPreTestHooks(method);
@@ -165,4 +183,5 @@ public class BaseJUnit4ClassRunner extends AndroidJUnit4ClassRunner {
protected Statement withAfters(FrameworkMethod method, Object test, Statement base) {
return super.withAfters(method, test, new ScreenshotOnFailureStatement(base));
}
+
}

Powered by Google App Engine
This is Rietveld 408576698