#41 Simplified filter tests in DefaultLauncherTests

junit-tests/src/test/java/org/junit/gen5/launcher/DiscoveryFilterMock.java

@@ -20,6 +20,10 @@ public class DiscoveryFilterMock implements DiscoveryFilter<Object> {
 	private final Function<Object, FilterResult> function;
 	private final Supplier<String> toString;
 
+	public DiscoveryFilterMock(String toString) {
+		this(o -> FilterResult.included("always"), () -> toString);
+	}
+
 	public DiscoveryFilterMock(Function<Object, FilterResult> function, Supplier<String> toString) {
 		this.function = function;
 		this.toString = toString;

junit-tests/src/test/java/org/junit/gen5/launcher/PostDiscoveryFilterMock.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2015-2016 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.junit.gen5.launcher;
+
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import org.junit.gen5.engine.DiscoveryFilter;
+import org.junit.gen5.engine.FilterResult;
+import org.junit.gen5.engine.TestDescriptor;
+
+public class PostDiscoveryFilterMock implements PostDiscoveryFilter {
+	private final Function<Object, 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) {
+		this.function = function;
+		this.toString = toString;
+	}
+
+	@Override
+	public String toString() {
+		return toString.get();
+	}
+
+	@Override
+	public FilterResult filter(TestDescriptor object) {
+		return FilterResult.included("always");
+	}
+}

junit-tests/src/test/java/org/junit/gen5/launcher/main/TestDiscoveryRequestBuilderTests.java

@@ -30,16 +30,15 @@
 import org.junit.gen5.api.Test;
 import org.junit.gen5.commons.util.PreconditionViolationException;
 import org.junit.gen5.engine.DiscoveryFilter;
-import org.junit.gen5.engine.FilterResult;
-import org.junit.gen5.engine.TestDescriptor;
 import org.junit.gen5.engine.discovery.ClassSelector;
 import org.junit.gen5.engine.discovery.ClasspathSelector;
 import org.junit.gen5.engine.discovery.MethodSelector;
 import org.junit.gen5.engine.discovery.PackageSelector;
 import org.junit.gen5.engine.discovery.UniqueIdSelector;
+import org.junit.gen5.launcher.DiscoveryFilterMock;
 import org.junit.gen5.launcher.EngineIdFilter;
 import org.junit.gen5.launcher.PostDiscoveryFilter;
-import org.junit.gen5.launcher.TagFilter;
+import org.junit.gen5.launcher.PostDiscoveryFilterMock;
 import org.junit.gen5.launcher.TestDiscoveryRequest;
 
 public class TestDiscoveryRequestBuilderTests {
@@ -187,29 +186,15 @@ public void discoveryFiltersAreStoredInDiscoveryRequest() throws Exception {
 		// @formatter:off
         TestDiscoveryRequest discoveryRequest = request()
 				.filter(
-						createDiscoveryFilter("filter1"),
-						createDiscoveryFilter("filter2")
+						new DiscoveryFilterMock("filter1"),
+						new DiscoveryFilterMock("filter2")
 				).build();
         // @formatter:on
 
-		List<String> filterNames = discoveryRequest.getDiscoveryFiltersByType(DiscoveryFilter.class).stream().map(
+		List<String> filterStrings = discoveryRequest.getDiscoveryFiltersByType(DiscoveryFilter.class).stream().map(
 			DiscoveryFilter::toString).collect(toList());
-		assertThat(filterNames).hasSize(2);
-		assertThat(filterNames).contains("filter1", "filter2");
-	}
-
-	private DiscoveryFilter createDiscoveryFilter(final String name) {
-		return new DiscoveryFilter() {
-			@Override
-			public FilterResult filter(Object object) {
-				return null;
-			}
-
-			@Override
-			public String toString() {
-				return name;
-			}
-		};
+		assertThat(filterStrings).hasSize(2);
+		assertThat(filterStrings).contains("filter1", "filter2");
 	}
 
 	@Test
@@ -218,29 +203,15 @@ public void postDiscoveryFiltersAreStoredInDiscoveryRequest() throws Exception {
 		// @formatter:off
         TestDiscoveryRequest discoveryRequest = request()
 				.filter(
-						createPostDiscoveryFilter("postFilter1"),
-						createPostDiscoveryFilter("postFilter2")
+						new PostDiscoveryFilterMock("postFilter1"),
+						new PostDiscoveryFilterMock("postFilter2")
 				).build();
         // @formatter:on
 
-		List<String> filterNames = discoveryRequest.getPostDiscoveryFilters().stream().map(
+		List<String> filterStrings = discoveryRequest.getPostDiscoveryFilters().stream().map(
 			PostDiscoveryFilter::toString).collect(toList());
-		assertThat(filterNames).hasSize(2);
-		assertThat(filterNames).contains("postFilter1", "postFilter2");
-	}
-
-	private PostDiscoveryFilter createPostDiscoveryFilter(final String name) {
-		return new PostDiscoveryFilter() {
-			@Override
-			public FilterResult filter(TestDescriptor object) {
-				return null;
-			}
-
-			@Override
-			public String toString() {
-				return name;
-			}
-		};
+		assertThat(filterStrings).hasSize(2);
+		assertThat(filterStrings).contains("postFilter1", "postFilter2");
 	}
 
 	@Test