Skip to content

fix(tests): correct SapMachine and Tomcat version assertion strings #1315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ramonskie merged 2 commits into from
Jun 10, 2026
Merged

fix(tests): correct SapMachine and Tomcat version assertion strings #1315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
600f755
fix(tests): correct SapMachine log assertion strings
stokpop Jun 10, 2026
ef6af9c
fix(tests): correct Tomcat version assertion strings
stokpop Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/integration/java_main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."))
})
})
Expand Down
18 changes: 9 additions & 9 deletions src/integration/tomcat_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")))
})

Expand All @@ -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")))
})

Expand All @@ -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")))
})

Expand All @@ -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")))
})

Expand All @@ -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")))
})
})
Expand All @@ -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")))
})
})
Expand Down Expand Up @@ -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")))
})

Expand All @@ -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")))
})

Expand All @@ -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")))
})
})
Expand Down