Polish "Test the launch script when executed directly"

See gh-21388

Author: wilkinsona

spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/AbstractLaunchScriptIT.java

@@ -35,12 +35,20 @@
 /**
  * Abstract base class for testing the launch script.
  *
+ * @author Andy Wilkinson
+ * @author Ali Shahbour
  * @author Alexey Vinogradov
  */
 abstract class AbstractLaunchScriptIT {
 
 	protected static final char ESC = 27;
 
+	private final String scriptsDir;
+
+	protected AbstractLaunchScriptIT(String scriptsDir) {
+		this.scriptsDir = scriptsDir;
+	}
+
 	static List<Object[]> parameters() {
 		List<Object[]> parameters = new ArrayList<>();
 		for (File os : new File("src/test/resources/conf").listFiles()) {
@@ -69,7 +77,8 @@ protected void doLaunch(String os, String version, String script) throws Excepti
 
 	protected String doTest(String os, String version, String script) throws Exception {
 		ToStringConsumer consumer = new ToStringConsumer().withRemoveAnsiCodes(false);
-		try (LaunchScriptTestContainer container = new LaunchScriptTestContainer(os, version, script)) {
+		try (LaunchScriptTestContainer container = new LaunchScriptTestContainer(os, version, this.scriptsDir,
+				script)) {
 			container.withLogConsumer(consumer);
 			container.start();
 			while (container.isRunning()) {
@@ -81,17 +90,16 @@ protected String doTest(String os, String version, String script) throws Excepti
 
 	private static final class LaunchScriptTestContainer extends GenericContainer<LaunchScriptTestContainer> {
 
-		private LaunchScriptTestContainer(String os, String version, String testScript) {
+		private LaunchScriptTestContainer(String os, String version, String scriptsDir, String testScript) {
 			super(new ImageFromDockerfile("spring-boot-launch-script/" + os.toLowerCase() + "-" + version)
 					.withFileFromFile("Dockerfile",
-							new File("src/test/resources/conf/" + os + "/" + version + "/Dockerfile"))
-					.withFileFromFile("spring-boot-launch-script-tests.jar", findApplication())
-					.withFileFromFile("test-functions.sh", new File("src/test/resources/scripts/test-functions.sh"))
-					.withFileFromFile("jar/test-functions.sh",
-							new File("src/test/resources/scripts/jar/test-functions.sh"))
-					.withFileFromFile("init.d/test-functions.sh",
-							new File("src/test/resources/scripts/init.d/test-functions.sh")));
-			withCopyFileToContainer(MountableFile.forHostPath("src/test/resources/scripts/" + testScript),
+							new File("src/test/resources/conf/" + os + "/" + version + "/Dockerfile")));
+			withCopyFileToContainer(MountableFile.forHostPath(findApplication().getAbsolutePath()),
+					"/spring-boot-launch-script-tests.jar");
+			withCopyFileToContainer(
+					MountableFile.forHostPath("src/test/resources/scripts/" + scriptsDir + "test-functions.sh"),
+					"/test-functions.sh");
+			withCopyFileToContainer(MountableFile.forHostPath("src/test/resources/scripts/" + scriptsDir + testScript),
 					"/" + testScript);
 			withCommand("/bin/bash", "-c", "chmod +x " + testScript + " && ./" + testScript);
 			withStartupTimeout(Duration.ofMinutes(10));

spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/ShellLaunchScriptIT.java renamed to spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/test/java/org/springframework/boot/launchscript/JarLaunchScriptIT.java

@@ -22,45 +22,72 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Integration tests of Spring Boot's launch script with launching via shell.
+ * Integration tests of Spring Boot's launch script when executing the jar directly.
  *
  * @author Alexey Vinogradov
+ * @author Andy Wilkinson
  */
-class ShellLaunchScriptIT extends AbstractLaunchScriptIT {
+class JarLaunchScriptIT extends AbstractLaunchScriptIT {
+
+	JarLaunchScriptIT() {
+		super("jar/");
+	}
 
 	@ParameterizedTest(name = "{0} {1}")
 	@MethodSource("parameters")
 	void basicLaunch(String os, String version) throws Exception {
-		doLaunch(os, version, "jar/basic-launch.sh");
+		doLaunch(os, version, "basic-launch.sh");
 	}
 
 	@ParameterizedTest(name = "{0} {1}")
 	@MethodSource("parameters")
 	void launchWithDebugEnv(String os, String version) throws Exception {
-		final String output = doTest(os, version, "jar/launch-with-debug.sh");
+		final String output = doTest(os, version, "launch-with-debug.sh");
 		assertThat(output).contains("++ pwd");
 	}
 
 	@ParameterizedTest(name = "{0} {1}")
 	@MethodSource("parameters")
 	void launchWithDifferentJarFileEnv(String os, String version) throws Exception {
-		final String output = doTest(os, version, "jar/launch-with-jarfile.sh");
+		final String output = doTest(os, version, "launch-with-jarfile.sh");
 		assertThat(output).contains("app-another.jar");
 		assertThat(output).doesNotContain("spring-boot-launch-script-tests.jar");
 	}
 
 	@ParameterizedTest(name = "{0} {1}")
 	@MethodSource("parameters")
-	void launchWithDifferentAppName(String os, String version) throws Exception {
-		final String output = doTest(os, version, "jar/launch-with-app-name.sh");
-		assertThat(output).contains("All tests are passed.");
+	void launchWithSingleCommandLineArgument(String os, String version) throws Exception {
+		doLaunch(os, version, "launch-with-single-command-line-argument.sh");
+	}
+
+	@ParameterizedTest(name = "{0} {1}")
+	@MethodSource("parameters")
+	void launchWithMultipleCommandLineArguments(String os, String version) throws Exception {
+		doLaunch(os, version, "launch-with-multiple-command-line-arguments.sh");
+	}
+
+	@ParameterizedTest(name = "{0} {1}")
+	@MethodSource("parameters")
+	void launchWithSingleRunArg(String os, String version) throws Exception {
+		doLaunch(os, version, "launch-with-single-run-arg.sh");
+	}
+
+	@ParameterizedTest(name = "{0} {1}")
+	@MethodSource("parameters")
+	void launchWithMultipleRunArgs(String os, String version) throws Exception {
+		doLaunch(os, version, "launch-with-multiple-run-args.sh");
+	}
+
+	@ParameterizedTest(name = "{0} {1}")
+	@MethodSource("parameters")
+	void launchWithSingleJavaOpt(String os, String version) throws Exception {
+		doLaunch(os, version, "launch-with-single-java-opt.sh");
 	}
 
 	@ParameterizedTest(name = "{0} {1}")
 	@MethodSource("parameters")
-	void launchInInitdDir(String os, String version) throws Exception {
-		final String output = doTest(os, version, "jar/launch-in-init.d-dir.sh");
-		assertThat(output).contains("Usage: ./some_app {start|stop|force-stop|restart|force-reload|status|run}");
+	void launchWithMultipleJavaOpts(String os, String version) throws Exception {
+		doLaunch(os, version, "launch-with-multiple-java-opts.sh");
 	}
 
 }