From 600f7559c5f0f29ac707cc97dae963dc7b0c6cfb Mon Sep 17 00:00:00 2001 From: Peter Paul Bakker Date: Wed, 10 Jun 2026 06:58:14 +0000 Subject: [PATCH 1/2] fix(tests): correct SapMachine log assertion strings #1288 BaseJRE refactor renamed the install log from "Installing SAP Machine" to "Installing SapMachine"; four assertions in tomcat_test.go and java_main_test.go were missed. --- src/integration/java_main_test.go | 2 +- src/integration/tomcat_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/integration/java_main_test.go b/src/integration/java_main_test.go index 954ddd83f..017393050 100644 --- a/src/integration/java_main_test.go +++ b/src/integration/java_main_test.go @@ -126,7 +126,7 @@ func testJavaMain(platform switchblade.Platform, fixtures string) func(*testing. // Verify SAPMachine JRE was installed from manifest Expect(logs.String()).To(ContainSubstring("Java Buildpack")) - Expect(logs.String()).To(ContainSubstring("Installing SAP Machine")) + Expect(logs.String()).To(ContainSubstring("Installing SapMachine")) Expect(logs.String()).To(ContainSubstring("17.")) }) }) diff --git a/src/integration/tomcat_test.go b/src/integration/tomcat_test.go index 6e0aa362a..db619765b 100644 --- a/src/integration/tomcat_test.go +++ b/src/integration/tomcat_test.go @@ -371,7 +371,7 @@ func testTomcat(platform switchblade.Platform, fixtures string) func(*testing.T, Expect(err).NotTo(HaveOccurred(), logs.String) - Expect(logs.String()).To(ContainSubstring("Installing SAP Machine (17.")) + Expect(logs.String()).To(ContainSubstring("Installing SapMachine (17.")) Eventually(deployment).Should(matchers.Serve(ContainSubstring("OK"))) }) @@ -384,7 +384,7 @@ func testTomcat(platform switchblade.Platform, fixtures string) func(*testing.T, Expect(err).NotTo(HaveOccurred(), logs.String) - Expect(logs.String()).To(ContainSubstring("Installing SAP Machine (21.")) + Expect(logs.String()).To(ContainSubstring("Installing SapMachine (21.")) Eventually(deployment).Should(matchers.Serve(ContainSubstring("OK"))) }) @@ -397,7 +397,7 @@ func testTomcat(platform switchblade.Platform, fixtures string) func(*testing.T, Expect(err).NotTo(HaveOccurred(), logs.String) - Expect(logs.String()).To(ContainSubstring("Installing SAP Machine (25.")) + Expect(logs.String()).To(ContainSubstring("Installing SapMachine (25.")) Eventually(deployment).Should(matchers.Serve(ContainSubstring("OK"))) }) }) From ef6af9c4cbd122c15b45f427597ad6966a1c96f4 Mon Sep 17 00:00:00 2001 From: Peter Paul Bakker Date: Wed, 10 Jun 2026 07:42:21 +0000 Subject: [PATCH 2/2] fix(tests): correct Tomcat version assertion strings Commit 90abbc21 changed the log format from "Installed Tomcat version %s" to "Installed Tomcat (%s)" but did not update the integration test assertions that matched "Tomcat 9" and "Tomcat 10". Those substrings no longer appear in the output, causing all JRE-selection Tomcat tests to fail. --- src/integration/tomcat_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/integration/tomcat_test.go b/src/integration/tomcat_test.go index db619765b..2952e3be1 100644 --- a/src/integration/tomcat_test.go +++ b/src/integration/tomcat_test.go @@ -171,7 +171,7 @@ func testTomcat(platform switchblade.Platform, fixtures string) func(*testing.T, Expect(err).NotTo(HaveOccurred(), logs.String) Expect(logs.String()).To(ContainSubstring("Installing OpenJDK (8.")) - Expect(logs.String()).To(ContainSubstring("Tomcat 9")) + Expect(logs.String()).To(ContainSubstring("Installed Tomcat (9.")) Eventually(deployment).Should(matchers.Serve(ContainSubstring("OK"))) }) @@ -185,7 +185,7 @@ func testTomcat(platform switchblade.Platform, fixtures string) func(*testing.T, Expect(err).NotTo(HaveOccurred(), logs.String) Expect(logs.String()).To(ContainSubstring("Installing OpenJDK (11.")) - Expect(logs.String()).To(ContainSubstring("Tomcat 9")) + Expect(logs.String()).To(ContainSubstring("Installed Tomcat (9.")) Eventually(deployment).Should(matchers.Serve(ContainSubstring("OK"))) }) @@ -198,7 +198,7 @@ func testTomcat(platform switchblade.Platform, fixtures string) func(*testing.T, Expect(err).NotTo(HaveOccurred(), logs.String) Expect(logs.String()).To(ContainSubstring("Installing OpenJDK (17.")) - Expect(logs.String()).To(ContainSubstring("Tomcat 9")) + Expect(logs.String()).To(ContainSubstring("Installed Tomcat (9.")) Eventually(deployment).Should(matchers.Serve(ContainSubstring("OK"))) }) @@ -224,7 +224,7 @@ func testTomcat(platform switchblade.Platform, fixtures string) func(*testing.T, Expect(err).NotTo(HaveOccurred(), logs.String) Expect(logs.String()).To(ContainSubstring("Installing OpenJDK (11.")) - Expect(logs.String()).To(ContainSubstring("Tomcat 10")) + Expect(logs.String()).To(ContainSubstring("Installed Tomcat (10.")) Eventually(deployment).Should(matchers.Serve(ContainSubstring("OK"))) }) @@ -237,7 +237,7 @@ func testTomcat(platform switchblade.Platform, fixtures string) func(*testing.T, Expect(err).NotTo(HaveOccurred(), logs.String) Expect(logs.String()).To(ContainSubstring("Installing OpenJDK (17.")) - Expect(logs.String()).To(ContainSubstring("Tomcat 10")) + Expect(logs.String()).To(ContainSubstring("Installed Tomcat (10.")) Eventually(deployment).Should(matchers.Serve(ContainSubstring("OK"))) }) }) @@ -258,7 +258,7 @@ func testTomcat(platform switchblade.Platform, fixtures string) func(*testing.T, Expect(err).NotTo(HaveOccurred(), logs.String) Expect(logs.String()).To(ContainSubstring("Installing OpenJDK (17.")) - Expect(logs.String()).To(ContainSubstring("Tomcat 10.1.")) + Expect(logs.String()).To(ContainSubstring("Installed Tomcat (10.1.")) Eventually(deployment).Should(matchers.Serve(ContainSubstring("OK"))) }) })