Ignore buildpack deprecation warnings in Paketo system tests

Fixes gh-29885
spring-projects · Feb 23, 2022 · 59ffe28 · 59ffe28
1 parent acd1ba0
commit 59ffe28
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/...upport/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java b/...upport/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuild.java
@@ -80,6 +80,8 @@ public class GradleBuild {
 
 	private GradleVersion expectDeprecationWarnings;
 
+	private String[] expectedDeprecationMessages;
+
 	private boolean configurationCache = false;
 
 	private Map<String, String> scriptProperties = new HashMap<>();
@@ -152,6 +154,11 @@ public GradleBuild expectDeprecationWarningsWithAtLeastVersion(String gradleVers
 		return this;
 	}
 
+	public GradleBuild expectDeprecationMessages(String... messages) {
+		this.expectedDeprecationMessages = messages;
+		return this;
+	}
+
 	public GradleBuild configurationCache() {
 		this.configurationCache = true;
 		return this;
@@ -167,7 +174,13 @@ public BuildResult build(String... arguments) {
 			BuildResult result = prepareRunner(arguments).build();
 			if (this.expectDeprecationWarnings == null || (this.gradleVersion != null
 					&& this.expectDeprecationWarnings.compareTo(GradleVersion.version(this.gradleVersion)) > 0)) {
-				assertThat(result.getOutput()).doesNotContain("Deprecated").doesNotContain("deprecated");
+				String buildOutput = result.getOutput();
+				if (this.expectedDeprecationMessages != null) {
+					for (String message : this.expectedDeprecationMessages) {
+						buildOutput = buildOutput.replaceAll(message, "");
+					}
+				}
+				assertThat(buildOutput).doesNotContain("Deprecated").doesNotContain("deprecated");
 			}
 			return result;
 		}

diff --git a/...e-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java b/...e-tests/src/systemTest/java/org/springframework/boot/image/paketo/PaketoBuilderTests.java
@@ -122,6 +122,7 @@ void executableJarAppBuiltTwiceWithCaching() throws Exception {
 			container.waitingFor(Wait.forHttp("/test")).start();
 			container.stop();
 		}
+		this.gradleBuild.expectDeprecationMessages("BOM table is deprecated in this buildpack api version");
 		result = buildImage(imageName);
 		assertThat(result.task(":bootBuildImage").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
 		try (GenericContainer<?> container = new GenericContainer<>(imageName).withExposedPorts(8080)) {