Rename to org.junit.start

sormuras · sormuras · commit 2308620ecb8e · 2025-10-17T18:19:06.000+02:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -43,7 +43,7 @@ val vintageProjects by extra(listOf(
 	dependencyProject(projects.junitVintageEngine)
 ))
 
-val mavenizedProjects by extra(listOf(dependencyProject(projects.junitOnramp)) + platformProjects + jupiterProjects + vintageProjects)
+val mavenizedProjects by extra(listOf(dependencyProject(projects.junitStart)) + platformProjects + jupiterProjects + vintageProjects)
 val modularProjects by extra(mavenizedProjects - setOf(dependencyProject(projects.junitPlatformConsoleStandalone)))
 
 dependencies {
diff --git a/junit-onramp/src/main/java/org/junit/onramp/package-info.java b/junit-onramp/src/main/java/org/junit/onramp/package-info.java
diff --git a/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java b/junit-platform-commons/src/main/java/org/junit/platform/commons/util/ExceptionUtils.java
@@ -41,7 +41,7 @@
 @API(status = INTERNAL, since = "1.0")
 public final class ExceptionUtils {
 
-	private static final String JUNIT_ON_RAMP_PACKAGE_PREFIX = "org.junit.onramp.";
+	private static final String JUNIT_START_PACKAGE_PREFIX = "org.junit.start.";
 
 	private static final String JUNIT_PLATFORM_LAUNCHER_PACKAGE_PREFIX = "org.junit.platform.launcher.";
 
@@ -141,7 +141,7 @@ public static void pruneStackTrace(Throwable throwable, List<String> classNames)
 				prunedStackTrace.addAll(stackTrace.subList(i, stackTrace.size()));
 				break;
 			}
-			else if (className.startsWith(JUNIT_ON_RAMP_PACKAGE_PREFIX)) {
+			else if (className.startsWith(JUNIT_START_PACKAGE_PREFIX)) {
 				prunedStackTrace.clear();
 			}
 			else if (className.startsWith(JUNIT_PLATFORM_LAUNCHER_PACKAGE_PREFIX)) {
diff --git a/junit-platform-console/src/main/java/module-info.java b/junit-platform-console/src/main/java/module-info.java
@@ -24,7 +24,7 @@
 	requires org.junit.platform.launcher;
 	requires org.junit.platform.reporting;
 
-	exports org.junit.platform.console.output to org.junit.onramp;
+	exports org.junit.platform.console.output to org.junit.start;
 
 	provides java.util.spi.ToolProvider with org.junit.platform.console.ConsoleLauncherToolProvider;
 }
diff --git a/junit-start/junit-start.gradle.kts b/junit-start/junit-start.gradle.kts
@@ -2,7 +2,7 @@ plugins {
 	id("junitbuild.java-library-conventions")
 }
 
-description = "JUnit On-Ramp Module"
+description = "JUnit Start Module"
 
 dependencies {
 	api(platform(projects.junitBom))
diff --git a/junit-start/src/main/java/module-info.java b/junit-start/src/main/java/module-info.java
@@ -9,11 +9,11 @@
  */
 
 /**
- * Defines the API of the JUnit On-Ramp module for writing and running tests.
+ * Defines the API of the JUnit Start module for writing and running tests.
  * <p>
  * Usage example:
  * <pre>{@code
- * import module org.junit.onramp;
+ * import module org.junit.start;
  *
  *  void main() {
  *    JUnit.run();
@@ -25,13 +25,13 @@
  *  }
  * }</pre>
  */
-module org.junit.onramp {
+module org.junit.start {
 	requires static transitive org.apiguardian.api;
 	requires static transitive org.jspecify;
 
 	requires transitive org.junit.jupiter;
 	requires org.junit.platform.launcher;
 	requires org.junit.platform.console;
 
-	exports org.junit.onramp;
+	exports org.junit.start;
 }
diff --git a/junit-start/src/main/java/org/junit/start/JUnit.java b/junit-start/src/main/java/org/junit/start/JUnit.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-package org.junit.onramp;
+package org.junit.start;
 
 import static java.lang.StackWalker.Option.RETAIN_CLASS_REFERENCE;
 import static org.apiguardian.api.API.Status.EXPERIMENTAL;
diff --git a/junit-start/src/main/java/org/junit/start/package-info.java b/junit-start/src/main/java/org/junit/start/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * Contains JUnit Start API for writing and running tests.
+ */
+
+@NullMarked
+package org.junit.start;
+
+import org.jspecify.annotations.NullMarked;
diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts
@@ -20,7 +20,7 @@ javaLibrary {
 spotless {
 	java {
 		target(files(project.java.sourceSets.map { it.allJava }), "projects/**/*.java")
-		targetExclude("projects/junit-onramp/**/*.java") // due to compact source files and module imports
+		targetExclude("projects/junit-start/**/*.java") // due to compact source files and module imports
 	}
 	kotlin {
 		target("projects/**/*.kt")
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-onramp.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-onramp.expected.txt
@@ -1,5 +1,5 @@
-org.junit.onramp@${version} jar:file:.+/junit-onramp-\d.+\.jar..module-info\.class
-exports org.junit.onramp
+org.junit.start@${version} jar:file:.+/junit-start-\d.+\.jar..module-info\.class
+exports org.junit.start
 requires java.base mandated
 requires org.apiguardian.api static transitive
 requires org.jspecify static transitive
diff --git a/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt b/platform-tooling-support-tests/projects/jar-describe-module/junit-platform-console.expected.txt
@@ -7,7 +7,7 @@ requires org.junit.platform.engine
 requires org.junit.platform.launcher
 requires org.junit.platform.reporting
 provides java.util.spi.ToolProvider with org.junit.platform.console.ConsoleLauncherToolProvider
-qualified exports org.junit.platform.console.output to org.junit.onramp
+qualified exports org.junit.platform.console.output to org.junit.start
 contains org.junit.platform.console
 contains org.junit.platform.console.command
 contains org.junit.platform.console.options
diff --git a/platform-tooling-support-tests/projects/junit-onramp/compact/JUnitRun.java b/platform-tooling-support-tests/projects/junit-onramp/compact/JUnitRun.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-import module org.junit.onramp;
+import module org.junit.start;
 
 void main() {
 	JUnit.run();
diff --git a/platform-tooling-support-tests/projects/junit-onramp/compact/JUnitRunClass.java b/platform-tooling-support-tests/projects/junit-onramp/compact/JUnitRunClass.java
@@ -8,7 +8,7 @@
  * https://www.eclipse.org/legal/epl-v20.html
  */
 
-import module org.junit.onramp;
+import module org.junit.start;
 
 void main() {
 	JUnit.run(getClass());
diff --git a/platform-tooling-support-tests/projects/junit-onramp/modular/module-info.java b/platform-tooling-support-tests/projects/junit-onramp/modular/module-info.java
@@ -9,5 +9,5 @@
  */
 
 open module m {
-	requires org.junit.onramp;
+	requires org.junit.start;
 }
diff --git a/platform-tooling-support-tests/projects/junit-onramp/modular/p/JUnitRunModule.java b/platform-tooling-support-tests/projects/junit-onramp/modular/p/JUnitRunModule.java
@@ -10,7 +10,7 @@
 
 package p;
 
-import module org.junit.onramp;
+import module org.junit.start;
 
 class JUnitRunModule {
 	void main() {
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/HelperTests.java
@@ -36,7 +36,7 @@ void loadModuleDirectoryNames() {
 			"junit-jupiter-engine", //
 			"junit-jupiter-migrationsupport", //
 			"junit-jupiter-params", //
-			"junit-onramp", //
+			"junit-start", //
 			"junit-platform-commons", //
 			"junit-platform-console", //
 			"junit-platform-engine", //
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JUnitOnRampTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/JUnitOnRampTests.java
@@ -31,14 +31,14 @@
 /**
  * @since 6.1
  */
-class JUnitOnRampTests {
+class JUnitstartTests {
 
 	@TempDir
 	static Path workspace;
 
 	@BeforeAll
 	static void prepareLocalLibraryDirectoryWithJUnitModules() throws Exception {
-		copyToWorkspace(Projects.JUNIT_ONRAMP, workspace);
+		copyToWorkspace(Projects.JUNIT_start, workspace);
 		var lib = workspace.resolve("lib");
 		try {
 			Files.createDirectories(lib);
@@ -49,7 +49,7 @@ static void prepareLocalLibraryDirectoryWithJUnitModules() throws Exception {
 			}
 			for (var module : Helper.loadModuleDirectoryNames()) {
 				if (module.startsWith("junit-platform") || module.startsWith("junit-jupiter")
-						|| module.equals("junit-onramp")) {
+						|| module.equals("junit-start")) {
 					if (module.equals("junit-jupiter-migrationsupport"))
 						continue;
 					if (module.startsWith("junit-platform-suite"))
@@ -76,7 +76,7 @@ void junitRun(@FilePrefix("junit-run") OutputFiles outputFiles) throws Exception
 		var result = ProcessStarters.java() //
 				.workingDir(workspace) //
 				.addArguments("--module-path", "lib") // relative to workspace
-				.addArguments("--add-modules", "org.junit.onramp") // configure root module
+				.addArguments("--add-modules", "org.junit.start") // configure root module
 				.addArguments("compact/JUnitRun.java") // leverage Java's source mode
 				.redirectOutput(outputFiles) //
 				.startAndWait();
@@ -90,7 +90,7 @@ void junitRunClass(@FilePrefix("junit-run-class") OutputFiles outputFiles) throw
 		var result = ProcessStarters.java() //
 				.workingDir(workspace) //
 				.addArguments("--module-path", "lib") // relative to workspace
-				.addArguments("--add-modules", "org.junit.onramp") // configure root module
+				.addArguments("--add-modules", "org.junit.start") // configure root module
 				.addArguments("compact/JUnitRunClass.java") // leverage Java's source mode
 				.redirectOutput(outputFiles) //
 				.startAndWait();
diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/Projects.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/Projects.java
@@ -21,7 +21,7 @@ public class Projects {
 	public static final String GRADLE_KOTLIN_EXTENSIONS = "gradle-kotlin-extensions";
 	public static final String GRADLE_MISSING_ENGINE = "gradle-missing-engine";
 	public static final String JAR_DESCRIBE_MODULE = "jar-describe-module";
-	public static final String JUNIT_ONRAMP = "junit-onramp";
+	public static final String JUNIT_start = "junit-start";
 	public static final String JUPITER_STARTER = "jupiter-starter";
 	public static final String KOTLIN_COROUTINES = "kotlin-coroutines";
 	public static final String MAVEN_SUREFIRE_COMPATIBILITY = "maven-surefire-compatibility";
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -79,7 +79,7 @@ include("junit-jupiter-api")
 include("junit-jupiter-engine")
 include("junit-jupiter-migrationsupport")
 include("junit-jupiter-params")
-include("junit-onramp")
+include("junit-start")
 include("junit-platform-commons")
 include("junit-platform-console")
 include("junit-platform-console-standalone")

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`@API(status = INTERNAL, since = "1.0")`
`42`	`42`	`public final class ExceptionUtils {`
`43`	`43`
`44`		`- private static final String JUNIT_ON_RAMP_PACKAGE_PREFIX = "org.junit.onramp.";`
	`44`	`+ private static final String JUNIT_START_PACKAGE_PREFIX = "org.junit.start.";`
`45`	`45`
`46`	`46`	`private static final String JUNIT_PLATFORM_LAUNCHER_PACKAGE_PREFIX = "org.junit.platform.launcher.";`
`47`	`47`
`@@ -141,7 +141,7 @@ public static void pruneStackTrace(Throwable throwable, List<String> classNames)`
`141`	`141`	`prunedStackTrace.addAll(stackTrace.subList(i, stackTrace.size()));`
`142`	`142`	`break;`
`143`	`143`	`}`
`144`		`- else if (className.startsWith(JUNIT_ON_RAMP_PACKAGE_PREFIX)) {`
	`144`	`+ else if (className.startsWith(JUNIT_START_PACKAGE_PREFIX)) {`
`145`	`145`	`prunedStackTrace.clear();`
`146`	`146`	`}`
`147`	`147`	`else if (className.startsWith(JUNIT_PLATFORM_LAUNCHER_PACKAGE_PREFIX)) {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`requires org.junit.platform.launcher;`
`25`	`25`	`requires org.junit.platform.reporting;`
`26`	`26`
`27`		`- exports org.junit.platform.console.output to org.junit.onramp;`
	`27`	`+ exports org.junit.platform.console.output to org.junit.start;`
`28`	`28`
`29`	`29`	`provides java.util.spi.ToolProvider with org.junit.platform.console.ConsoleLauncherToolProvider;`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ plugins {`
`2`	`2`	`id("junitbuild.java-library-conventions")`
`3`	`3`	`}`
`4`	`4`
`5`		`-description = "JUnit On-Ramp Module"`
	`5`	`+description = "JUnit Start Module"`
`6`	`6`
`7`	`7`	`dependencies {`
`8`	`8`	`api(platform(projects.junitBom))`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ javaLibrary {`
`20`	`20`	`spotless {`
`21`	`21`	`java {`
`22`	`22`	`target(files(project.java.sourceSets.map { it.allJava }), "projects/*/.java")`
`23`		`- targetExclude("projects/junit-onramp/*/.java") // due to compact source files and module imports`
	`23`	`+ targetExclude("projects/junit-start/*/.java") // due to compact source files and module imports`
`24`	`24`	`}`
`25`	`25`	`kotlin {`
`26`	`26`	`target("projects/*/.kt")`