Merge branch 'main' into argument-count-validation-mode

Author: JonasJebing

documentation/src/docs/asciidoc/release-notes/release-notes-5.12.0-M1.adoc

@@ -31,6 +31,9 @@ JUnit repository on GitHub.
   calling the internal `ReflectionUtils.makeAccessible(Field)` method directly.
 * Support both the primitive type `void` and the wrapper type `Void` in the internal
   `ReflectionUtils` to allow `String` to `Class` conversion in parameterized tests.
+* Add support for passing line and column number to `ConsoleLauncher` via
+  `--select-file` and `--select-resource`.
+* `ConsoleLauncher` now accepts multiple values for all `--select` options.
 
 
 [[release-notes-5.12.0-M1-junit-jupiter]]

…ne/support/descriptor/ResourceUtils.java …platform/commons/util/ResourceUtils.javajunit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ResourceUtils.java renamed to junit-platform-commons/src/main/java/org/junit/platform/commons/util/ResourceUtils.java junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ResourceUtils.java renamed to junit-platform-commons/src/main/java/org/junit/platform/commons/util/ResourceUtils.java

@@ -8,19 +8,21 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.platform.engine.support.descriptor;
+package org.junit.platform.commons.util;
+
+import static org.apiguardian.api.API.Status.INTERNAL;
 
 import java.net.URI;
 
-import org.junit.platform.commons.util.Preconditions;
-import org.junit.platform.commons.util.StringUtils;
+import org.apiguardian.api.API;
 
 /**
  * Collection of static utility methods for working with resources.
  *
- * @since 1.3
+ * @since 1.3 (originally in org.junit.platform.engine.support.descriptor)
  */
-final class ResourceUtils {
+@API(status = INTERNAL, since = "1.12")
+public final class ResourceUtils {
 
 	private ResourceUtils() {
 		/* no-op */
@@ -33,8 +35,10 @@ private ResourceUtils() {
 	 * @param uri the {@code URI} from which to strip the query component
 	 * @return a new {@code URI} with the query component removed, or the
 	 * original {@code URI} unmodified if it does not have a query component
+	 *
+	 * @since 1.3
 	 */
-	static URI stripQueryComponent(URI uri) {
+	public static URI stripQueryComponent(URI uri) {
 		Preconditions.notNull(uri, "URI must not be null");
 
 		if (StringUtils.isBlank(uri.getQuery())) {

junit-platform-console/src/main/java/org/junit/platform/console/options/SelectorConverter.java

@@ -19,12 +19,16 @@
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectPackage;
 import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUri;
 
+import java.net.URI;
+
 import org.junit.platform.commons.PreconditionViolationException;
+import org.junit.platform.commons.util.ResourceUtils;
 import org.junit.platform.engine.DiscoverySelectorIdentifier;
 import org.junit.platform.engine.discovery.ClassSelector;
 import org.junit.platform.engine.discovery.ClasspathResourceSelector;
 import org.junit.platform.engine.discovery.DirectorySelector;
 import org.junit.platform.engine.discovery.DiscoverySelectors;
+import org.junit.platform.engine.discovery.FilePosition;
 import org.junit.platform.engine.discovery.FileSelector;
 import org.junit.platform.engine.discovery.IterationSelector;
 import org.junit.platform.engine.discovery.MethodSelector;
@@ -53,8 +57,12 @@ public UriSelector convert(String value) {
 	static class File implements ITypeConverter<FileSelector> {
 		@Override
 		public FileSelector convert(String value) {
-			return selectFile(value);
+			URI uri = URI.create(value);
+			String path = ResourceUtils.stripQueryComponent(uri).getPath();
+			FilePosition filePosition = FilePosition.fromQuery(uri.getQuery()).orElse(null);
+			return selectFile(path, filePosition);
 		}
+
 	}
 
 	static class Directory implements ITypeConverter<DirectorySelector> {
@@ -88,7 +96,10 @@ public MethodSelector convert(String value) {
 	static class ClasspathResource implements ITypeConverter<ClasspathResourceSelector> {
 		@Override
 		public ClasspathResourceSelector convert(String value) {
-			return selectClasspathResource(value);
+			URI uri = URI.create(value);
+			String path = ResourceUtils.stripQueryComponent(uri).getPath();
+			FilePosition filePosition = FilePosition.fromQuery(uri.getQuery()).orElse(null);
+			return selectClasspathResource(path, filePosition);
 		}
 	}
 

junit-platform-console/src/main/java/org/junit/platform/console/options/TestDiscoveryOptionsMixin.java

@@ -69,79 +69,84 @@ static class SelectorOptions {
 		private boolean scanModulepath2;
 
 		@Option(names = { "-u",
-				"--select-uri" }, paramLabel = "URI", arity = "1", converter = SelectorConverter.Uri.class, description = "Select a URI for test discovery. This option can be repeated.")
+				"--select-uri" }, paramLabel = "URI", arity = "1..*", converter = SelectorConverter.Uri.class, description = "Select a URI for test discovery. This option can be repeated.")
 		private final List<UriSelector> selectedUris = new ArrayList<>();
 
-		@Option(names = { "--u", "-select-uri" }, arity = "1", hidden = true, converter = SelectorConverter.Uri.class)
+		@Option(names = { "--u",
+				"-select-uri" }, arity = "1..*", hidden = true, converter = SelectorConverter.Uri.class)
 		private final List<UriSelector> selectedUris2 = new ArrayList<>();
 
 		@Option(names = { "-f",
-				"--select-file" }, paramLabel = "FILE", arity = "1", converter = SelectorConverter.File.class, description = "Select a file for test discovery. This option can be repeated.")
+				"--select-file" }, paramLabel = "FILE", arity = "1..*", converter = SelectorConverter.File.class, //
+				description = "Select a file for test discovery. "
+						+ "The line and column numbers can be provided as URI query parameters (e.g. foo.txt?line=12&column=34). "
+						+ "This option can be repeated.")
 		private final List<FileSelector> selectedFiles = new ArrayList<>();
 
-		@Option(names = { "--f", "-select-file" }, arity = "1", hidden = true, converter = SelectorConverter.File.class)
+		@Option(names = { "--f",
+				"-select-file" }, arity = "1..*", hidden = true, converter = SelectorConverter.File.class)
 		private final List<FileSelector> selectedFiles2 = new ArrayList<>();
 
 		@Option(names = { "-d",
-				"--select-directory" }, paramLabel = "DIR", arity = "1", converter = SelectorConverter.Directory.class, description = "Select a directory for test discovery. This option can be repeated.")
+				"--select-directory" }, paramLabel = "DIR", arity = "1..*", converter = SelectorConverter.Directory.class, description = "Select a directory for test discovery. This option can be repeated.")
 		private final List<DirectorySelector> selectedDirectories = new ArrayList<>();
 
 		@Option(names = { "--d",
-				"-select-directory" }, arity = "1", hidden = true, converter = SelectorConverter.Directory.class)
+				"-select-directory" }, arity = "1..*", hidden = true, converter = SelectorConverter.Directory.class)
 		private final List<DirectorySelector> selectedDirectories2 = new ArrayList<>();
 
 		@Option(names = { "-o",
-				"--select-module" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Module.class, description = "Select single module for test discovery. This option can be repeated.")
+				"--select-module" }, paramLabel = "NAME", arity = "1..*", converter = SelectorConverter.Module.class, description = "Select single module for test discovery. This option can be repeated.")
 		private final List<ModuleSelector> selectedModules = new ArrayList<>();
 
 		@Option(names = { "--o",
-				"-select-module" }, arity = "1", converter = SelectorConverter.Module.class, hidden = true)
+				"-select-module" }, arity = "1..*", converter = SelectorConverter.Module.class, hidden = true)
 		private final List<ModuleSelector> selectedModules2 = new ArrayList<>();
 
 		@Option(names = { "-p",
-				"--select-package" }, paramLabel = "PKG", arity = "1", converter = SelectorConverter.Package.class, description = "Select a package for test discovery. This option can be repeated.")
+				"--select-package" }, paramLabel = "PKG", arity = "1..*", converter = SelectorConverter.Package.class, description = "Select a package for test discovery. This option can be repeated.")
 		private final List<PackageSelector> selectedPackages = new ArrayList<>();
 
 		@Option(names = { "--p",
-				"-select-package" }, arity = "1", hidden = true, converter = SelectorConverter.Package.class)
+				"-select-package" }, arity = "1..*", hidden = true, converter = SelectorConverter.Package.class)
 		private final List<PackageSelector> selectedPackages2 = new ArrayList<>();
 
 		@Option(names = { "-c",
-				"--select-class" }, paramLabel = "CLASS", arity = "1", converter = SelectorConverter.Class.class, description = "Select a class for test discovery. This option can be repeated.")
+				"--select-class" }, paramLabel = "CLASS", arity = "1..*", converter = SelectorConverter.Class.class, description = "Select a class for test discovery. This option can be repeated.")
 		private final List<ClassSelector> selectedClasses = new ArrayList<>();
 
 		@Option(names = { "--c",
-				"-select-class" }, arity = "1", hidden = true, converter = SelectorConverter.Class.class)
+				"-select-class" }, arity = "1..*", hidden = true, converter = SelectorConverter.Class.class)
 		private final List<ClassSelector> selectedClasses2 = new ArrayList<>();
 
 		@Option(names = { "-m",
-				"--select-method" }, paramLabel = "NAME", arity = "1", converter = SelectorConverter.Method.class, description = "Select a method for test discovery. This option can be repeated.")
+				"--select-method" }, paramLabel = "NAME", arity = "1..*", converter = SelectorConverter.Method.class, description = "Select a method for test discovery. This option can be repeated.")
 		private final List<MethodSelector> selectedMethods = new ArrayList<>();
 
 		@Option(names = { "--m",
-				"-select-method" }, arity = "1", hidden = true, converter = SelectorConverter.Method.class)
+				"-select-method" }, arity = "1..*", hidden = true, converter = SelectorConverter.Method.class)
 		private final List<MethodSelector> selectedMethods2 = new ArrayList<>();
 
 		@Option(names = { "-r",
-				"--select-resource" }, paramLabel = "RESOURCE", arity = "1", converter = SelectorConverter.ClasspathResource.class, description = "Select a classpath resource for test discovery. This option can be repeated.")
+				"--select-resource" }, paramLabel = "RESOURCE", arity = "1..*", converter = SelectorConverter.ClasspathResource.class, description = "Select a classpath resource for test discovery. This option can be repeated.")
 		private final List<ClasspathResourceSelector> selectedClasspathResources = new ArrayList<>();
 
 		@Option(names = { "--r",
-				"-select-resource" }, arity = "1", hidden = true, converter = SelectorConverter.ClasspathResource.class)
+				"-select-resource" }, arity = "1..*", hidden = true, converter = SelectorConverter.ClasspathResource.class)
 		private final List<ClasspathResourceSelector> selectedClasspathResources2 = new ArrayList<>();
 
 		@Option(names = { "-i",
-				"--select-iteration" }, paramLabel = "PREFIX:VALUE[INDEX(..INDEX)?(,INDEX(..INDEX)?)*]", arity = "1", converter = SelectorConverter.Iteration.class, //
+				"--select-iteration" }, paramLabel = "PREFIX:VALUE[INDEX(..INDEX)?(,INDEX(..INDEX)?)*]", arity = "1..*", converter = SelectorConverter.Iteration.class, //
 				description = "Select iterations for test discovery via a prefixed identifier and a list of indexes or index ranges "
 						+ "(e.g. method:com.acme.Foo#m()[1..2] selects the first and second iteration of the m() method in the com.acme.Foo class). "
 						+ "This option can be repeated.")
 		private final List<IterationSelector> selectedIterations = new ArrayList<>();
 
 		@Option(names = { "--i",
-				"-select-iteration" }, arity = "1", hidden = true, converter = SelectorConverter.Iteration.class)
+				"-select-iteration" }, arity = "1..*", hidden = true, converter = SelectorConverter.Iteration.class)
 		private final List<IterationSelector> selectedIterations2 = new ArrayList<>();
 
-		@Option(names = "--select", paramLabel = "PREFIX:VALUE", arity = "1", converter = SelectorConverter.Identifier.class, //
+		@Option(names = "--select", paramLabel = "PREFIX:VALUE", arity = "1..*", converter = SelectorConverter.Identifier.class, //
 				description = "Select via a prefixed identifier (e.g. method:com.acme.Foo#m selects the m() method in the com.acme.Foo class). "
 						+ "This option can be repeated.")
 		private final List<DiscoverySelectorIdentifier> selectorIdentifiers = new ArrayList<>();

junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/ClasspathResourceSource.java

@@ -19,6 +19,7 @@
 import org.apiguardian.api.API;
 import org.junit.platform.commons.PreconditionViolationException;
 import org.junit.platform.commons.util.Preconditions;
+import org.junit.platform.commons.util.ResourceUtils;
 import org.junit.platform.commons.util.ToStringBuilder;
 import org.junit.platform.engine.TestSource;
 

junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/UriSource.java

@@ -20,6 +20,7 @@
 import org.apiguardian.api.API;
 import org.junit.platform.commons.logging.LoggerFactory;
 import org.junit.platform.commons.util.Preconditions;
+import org.junit.platform.commons.util.ResourceUtils;
 import org.junit.platform.engine.TestSource;
 
 /**