diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/AbstractLaunchScriptIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/AbstractLaunchScriptIntegrationTests.java index dd374d479a73..64fce246ad4d 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/AbstractLaunchScriptIntegrationTests.java +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/AbstractLaunchScriptIntegrationTests.java @@ -30,6 +30,7 @@ import org.testcontainers.utility.MountableFile; import org.springframework.boot.ansi.AnsiColor; +import org.springframework.util.Assert; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.containsString; @@ -110,12 +111,10 @@ private LaunchScriptTestContainer(String os, String version, String scriptsDir, } private static File findApplication() { - File appJar = new File("build/app/build/libs/app.jar"); - if (appJar.isFile()) { - return appJar; - } - throw new IllegalStateException( - "Could not find test application in build/app/build/libs directory. Have you built it?"); + String name = String.format("build/%1$s/build/libs/%1$s.jar", "spring-boot-launch-script-tests-app"); + File jar = new File(name); + Assert.state(jar.isFile(), () -> "Could not find " + name + ". Have you built it?"); + return jar; } } diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java index e8c5408f841b..ca1a8a3434d2 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java @@ -28,6 +28,8 @@ import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.MountableFile; +import org.springframework.util.Assert; + import static org.assertj.core.api.Assertions.assertThat; /** @@ -49,12 +51,10 @@ class LoaderIntegrationTests { .withCommand("java", "-jar", "app.jar"); private static File findApplication() { - File appJar = new File("build/app/build/libs/app.jar"); - if (appJar.isFile()) { - return appJar; - } - throw new IllegalStateException( - "Could not find test application in build/app/build/libs directory. Have you built it?"); + String name = String.format("build/%1$s/build/libs/%1$s.jar", "spring-boot-loader-tests-app"); + File jar = new File(name); + Assert.state(jar.isFile(), () -> "Could not find " + name + ". Have you built it?"); + return jar; } @Test