Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.2.x'

Browse Source 
Closes gh-40476
This commit is contained in:
Scott Frederick 2024-04-22 13:28:09 -05:00
commit 2019533b65
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/plugin/NativeImagePluginActionIntegrationTests.java
View File

@ -57,7 +57,7 @@ class NativeImagePluginActionIntegrationTests {
@TestTemplate @TestTemplate
void reachabilityMetadataConfigurationFilesAreCopiedToJar() throws IOException { void reachabilityMetadataConfigurationFilesAreCopiedToJar() throws IOException {
writeDummySpringApplicationAotProcessorMainClass(); writeDummySpringApplicationAotProcessorMainClass();
BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.2-rc-1").build("bootJar"); BuildResult result = this.gradleBuild.build("bootJar");
assertThat(result.task(":bootJar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":bootJar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
File buildLibs = new File(this.gradleBuild.getProjectDir(), "build/libs"); File buildLibs = new File(this.gradleBuild.getProjectDir(), "build/libs");
File jarFile = new File(buildLibs, this.gradleBuild.getProjectDir().getName() + ".jar"); File jarFile = new File(buildLibs, this.gradleBuild.getProjectDir().getName() + ".jar");
@ -75,7 +75,7 @@ class NativeImagePluginActionIntegrationTests {
writeDummySpringApplicationAotProcessorMainClass(); writeDummySpringApplicationAotProcessorMainClass();
FileSystemUtils.copyRecursively(new File("src/test/resources/reachability-metadata-repository"), FileSystemUtils.copyRecursively(new File("src/test/resources/reachability-metadata-repository"),
new File(this.gradleBuild.getProjectDir(), "reachability-metadata-repository")); new File(this.gradleBuild.getProjectDir(), "reachability-metadata-repository"));
BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.2-rc-1").build("bootJar"); BuildResult result = this.gradleBuild.build("bootJar");
assertThat(result.task(":bootJar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":bootJar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
File buildLibs = new File(this.gradleBuild.getProjectDir(), "build/libs"); File buildLibs = new File(this.gradleBuild.getProjectDir(), "build/libs");
File jarFile = new File(buildLibs, this.gradleBuild.getProjectDir().getName() + ".jar"); File jarFile = new File(buildLibs, this.gradleBuild.getProjectDir().getName() + ".jar");
@ -91,8 +91,7 @@ class NativeImagePluginActionIntegrationTests {
@TestTemplate @TestTemplate
void bootBuildImageIsConfiguredToBuildANativeImage() { void bootBuildImageIsConfiguredToBuildANativeImage() {
writeDummySpringApplicationAotProcessorMainClass(); writeDummySpringApplicationAotProcessorMainClass();
BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.2-rc-1") BuildResult result = this.gradleBuild.build("bootBuildImageConfiguration");
.build("bootBuildImageConfiguration");
assertThat(result.getOutput()).contains("paketobuildpacks/builder-jammy-tiny") assertThat(result.getOutput()).contains("paketobuildpacks/builder-jammy-tiny")
.contains("BP_NATIVE_IMAGE = true"); .contains("BP_NATIVE_IMAGE = true");
} }
@ -100,31 +99,27 @@ class NativeImagePluginActionIntegrationTests {
@TestTemplate @TestTemplate
void developmentOnlyDependenciesDoNotAppearInNativeImageClasspath() { void developmentOnlyDependenciesDoNotAppearInNativeImageClasspath() {
writeDummySpringApplicationAotProcessorMainClass(); writeDummySpringApplicationAotProcessorMainClass();
BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.2-rc-1") BuildResult result = this.gradleBuild.build("checkNativeImageClasspath");
.build("checkNativeImageClasspath");
assertThat(result.getOutput()).doesNotContain("commons-lang"); assertThat(result.getOutput()).doesNotContain("commons-lang");
} }
@TestTemplate @TestTemplate
void testAndDevelopmentOnlyDependenciesDoNotAppearInNativeImageClasspath() { void testAndDevelopmentOnlyDependenciesDoNotAppearInNativeImageClasspath() {
writeDummySpringApplicationAotProcessorMainClass(); writeDummySpringApplicationAotProcessorMainClass();
BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.2-rc-1") BuildResult result = this.gradleBuild.build("checkNativeImageClasspath");
.build("checkNativeImageClasspath");
assertThat(result.getOutput()).doesNotContain("commons-lang"); assertThat(result.getOutput()).doesNotContain("commons-lang");
} }
@TestTemplate @TestTemplate
void classesGeneratedDuringAotProcessingAreOnTheNativeImageClasspath() { void classesGeneratedDuringAotProcessingAreOnTheNativeImageClasspath() {
BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.2-rc-1") BuildResult result = this.gradleBuild.build("checkNativeImageClasspath");
.build("checkNativeImageClasspath");
assertThat(result.getOutput()).contains(projectPath("build/classes/java/aot"), assertThat(result.getOutput()).contains(projectPath("build/classes/java/aot"),
projectPath("build/resources/aot"), projectPath("build/generated/aotClasses")); projectPath("build/resources/aot"), projectPath("build/generated/aotClasses"));
} }
@TestTemplate @TestTemplate
void classesGeneratedDuringAotTestProcessingAreOnTheTestNativeImageClasspath() { void classesGeneratedDuringAotTestProcessingAreOnTheTestNativeImageClasspath() {
BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.2-rc-1") BuildResult result = this.gradleBuild.build("checkTestNativeImageClasspath");
.build("checkTestNativeImageClasspath");
assertThat(result.getOutput()).contains(projectPath("build/classes/java/aotTest"), assertThat(result.getOutput()).contains(projectPath("build/classes/java/aotTest"),
projectPath("build/resources/aotTest"), projectPath("build/generated/aotTestClasses")); projectPath("build/resources/aotTest"), projectPath("build/generated/aotTestClasses"));
} }
@ -132,7 +127,7 @@ class NativeImagePluginActionIntegrationTests {
@TestTemplate @TestTemplate
void nativeEntryIsAddedToManifest() throws IOException { void nativeEntryIsAddedToManifest() throws IOException {
writeDummySpringApplicationAotProcessorMainClass(); writeDummySpringApplicationAotProcessorMainClass();
BuildResult result = this.gradleBuild.expectDeprecationWarningsWithAtLeastVersion("8.2-rc-1").build("bootJar"); BuildResult result = this.gradleBuild.build("bootJar");
assertThat(result.task(":bootJar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS); assertThat(result.task(":bootJar").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
File buildLibs = new File(this.gradleBuild.getProjectDir(), "build/libs"); File buildLibs = new File(this.gradleBuild.getProjectDir(), "build/libs");
JarFile jarFile = new JarFile(new File(buildLibs, this.gradleBuild.getProjectDir().getName() + ".jar")); JarFile jarFile = new JarFile(new File(buildLibs, this.gradleBuild.getProjectDir().getName() + ".jar"));