#40: Re-use JUnit 4's FilterRequest

junit-team · Jan 14, 2016 · 4cb0a31 · 4cb0a31
1 parent 0be026a
commit 4cb0a31
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/...ngine/junit4/execution/RunnerRequest.java → ...gine/junit4/descriptor/RunnerRequest.java b/...ngine/junit4/execution/RunnerRequest.java → ...gine/junit4/descriptor/RunnerRequest.java
@@ -8,7 +8,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.junit.gen5.engine.junit4.execution;
+package org.junit.gen5.engine.junit4.descriptor;
 
 import org.junit.runner.Request;
 import org.junit.runner.Runner;

diff --git a/...t4-engine/src/main/java/org/junit/gen5/engine/junit4/descriptor/RunnerTestDescriptor.java b/...t4-engine/src/main/java/org/junit/gen5/engine/junit4/descriptor/RunnerTestDescriptor.java
@@ -14,6 +14,7 @@
 
 import org.junit.gen5.engine.JavaSource;
 import org.junit.gen5.engine.TestDescriptor;
+import org.junit.runner.Request;
 import org.junit.runner.Runner;
 
 /**
@@ -30,8 +31,8 @@ public RunnerTestDescriptor(TestDescriptor parent, Class<?> testClass, Runner ru
 		this.runner = runner;
 	}
 
-	public Runner getRunner() {
+	public Request toRequest() {
-		return runner;
+		return new RunnerRequest(runner);
 	}
 
 }
diff --git a/...main/java/org/junit/gen5/engine/junit4/discovery/JUnit4TestPlanSpecificationResolver.java b/...main/java/org/junit/gen5/engine/junit4/discovery/JUnit4TestPlanSpecificationResolver.java
@@ -37,7 +37,6 @@
 import org.junit.runner.Description;
 import org.junit.runner.Runner;
 import org.junit.runner.manipulation.Filter;
-import org.junit.runner.manipulation.NoTestsRemainException;
 import org.junit.runners.model.RunnerBuilder;
 
 public class JUnit4TestPlanSpecificationResolver {
@@ -120,21 +119,21 @@ private String determineTestClassName(String uniqueId, String enginePrefix) {
 			List<RunnerTestDescriptorAwareFilter> filters = entry.getValue();
 			Runner runner = runnerBuilder.safeRunnerForClass(testClass);
 			if (runner != null) {
-				try {
+				RunnerTestDescriptor originalDescriptor = createCompleteRunnerTestDescriptor(testClass, runner);
-					RunnerTestDescriptor runnerTestDescriptor = createCompleteRunnerTestDescriptor(testClass, runner);
+				Filter filter = createOrFilter(filters, originalDescriptor);
-					filters.stream().forEach(filter -> filter.initialize(runnerTestDescriptor));
+				Runner filteredRunner = originalDescriptor.toRequest().filterWith(filter).getRunner();
-					new OrFilter(filters).apply(runner);
+				// TODO Log warning if runner does not implement Filterable
-					// TODO Log warning if runner does not implement Filterable
+				engineDescriptor.addChild(createCompleteRunnerTestDescriptor(testClass, filteredRunner));
-					// We need to re-create the RunnerTestDescriptor here to reflect filtering
-					engineDescriptor.addChild(createCompleteRunnerTestDescriptor(testClass, runner));
-				}
-				catch (NoTestsRemainException e) {
-					// ignore testClass
-				}
 			}
 		}
 	}
 
+	private Filter createOrFilter(List<RunnerTestDescriptorAwareFilter> filters,
+			RunnerTestDescriptor runnerTestDescriptor) {
+		filters.stream().forEach(filter -> filter.initialize(runnerTestDescriptor));
+		return new OrFilter(filters);
+	}
+
 	private RunnerTestDescriptor createCompleteRunnerTestDescriptor(Class<?> testClass, Runner runner) {
 		RunnerTestDescriptor runnerTestDescriptor = new RunnerTestDescriptor(engineDescriptor, testClass, runner);
 		addChildrenRecursively(runnerTestDescriptor);

diff --git a/junit4-engine/src/main/java/org/junit/gen5/engine/junit4/execution/RunnerExecutor.java b/junit4-engine/src/main/java/org/junit/gen5/engine/junit4/execution/RunnerExecutor.java
@@ -30,7 +30,7 @@ public void execute(RunnerTestDescriptor runnerTestDescriptor) {
 		JUnitCore core = new JUnitCore();
 		core.addListener(new RunListenerAdapter(testRun, engineExecutionListener));
 		try {
-			core.run(new RunnerRequest(runnerTestDescriptor.getRunner()));
+			core.run(runnerTestDescriptor.toRequest());
 		}
 		catch (Throwable t) {
 			reportUnexpectedFailure(testRun, runnerTestDescriptor, failed(t));