Rename Runner to TargetRunner
This is in preparation for switching over to using standard
junit. JUnit has its own Runner class that does something
reasonably similar but not the same so this should avoid
confusion while making the switch over. Eventually, the
TargetRunner classes will be replaced with ones based off JUnit.
Bug: 27940141
Change-Id: I3327ff2fb0947bf22038a8db1603daa8420b78ee
diff --git a/src/vogar/target/CaliperRunnerFactory.java b/src/vogar/target/CaliperRunnerFactory.java
index be16357..6f2f24c 100644
--- a/src/vogar/target/CaliperRunnerFactory.java
+++ b/src/vogar/target/CaliperRunnerFactory.java
@@ -49,12 +49,12 @@
}
@Override @Nullable
- public Runner newRunner(TargetMonitor monitor, String qualification,
+ public TargetRunner newRunner(TargetMonitor monitor, String qualification,
Class<?> klass, AtomicReference<String> skipPastReference,
TestEnvironment testEnvironment, int timeoutSeconds, boolean profile,
String[] args) {
if (benchmarkClassChecker != null && benchmarkClassChecker.isBenchmark(klass)) {
- return new CaliperRunner(monitor, profile, klass, args);
+ return new CaliperTargetRunner(monitor, profile, klass, args);
} else {
return null;
}
diff --git a/src/vogar/target/CaliperRunner.java b/src/vogar/target/CaliperTargetRunner.java
similarity index 93%
rename from src/vogar/target/CaliperRunner.java
rename to src/vogar/target/CaliperTargetRunner.java
index eb752a6..d031abc 100644
--- a/src/vogar/target/CaliperRunner.java
+++ b/src/vogar/target/CaliperTargetRunner.java
@@ -25,15 +25,15 @@
/**
* Runs a <a href="http://code.google.com/p/caliper/">Caliper</a> benchmark.
*/
-public final class CaliperRunner implements vogar.target.Runner {
+public final class CaliperTargetRunner implements TargetRunner {
private final TargetMonitor monitor;
private final boolean profile;
private final Class<?> testClass;
private final String[] args;
- public CaliperRunner(TargetMonitor monitor, boolean profile, Class<?> testClass,
- String[] args) {
+ public CaliperTargetRunner(TargetMonitor monitor, boolean profile, Class<?> testClass,
+ String[] args) {
this.monitor = monitor;
this.profile = profile;
this.testClass = testClass;
diff --git a/src/vogar/target/MainRunnerFactory.java b/src/vogar/target/MainRunnerFactory.java
index 11b40ad..6412b26 100644
--- a/src/vogar/target/MainRunnerFactory.java
+++ b/src/vogar/target/MainRunnerFactory.java
@@ -26,12 +26,12 @@
public class MainRunnerFactory implements RunnerFactory {
@Override @Nullable
- public Runner newRunner(TargetMonitor monitor, String qualification,
+ public TargetRunner newRunner(TargetMonitor monitor, String qualification,
Class<?> klass, AtomicReference<String> skipPastReference,
TestEnvironment testEnvironment, int timeoutSeconds, boolean profile,
String[] args) {
if (new ClassAnalyzer(klass).hasMethod(true, void.class, "main", String[].class)) {
- return new MainRunner(monitor, klass, args);
+ return new MainTargetRunner(monitor, klass, args);
} else {
return null;
}
diff --git a/src/vogar/target/MainRunner.java b/src/vogar/target/MainTargetRunner.java
similarity index 92%
rename from src/vogar/target/MainRunner.java
rename to src/vogar/target/MainTargetRunner.java
index 2994456..8217abe 100644
--- a/src/vogar/target/MainRunner.java
+++ b/src/vogar/target/MainTargetRunner.java
@@ -23,14 +23,14 @@
/**
* Runs a Java class with a main method. This includes jtreg tests.
*/
-public final class MainRunner implements Runner {
+public final class MainTargetRunner implements TargetRunner {
private final TargetMonitor monitor;
private final Class<?> mainClass;
private final String[] args;
private final Method main;
- public MainRunner(TargetMonitor monitor, Class<?> mainClass, String[] args) {
+ public MainTargetRunner(TargetMonitor monitor, Class<?> mainClass, String[] args) {
this.monitor = monitor;
this.mainClass = mainClass;
this.args = args;
diff --git a/src/vogar/target/RunnerFactory.java b/src/vogar/target/RunnerFactory.java
index 92155f6..86cbe34 100644
--- a/src/vogar/target/RunnerFactory.java
+++ b/src/vogar/target/RunnerFactory.java
@@ -20,17 +20,17 @@
import vogar.monitor.TargetMonitor;
/**
- * Determines whether this can construct a {@link Runner} instance capable of exercising some
+ * Determines whether this can construct a {@link TargetRunner} instance capable of exercising some
* aspect of the specified class, and then creates such an instance.
*/
public interface RunnerFactory {
/**
- * Create a {@link Runner} instance suitable for exercising the supplied class, return
+ * Create a {@link TargetRunner} instance suitable for exercising the supplied class, return
* {@code null} if no such instance is available.
*/
@Nullable
- Runner newRunner(TargetMonitor monitor, String qualification, Class<?> klass,
+ TargetRunner newRunner(TargetMonitor monitor, String qualification, Class<?> klass,
AtomicReference<String> skipPastReference, TestEnvironment testEnvironment,
int timeoutSeconds, boolean profile, String[] args);
}
diff --git a/src/vogar/target/Runner.java b/src/vogar/target/TargetRunner.java
similarity index 96%
rename from src/vogar/target/Runner.java
rename to src/vogar/target/TargetRunner.java
index 15ce478..e92211f 100644
--- a/src/vogar/target/Runner.java
+++ b/src/vogar/target/TargetRunner.java
@@ -20,7 +20,7 @@
* Interface between the generic TestRunner and the more specific
* backend implementations that know how to run specific types of tests.
*/
-public interface Runner {
+public interface TargetRunner {
/**
* @return true if this run completed normally. Otherwise the calling
diff --git a/src/vogar/target/TestRunner.java b/src/vogar/target/TestRunner.java
index 9018f64..d31f014 100644
--- a/src/vogar/target/TestRunner.java
+++ b/src/vogar/target/TestRunner.java
@@ -223,9 +223,9 @@
profiler.setup(profileThreadGroup, profileDepth, profileInterval);
}
for (Class<?> klass : classes) {
- Runner runner;
+ TargetRunner targetRunner;
try {
- runner = runnerFactory.newRunner(monitor, qualification, klass,
+ targetRunner = runnerFactory.newRunner(monitor, qualification, klass,
skipPastReference, testEnvironment, timeoutSeconds, profile, args);
} catch (RuntimeException e) {
monitor.outcomeStarted(klass.getName());
@@ -234,7 +234,7 @@
return;
}
- if (runner == null) {
+ if (targetRunner == null) {
monitor.outcomeStarted(klass.getName());
System.out.println("Skipping " + klass.getName()
+ ": no associated runner class");
@@ -242,7 +242,7 @@
continue;
}
- boolean completedNormally = runner.run(profiler);
+ boolean completedNormally = targetRunner.run(profiler);
if (!completedNormally) {
return; // let the caller start another process
}
@@ -272,14 +272,14 @@
}
@Override @Nullable
- public Runner newRunner(TargetMonitor monitor, String qualification,
+ public TargetRunner newRunner(TargetMonitor monitor, String qualification,
Class<?> klass, AtomicReference<String> skipPastReference,
TestEnvironment testEnvironment, int timeoutSeconds, boolean profile, String[] args) {
for (RunnerFactory runnerFactory : runnerFactories) {
- Runner runner = runnerFactory.newRunner(monitor, qualification, klass,
+ TargetRunner targetRunner = runnerFactory.newRunner(monitor, qualification, klass,
skipPastReference, testEnvironment, timeoutSeconds, profile, args);
- if (runner != null) {
- return runner;
+ if (targetRunner != null) {
+ return targetRunner;
}
}
diff --git a/src/vogar/target/junit/JUnitRunnerFactory.java b/src/vogar/target/junit/JUnitRunnerFactory.java
index f7eee07..d85fb22 100644
--- a/src/vogar/target/junit/JUnitRunnerFactory.java
+++ b/src/vogar/target/junit/JUnitRunnerFactory.java
@@ -24,8 +24,8 @@
import javax.annotation.Nullable;
import junit.framework.AssertionFailedError;
import vogar.monitor.TargetMonitor;
-import vogar.target.Runner;
import vogar.target.RunnerFactory;
+import vogar.target.TargetRunner;
import vogar.target.TestEnvironment;
/**
@@ -34,13 +34,13 @@
public class JUnitRunnerFactory implements RunnerFactory {
@Override @Nullable
- public Runner newRunner(TargetMonitor monitor, String qualification,
+ public TargetRunner newRunner(TargetMonitor monitor, String qualification,
Class<?> klass, AtomicReference<String> skipPastReference,
TestEnvironment testEnvironment, int timeoutSeconds, boolean profile,
String[] args) {
if (supports(klass)) {
List<VogarTest> tests = createVogarTests(klass, qualification, args);
- return new JUnitRunner(monitor, skipPastReference, testEnvironment, timeoutSeconds,
+ return new JUnitTargetRunner(monitor, skipPastReference, testEnvironment, timeoutSeconds,
tests);
} else {
return null;
diff --git a/src/vogar/target/junit/JUnitRunner.java b/src/vogar/target/junit/JUnitTargetRunner.java
similarity index 95%
rename from src/vogar/target/junit/JUnitRunner.java
rename to src/vogar/target/junit/JUnitTargetRunner.java
index e625c4e..ec8ffdf 100644
--- a/src/vogar/target/junit/JUnitRunner.java
+++ b/src/vogar/target/junit/JUnitTargetRunner.java
@@ -28,14 +28,14 @@
import vogar.Result;
import vogar.monitor.TargetMonitor;
import vogar.target.Profiler;
-import vogar.target.Runner;
+import vogar.target.TargetRunner;
import vogar.target.TestEnvironment;
import vogar.util.Threads;
/**
* Adapts a JUnit3 test for use by vogar.
*/
-public final class JUnitRunner implements Runner {
+public final class JUnitTargetRunner implements TargetRunner {
private final TargetMonitor monitor;
private final AtomicReference<String> skipPastReference;
@@ -48,8 +48,8 @@
private final ExecutorService executor = Executors.newCachedThreadPool(
Threads.daemonThreadFactory("testrunner"));
- public JUnitRunner(TargetMonitor monitor, AtomicReference<String> skipPastReference,
- TestEnvironment testEnvironment, int timeoutSeconds, List<VogarTest> tests) {
+ public JUnitTargetRunner(TargetMonitor monitor, AtomicReference<String> skipPastReference,
+ TestEnvironment testEnvironment, int timeoutSeconds, List<VogarTest> tests) {
this.monitor = monitor;
this.skipPastReference = skipPastReference;
this.testEnvironment = testEnvironment;
diff --git a/test/vogar/target/TestRunnerRule.java b/test/vogar/target/TestRunnerRule.java
index 2553860..145bee1 100644
--- a/test/vogar/target/TestRunnerRule.java
+++ b/test/vogar/target/TestRunnerRule.java
@@ -89,7 +89,7 @@
* Create the {@link TestRunner} using properties provided by {@link TestRunnerProperties} if
* available.
*
- * @param args the command line arguments for the {@link Runner} instance.
+ * @param args the command line arguments for the {@link TargetRunner} instance.
*/
public TestRunner createTestRunner(String... args) {
if (properties == null) {
