Allow default package for PackageSource

marcphilipp · marcphilipp · commit 63362e98c914 · 2025-07-16T07:31:16.000+02:00
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.13.4.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.13.4.adoc
@@ -28,6 +28,8 @@ repository on GitHub.
 
 * `ClasspathResourceSelector` no longer allows to be constructed with a resource name that
   is blank after removing the leading slash.
+* `PackageSource.from(String)` now allows to be constructed with an empty string to
+  indicate the default package.
 
 [[release-notes-5.13.4-junit-platform-deprecations-and-breaking-changes]]
 ==== Deprecations and Breaking Changes
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/PackageSource.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/support/descriptor/PackageSource.java
@@ -60,7 +60,10 @@ private PackageSource(Package javaPackage) {
 	}
 
 	private PackageSource(String packageName) {
-		this.packageName = Preconditions.notBlank(packageName, "package name must not be null or blank");
+		Preconditions.notNull(packageName, "package name must not be null");
+		Preconditions.condition(packageName.isEmpty() || !packageName.isBlank(),
+			"package name must not contain only whitespace");
+		this.packageName = packageName;
 	}
 
 	/**
diff --git a/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java b/platform-tests/src/test/java/org/junit/platform/engine/support/descriptor/PackageSourceTests.java
@@ -18,6 +18,8 @@
 import java.util.stream.Stream;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.platform.commons.PreconditionViolationException;
 
 /**
@@ -49,9 +51,11 @@ void packageSourceFromNullPackageReference() {
 		assertThrows(PreconditionViolationException.class, () -> PackageSource.from((Package) null));
 	}
 
-	@Test
-	void packageSourceFromPackageName() {
-		var testPackage = getClass().getPackage().getName();
+	@ParameterizedTest
+	@ValueSource(classes = PackageSourceTests.class)
+	@ValueSource(strings = "DefaultPackageTestCase")
+	void packageSourceFromPackageName(Class<?> testClass) {
+		var testPackage = testClass.getPackage().getName();
 		var source = PackageSource.from(testPackage);
 
 		assertThat(source.getPackageName()).isEqualTo(testPackage);
diff --git a/platform-tests/src/test/java/org/junit/platform/launcher/core/DiscoveryIssueCollectorTests.java b/platform-tests/src/test/java/org/junit/platform/launcher/core/DiscoveryIssueCollectorTests.java
@@ -69,6 +69,7 @@ public static Stream<Pair> pairs() {
 			new Pair(selectClasspathResource("someResource", FilePosition.from(42, 23)),
 				ClasspathResourceSource.from("someResource",
 					org.junit.platform.engine.support.descriptor.FilePosition.from(42, 23))), //
+			new Pair(selectPackage(""), PackageSource.from("")), //
 			new Pair(selectPackage("some.package"), PackageSource.from("some.package")), //
 			new Pair(selectFile("someFile"), FileSource.from(new File("someFile"))), //
 			new Pair(selectFile("someFile", FilePosition.from(42)),

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,10 @@ private PackageSource(Package javaPackage) {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`private PackageSource(String packageName) {`
`63`		`- this.packageName = Preconditions.notBlank(packageName, "package name must not be null or blank");`
	`63`	`+ Preconditions.notNull(packageName, "package name must not be null");`
	`64`	`+ Preconditions.condition(packageName.isEmpty() \|\| !packageName.isBlank(),`
	`65`	`+ "package name must not contain only whitespace");`
	`66`	`+ this.packageName = packageName;`
`64`	`67`	`}`
`65`	`68`
`66`	`69`	`/**`