Some cleanup in junit-launcher tests

junit-team · Mar 2, 2016 · 5371790 · 5371790
1 parent 7126a0e
commit 5371790
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/junit-tests/src/test/java/org/junit/gen5/launcher/PostDiscoveryFilterMock.java b/junit-tests/src/test/java/org/junit/gen5/launcher/PostDiscoveryFilterMock.java
@@ -18,14 +18,14 @@
 import org.junit.gen5.engine.TestDescriptor;
 
 public class PostDiscoveryFilterMock implements PostDiscoveryFilter {
-	private final Function<Object, FilterResult> function;
+	private final Function<TestDescriptor, FilterResult> function;
 	private final Supplier<String> toString;
 
 	public PostDiscoveryFilterMock(String toString) {
 		this(o -> FilterResult.included("always"), () -> toString);
 	}
 
-	public PostDiscoveryFilterMock(Function<Object, FilterResult> function, Supplier<String> toString) {
+	public PostDiscoveryFilterMock(Function<TestDescriptor, FilterResult> function, Supplier<String> toString) {
 		this.function = function;
 		this.toString = toString;
 	}
@@ -36,7 +36,7 @@ public String toString() {
 	}
 
 	@Override
-	public FilterResult filter(TestDescriptor object) {
+	public FilterResult filter(TestDescriptor testDescriptor) {
-		return FilterResult.included("always");
+		return function.apply(testDescriptor);
 	}
 }
diff --git a/junit-tests/src/test/java/org/junit/gen5/launcher/main/DefaultLauncherTests.java b/junit-tests/src/test/java/org/junit/gen5/launcher/main/DefaultLauncherTests.java
@@ -11,7 +11,7 @@
 package org.junit.gen5.launcher.main;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.gen5.api.Assertions.*;
+import static org.junit.gen5.api.Assertions.expectThrows;
 import static org.junit.gen5.engine.discovery.UniqueIdSelector.forUniqueId;
 import static org.junit.gen5.launcher.EngineIdFilter.byEngineId;
 import static org.junit.gen5.launcher.main.LauncherFactoryForTestingPurposesOnly.createLauncher;
@@ -25,6 +25,7 @@
 import org.junit.gen5.engine.support.hierarchical.DummyTestDescriptor;
 import org.junit.gen5.engine.support.hierarchical.DummyTestEngine;
 import org.junit.gen5.launcher.PostDiscoveryFilter;
+import org.junit.gen5.launcher.PostDiscoveryFilterMock;
 import org.junit.gen5.launcher.TestId;
 import org.junit.gen5.launcher.TestIdentifier;
 import org.junit.gen5.launcher.TestPlan;
@@ -122,12 +123,9 @@ void launcherAppliesPostDiscoveryFilters() {
 
 		DefaultLauncher launcher = createLauncher(engine);
 
-		PostDiscoveryFilter excludeTest2Filter = new PostDiscoveryFilter() {
+		PostDiscoveryFilter excludeTest2Filter = new PostDiscoveryFilterMock(
-			@Override
+			descriptor -> FilterResult.includedIf(!descriptor.getUniqueId().equals(test2.getUniqueId())),
-			public FilterResult filter(TestDescriptor testDescriptor) {
+			() -> "filter");
-				return FilterResult.includedIf(!testDescriptor.getUniqueId().equals(test2.getUniqueId()));
-			}
-		};
 
 		TestPlan testPlan = launcher.discover(
 			request().select(PackageSelector.forPackageName("any")).filter(excludeTest2Filter).build());