Make validation of including EngineFilters more strict

Prior to this commit, an exception was only thrown when _none_ of a
filter's included IDs matched any engine. Now, an exception is thrown if
at least one included ID across all filters did not match any engine.

Related issue: #2824

Author: marcphilipp

documentation/src/docs/asciidoc/release-notes/release-notes-5.13.0-M3.adoc

@@ -65,6 +65,10 @@ to start reporting discovery issues.
   - Invalid `@BeforeSuite`/`@AfterSuite` method declarations (for example, when not
     `static`)
   - Cyclic dependencies between `@Suite` classes
+* Make validation of including `EngineFilters` more strict to avoid misconfiguration, for
+  example, due to typos. Prior to this release, an exception was only thrown when _none_
+  of a filter's included IDs matched any engine. Now, an exception is thrown if at least
+  one included ID across all filters did not match any engine.
 
 
 [[release-notes-5.13.0-M3-junit-jupiter]]

junit-platform-launcher/src/main/java/org/junit/platform/launcher/core/EngineFilterer.java

@@ -12,11 +12,14 @@
 
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toCollection;
+import static java.util.stream.Collectors.toSet;
 
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
@@ -69,12 +72,14 @@ private void checkNoUnmatchedIncludeFilter() {
 	}
 
 	private SortedSet<String> getUnmatchedEngineIdsOfIncludeFilters() {
+		Set<String> checkedTestEngineIds = checkedTestEngines.keySet().stream() //
+				.map(TestEngine::getId) //
+				.collect(toSet());
 		return engineFilters.stream() //
 				.filter(EngineFilter::isIncludeFilter) //
-				.filter(engineFilter -> checkedTestEngines.keySet().stream() //
-						.map(engineFilter::apply) //
-						.noneMatch(FilterResult::included)) //
-				.flatMap(engineFilter -> engineFilter.getEngineIds().stream()) //
+				.map(EngineFilter::getEngineIds) //
+				.flatMap(Collection::stream) //
+				.filter(id -> !checkedTestEngineIds.contains(id)) //
 				.collect(toCollection(TreeSet::new));
 	}
 

platform-tests/src/test/java/org/junit/platform/launcher/core/DefaultLauncherEngineFilterTests.java

@@ -167,6 +167,26 @@ void launcherThrowsExceptionWhenNoEngineMatchesIncludeEngineFilter(@TrackLogReco
 		assertThat(log.stream(WARNING)).isEmpty();
 	}
 
+	@Test
+	void launcherThrowsExceptionWhenNoEngineMatchesIdInIncludeEngineFilter(@TrackLogRecords LogRecordListener log) {
+		var engine = new DemoHierarchicalTestEngine("first");
+		TestDescriptor test1 = engine.addTest("test1", noOp);
+		LauncherDiscoveryRequest request = request() //
+				.selectors(selectUniqueId(test1.getUniqueId())) //
+				.filters(includeEngines("first", "second")) //
+				.build();
+
+		var launcher = createLauncher(engine);
+		var exception = assertThrows(JUnitException.class, () -> launcher.discover(request));
+
+		assertThat(exception.getMessage()) //
+				.startsWith("No TestEngine ID matched the following include EngineFilters: [second].") //
+				.contains("Please fix/remove the filter or add the engine.") //
+				.contains("Registered TestEngines:\n- first (") //
+				.endsWith("Registered EngineFilters:\n- EngineFilter that includes engines with IDs [first, second]");
+		assertThat(log.stream(WARNING)).isEmpty();
+	}
+
 	@Test
 	void launcherWillLogWarningWhenAllEnginesWereExcluded(@TrackLogRecords LogRecordListener log) {
 		var engine = new DemoHierarchicalTestEngine("first");