Fix pluralization

junit-platform-commons/src/main/java/org/junit/platform/commons/support/ReflectionSupport.java

@@ -129,7 +129,7 @@ public static Try<Class<?>> tryToLoadClass(String name, ClassLoader classLoader)
 	 * @since 1.11
 	 */
 	@API(status = EXPERIMENTAL, since = "1.12")
-	public static Try<List<Resource>> tryToGetResource(String classpathResourceName) {
+	public static Try<List<Resource>> tryToGetResources(String classpathResourceName) {
 		return ReflectionUtils.tryToGetResources(classpathResourceName);
 	}
 
@@ -151,7 +151,7 @@ public static Try<List<Resource>> tryToGetResource(String classpathResourceName)
 	 * @since 1.11
 	 */
 	@API(status = EXPERIMENTAL, since = "1.12")
-	public static Try<List<Resource>> tryToGetResource(String classpathResourceName, ClassLoader classLoader) {
+	public static Try<List<Resource>> tryToGetResources(String classpathResourceName, ClassLoader classLoader) {
 		return ReflectionUtils.tryToGetResources(classpathResourceName, classLoader);
 	}
 

junit-platform-commons/src/main/java/org/junit/platform/commons/util/ReflectionUtils.java

@@ -895,12 +895,12 @@ public static Try<Class<?>> tryToLoadClass(String name, ClassLoader classLoader)
 	/**
 	 * Try to get {@linkplain Resource resources} by their name, using the {@link ClassLoaderUtils#getDefaultClassLoader()}.
 	 *
-	 * <p>See {@link org.junit.platform.commons.support.ReflectionSupport#tryToGetResource(String)}
+	 * <p>See {@link org.junit.platform.commons.support.ReflectionSupport#tryToGetResources(String)}
 	 * for details.
 	 *
 	 * @param classpathResourceName the name of the resources to load; never {@code null} or blank
 	 * @since 1.12
-	 * @see org.junit.platform.commons.support.ReflectionSupport#tryToGetResource(String, ClassLoader)
+	 * @see org.junit.platform.commons.support.ReflectionSupport#tryToGetResources(String, ClassLoader)
 	 */
 	@API(status = INTERNAL, since = "1.12")
 	public static Try<List<Resource>> tryToGetResources(String classpathResourceName) {
@@ -910,7 +910,7 @@ public static Try<List<Resource>> tryToGetResources(String classpathResourceName
 	/**
 	 * Try to get {@linkplain Resource resources} by their name, using the supplied {@link ClassLoader}.
 	 *
-	 * <p>See {@link org.junit.platform.commons.support.ReflectionSupport#tryToGetResource(String, ClassLoader)}
+	 * <p>See {@link org.junit.platform.commons.support.ReflectionSupport#tryToGetResources(String, ClassLoader)}
 	 * for details.
 	 *
 	 * @param classpathResourceName the name of the resources to load; never {@code null} or blank

junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/ClasspathResourceSelector.java

@@ -10,12 +10,13 @@
 
 package org.junit.platform.engine.discovery;
 
+import static java.util.Collections.unmodifiableList;
+import static java.util.Comparator.comparing;
 import static java.util.stream.Collectors.toList;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
 import static org.apiguardian.api.API.Status.INTERNAL;
 import static org.apiguardian.api.API.Status.STABLE;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -65,15 +66,21 @@ public class ClasspathResourceSelector implements DiscoverySelector {
 		this.position = position;
 	}
 
-	ClasspathResourceSelector(Resource... classpathResources) {
+	ClasspathResourceSelector(List<Resource> classpathResources) {
 		this(getClasspathResourceName(classpathResources), null);
-		this.classpathResources = Arrays.asList(classpathResources);
+		this.classpathResources = unmodifiableList(copyAndSort(classpathResources));
 	}
 
-	private static String getClasspathResourceName(Resource[] classpathResources) {
+	private static List<Resource> copyAndSort(List<Resource> classpathResources) {
+		return classpathResources.stream() //
+				.sorted(comparing(Resource::getUri)) //
+				.collect(toList());
+	}
+
+	private static String getClasspathResourceName(List<Resource> classpathResources) {
 		Preconditions.notEmpty(classpathResources, "classpathResources array must not be null or empty");
 		Preconditions.containsNoNullElements(classpathResources, "individual classpathResources must not be null");
-		List<String> names = Arrays.stream(classpathResources).map(Resource::getName).distinct().collect(toList());
+		List<String> names = classpathResources.stream().map(Resource::getName).distinct().collect(toList());
 		Preconditions.condition(names.size() == 1, "all classpathResources must have the same name");
 		return names.get(0);
 	}
@@ -93,11 +100,11 @@ public String getClasspathResourceName() {
 	}
 
 	/**
-	 * Get the selected {@link Resource Resources}.
+	 * Get the selected {@link Resource resources}.
 	 *
-	 * <p>If the {@link Resource} was not provided, but only the name, this
-	 * method attempts to lazily load the {@link Resource} based on its name and
-	 * throws a {@link PreconditionViolationException} if the resource cannot
+	 * <p>If the {@link Resource resources} were not provided, but only their name,
+	 * this method attempts to lazily load the {@link Resource} based on its name
+	 * and throws a {@link PreconditionViolationException} if the resource cannot
 	 * be loaded.
 	 *
 	 * @since 1.12
@@ -107,9 +114,10 @@ public List<Resource> getClasspathResources() {
 		if (this.classpathResources == null) {
 			// @formatter:off
 			Try<List<Resource>> tryToGetResource = ReflectionUtils.tryToGetResources(this.classpathResourceName);
-			this.classpathResources = tryToGetResource.getOrThrow(cause ->
+			List<Resource> classpathResources = tryToGetResource.getOrThrow(cause ->
 				new PreconditionViolationException("Could not load resource with name: " + this.classpathResourceName, cause));
 			// @formatter:on
+			this.classpathResources = unmodifiableList(classpathResources);
 		}
 		return this.classpathResources;
 	}

junit-platform-engine/src/main/java/org/junit/platform/engine/discovery/DiscoverySelectors.java

@@ -313,7 +313,7 @@ public static ClasspathResourceSelector selectClasspathResource(String classpath
 	 * {@code null} or blank
 	 * @param position the position inside the classpath resource; may be {@code null}
 	 * @see #selectClasspathResource(String)
-	 * @see #selectClasspathResource(Resource)
+	 * @see #selectClasspathResource(List)
 	 * @see ClasspathResourceSelector
 	 * @see ClassLoader#getResource(String)
 	 * @see ClassLoader#getResourceAsStream(String)
@@ -327,7 +327,7 @@ public static ClasspathResourceSelector selectClasspathResource(String classpath
 
 	/**
 	 * Create a {@code ClasspathResourceSelector} for the supplied classpath
-	 * resource.
+	 * resources.
 	 *
 	 * <p>Since {@linkplain org.junit.platform.engine.TestEngine engines} are not
 	 * expected to modify the classpath, the supplied resource must be on the
@@ -339,17 +339,17 @@ public static ClasspathResourceSelector selectClasspathResource(String classpath
 	 * named or unnamed modules. These resources are also considered to be
 	 * classpath resources.
 	 *
-	 * @param classpathResource the classpath resource; never {@code null}
+	 * @param classpathResources the classpath resource; never {@code null}
 	 * @since 1.12
 	 * @see #selectClasspathResource(String, FilePosition)
 	 * @see #selectClasspathResource(String)
 	 * @see ClasspathResourceSelector
-	 * @see ReflectionSupport#tryToGetResource(String)
+	 * @see ReflectionSupport#tryToGetResources(String)
 	 */
 	@API(status = EXPERIMENTAL, since = "1.12")
-	public static ClasspathResourceSelector selectClasspathResource(Resource classpathResource) {
-		Preconditions.notNull(classpathResource, "classpath resource must not be null or blank");
-		return new ClasspathResourceSelector(classpathResource);
+	public static ClasspathResourceSelector selectClasspathResource(List<Resource> classpathResources) {
+		Preconditions.notNull(classpathResources, "classpath resource must not be null or blank");
+		return new ClasspathResourceSelector(classpathResources);
 	}
 
 	/**

junit-platform-engine/src/main/java/org/junit/platform/engine/support/discovery/ResourceContainerSelectorResolver.java

@@ -10,6 +10,7 @@
 
 package org.junit.platform.engine.support.discovery;
 
+import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toSet;
 import static org.junit.platform.commons.support.ReflectionSupport.findAllResourcesInClasspathRoot;
 import static org.junit.platform.commons.support.ReflectionSupport.findAllResourcesInPackage;
@@ -57,15 +58,18 @@ public Resolution resolve(PackageSelector selector, Context context) {
 	}
 
 	private Resolution resourceSelectors(List<Resource> resources) {
-		Set<ClasspathResourceSelector> classpathResources = resources.stream() //
+		Set<ClasspathResourceSelector> selectors = resources.stream() //
 				.filter(resourceFilter) //
+				.collect(groupingBy(Resource::getName)) //
+				.values() //
+				.stream() //
 				.map(DiscoverySelectors::selectClasspathResource) //
 				.collect(toSet());
 
-		if (classpathResources.isEmpty()) {
+		if (selectors.isEmpty()) {
 			return unresolved();
 		}
-		return selectors(classpathResources);
+		return selectors(selectors);
 	}
 
 }

platform-tests/src/test/java/org/junit/platform/commons/support/ReflectionSupportTests.java

@@ -123,18 +123,18 @@ List<DynamicTest> findAllClassesInClasspathRootDelegates() throws Throwable {
 	 * @since 1.12
 	 */
 	@Test
-	void tryToGetResourcePreconditions() {
-		assertPreconditionViolationExceptionForString("Resource name", () -> ReflectionSupport.tryToGetResource(null));
-		assertPreconditionViolationExceptionForString("Resource name", () -> ReflectionSupport.tryToGetResource(""));
+	void tryToGetResourcesPreconditions() {
+		assertPreconditionViolationExceptionForString("Resource name", () -> ReflectionSupport.tryToGetResources(null));
+		assertPreconditionViolationExceptionForString("Resource name", () -> ReflectionSupport.tryToGetResources(""));
 	}
 
 	/**
 	 * @since 1.12
 	 */
 	@Test
-	void tryToGetResource() {
+	void tryToGetResources() {
 		assertEquals(ReflectionUtils.tryToGetResources("default-package.resource").toOptional(),
-			ReflectionSupport.tryToGetResource("default-package.resource").toOptional());
+			ReflectionSupport.tryToGetResources("default-package.resource").toOptional());
 	}
 
 	@Test

platform-tests/src/test/java/org/junit/platform/engine/discovery/DiscoverySelectorsTests.java

@@ -39,6 +39,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -293,7 +294,10 @@ void selectClasspathResources() {
 			assertViolatesPrecondition(() -> selectClasspathResource(""));
 			assertViolatesPrecondition(() -> selectClasspathResource("    "));
 			assertViolatesPrecondition(() -> selectClasspathResource("\t"));
-			assertViolatesPrecondition(() -> selectClasspathResource((Resource) null));
+			assertViolatesPrecondition(() -> selectClasspathResource((List<Resource>) null));
+			assertViolatesPrecondition(() -> selectClasspathResource(Collections.emptyList()));
+			assertViolatesPrecondition(() -> selectClasspathResource(Collections.singletonList(null)));
+			assertViolatesPrecondition(() -> selectClasspathResource(Collections.singletonList(null)));
 
 			// with unnecessary "/" prefix
 			var selector = selectClasspathResource("/foo/bar/spec.xml");