Re-use composite ClassFilter in JUnit 5 Engine to resolve TODO

------------------------------------------------------------------------ On behalf of the community, the JUnit Lambda Team thanks Klarna AB (http://www.klarna.com) for supporting the JUnit crowdfunding campaign! ------------------------------------------------------------------------
junit-team · Jan 8, 2016 · 94e9f20 · 94e9f20
1 parent 1213ccf
commit 94e9f20
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 25 deletions.
diff --git a/junit-engine-api/src/main/java/org/junit/gen5/engine/TestPlanSpecification.java b/junit-engine-api/src/main/java/org/junit/gen5/engine/TestPlanSpecification.java
@@ -18,7 +18,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
@@ -165,8 +164,18 @@ public void filterWith(EngineFilter filter) {
 		this.engineFilters.add(filter);
 	}
 
-	public List<EngineFilter> getEngineFilters() {
-		return Collections.unmodifiableList(engineFilters);
+	public ClassFilter getClassFilter() {
+		return ClassFilters.allOf(getEngineFilters(ClassFilter.class));
+	}
+
+	public <T extends EngineFilter> List<T> getEngineFilters(Class<T> filterClass) {
+		// @formatter:off
+		return engineFilters
+			.stream()
+			.filter(filterClass::isInstance)
+			.map(filterClass::cast)
+			.collect(toList());
+		// @formatter:on
 	}
 
 	public boolean acceptDescriptor(TestDescriptor testDescriptor) {

diff --git a/...t-tests/src/test/java/org/junit/gen5/console/tasks/TestPlanSpecificationCreatorTests.java b/...t-tests/src/test/java/org/junit/gen5/console/tasks/TestPlanSpecificationCreatorTests.java
@@ -22,6 +22,7 @@
 
 import org.junit.gen5.api.Test;
 import org.junit.gen5.console.options.CommandLineOptions;
+import org.junit.gen5.engine.ClassFilter;
 import org.junit.gen5.engine.TestDescriptor;
 import org.junit.gen5.engine.TestPlanSpecification;
 import org.junit.gen5.engine.TestPlanSpecificationElementVisitor;
@@ -92,8 +93,8 @@ public void convertsClassnameFilterOption() {
 
 		TestPlanSpecification specification = convert();
 
-		assertThat(specification.getEngineFilters()).hasSize(1);
-		assertThat(specification.getEngineFilters().get(0).getDescription()).contains(".*Test");
+		assertThat(specification.getEngineFilters(ClassFilter.class)).hasSize(1);
+		assertThat(specification.getClassFilter().getDescription()).contains(".*Test");
 	}
 
 	@Test

diff --git a/...main/java/org/junit/gen5/engine/junit4/discovery/JUnit4TestPlanSpecificationResolver.java b/...main/java/org/junit/gen5/engine/junit4/discovery/JUnit4TestPlanSpecificationResolver.java
@@ -22,7 +22,6 @@
 import java.util.function.IntFunction;
 
 import org.junit.gen5.engine.ClassFilter;
-import org.junit.gen5.engine.ClassFilters;
 import org.junit.gen5.engine.EngineDescriptor;
 import org.junit.gen5.engine.TestPlanSpecification;
 import org.junit.gen5.engine.TestPlanSpecificationElementVisitor;
@@ -41,7 +40,7 @@ public JUnit4TestPlanSpecificationResolver(EngineDescriptor engineDescriptor) {
 	}
 
 	public void resolve(TestPlanSpecification specification) {
-		ClassFilter classFilter = buildClassFilter(specification);
+		ClassFilter classFilter = specification.getClassFilter();
 		RunnerBuilder runnerBuilder = new DefensiveAllDefaultPossibilitiesBuilder();
 		specification.accept(new TestPlanSpecificationElementVisitor() {
 
@@ -70,16 +69,6 @@ public void visitPackage(String packageName) {
 		});
 	}
 
-	private ClassFilter buildClassFilter(TestPlanSpecification specification) {
-		// @formatter:off
-		return ClassFilters.allOf(specification.getEngineFilters()
-			.stream()
-			.filter(ClassFilter.class::isInstance)
-			.map(ClassFilter.class::cast)
-			.collect(toList()));
-		// @formatter:on
-	}
-
 	private RunnerTestDescriptor createCompleteRunnerTestDescriptor(Class<?> testClass, Runner runner) {
 		RunnerTestDescriptor runnerTestDescriptor = new RunnerTestDescriptor(engineDescriptor, testClass, runner);
 		addChildrenRecursively(runnerTestDescriptor);

diff --git a/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/JUnit5TestEngine.java b/junit5-engine/src/main/java/org/junit/gen5/engine/junit5/JUnit5TestEngine.java
@@ -10,11 +10,8 @@
 
 package org.junit.gen5.engine.junit5;
 
-import java.util.List;
-
 import org.junit.gen5.commons.util.Preconditions;
 import org.junit.gen5.engine.ClassFilter;
-import org.junit.gen5.engine.EngineFilter;
 import org.junit.gen5.engine.ExecutionRequest;
 import org.junit.gen5.engine.HierarchicalTestEngine;
 import org.junit.gen5.engine.TestDescriptor;
@@ -48,15 +45,14 @@ private void resolveSpecification(TestPlanSpecification specification, JUnit5Eng
 		for (TestPlanSpecificationElement element : specification) {
 			resolver.resolveElement(element);
 		}
-		applyEngineFilters(specification.getEngineFilters(), engineDescriptor);
+		applyEngineFilters(specification, engineDescriptor);
 	}
 
-	private void applyEngineFilters(List<EngineFilter> engineFilters, JUnit5EngineDescriptor engineDescriptor) {
-		// TODO Currently only works with a single ClassFilter
-		if (engineFilters.isEmpty()) {
+	private void applyEngineFilters(TestPlanSpecification specification, JUnit5EngineDescriptor engineDescriptor) {
+		if (specification.getEngineFilters(ClassFilter.class).isEmpty()) {
 			return;
 		}
-		ClassFilter filter = (ClassFilter) engineFilters.get(0);
+		ClassFilter filter = specification.getClassFilter();
 		TestDescriptor.Visitor filteringVisitor = (descriptor, remove) -> {
 			if (descriptor.getClass() == ClassTestDescriptor.class) {
 				ClassTestDescriptor classTestDescriptor = (ClassTestDescriptor) descriptor;