root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Fix integration test app detection 

See gh-18631
This commit is contained in:
Phillip Webb 2020-12-17 22:32:12 -08:00
parent a2a153ade6
commit b351288f48
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/src/intTest/java/org/springframework/boot/launchscript/AbstractLaunchScriptIntegrationTests.java
View File

@ -30,6 +30,7 @@ import org.testcontainers.images.builder.ImageFromDockerfile;
import org.testcontainers.utility.MountableFile; import org.testcontainers.utility.MountableFile;
import org.springframework.boot.ansi.AnsiColor; import org.springframework.boot.ansi.AnsiColor;
import org.springframework.util.Assert;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
@ -110,12 +111,10 @@ abstract class AbstractLaunchScriptIntegrationTests {
} }
private static File findApplication() { private static File findApplication() {
File appJar = new File("build/app/build/libs/app.jar"); String name = String.format("build/%1$s/build/libs/%1$s.jar", "spring-boot-launch-script-tests-app");
if (appJar.isFile()) { File jar = new File(name);
return appJar; Assert.state(jar.isFile(), () -> "Could not find " + name + ". Have you built it?");
} return jar;
throw new IllegalStateException(
"Could not find test application in build/app/build/libs directory. Have you built it?");
} }
} }

12
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/src/intTest/java/org/springframework/boot/loader/LoaderIntegrationTests.java
View File

@ -28,6 +28,8 @@ import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.DockerImageName;
import org.testcontainers.utility.MountableFile; import org.testcontainers.utility.MountableFile;
import org.springframework.util.Assert;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
/** /**
@ -49,12 +51,10 @@ class LoaderIntegrationTests {
.withCommand("java", "-jar", "app.jar"); .withCommand("java", "-jar", "app.jar");
private static File findApplication() { private static File findApplication() {
File appJar = new File("build/app/build/libs/app.jar"); String name = String.format("build/%1$s/build/libs/%1$s.jar", "spring-boot-loader-tests-app");
if (appJar.isFile()) { File jar = new File(name);
return appJar; Assert.state(jar.isFile(), () -> "Could not find " + name + ". Have you built it?");
} return jar;
throw new IllegalStateException(
"Could not find test application in build/app/build/libs directory. Have you built it?");
} }
@Test @Test