Skip to content

Commit ef6af9c

Browse files
committed
fix(tests): correct Tomcat version assertion strings
Commit 90abbc2 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.
1 parent 600f755 commit ef6af9c

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

src/integration/tomcat_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ func testTomcat(platform switchblade.Platform, fixtures string) func(*testing.T,
171171
Expect(err).NotTo(HaveOccurred(), logs.String)
172172

173173
Expect(logs.String()).To(ContainSubstring("Installing OpenJDK (8."))
174-
Expect(logs.String()).To(ContainSubstring("Tomcat 9"))
174+
Expect(logs.String()).To(ContainSubstring("Installed Tomcat (9."))
175175
Eventually(deployment).Should(matchers.Serve(ContainSubstring("OK")))
176176
})
177177

@@ -185,7 +185,7 @@ func testTomcat(platform switchblade.Platform, fixtures string) func(*testing.T,
185185
Expect(err).NotTo(HaveOccurred(), logs.String)
186186

187187
Expect(logs.String()).To(ContainSubstring("Installing OpenJDK (11."))
188-
Expect(logs.String()).To(ContainSubstring("Tomcat 9"))
188+
Expect(logs.String()).To(ContainSubstring("Installed Tomcat (9."))
189189
Eventually(deployment).Should(matchers.Serve(ContainSubstring("OK")))
190190
})
191191

@@ -198,7 +198,7 @@ func testTomcat(platform switchblade.Platform, fixtures string) func(*testing.T,
198198
Expect(err).NotTo(HaveOccurred(), logs.String)
199199

200200
Expect(logs.String()).To(ContainSubstring("Installing OpenJDK (17."))
201-
Expect(logs.String()).To(ContainSubstring("Tomcat 9"))
201+
Expect(logs.String()).To(ContainSubstring("Installed Tomcat (9."))
202202
Eventually(deployment).Should(matchers.Serve(ContainSubstring("OK")))
203203
})
204204

@@ -224,7 +224,7 @@ func testTomcat(platform switchblade.Platform, fixtures string) func(*testing.T,
224224
Expect(err).NotTo(HaveOccurred(), logs.String)
225225

226226
Expect(logs.String()).To(ContainSubstring("Installing OpenJDK (11."))
227-
Expect(logs.String()).To(ContainSubstring("Tomcat 10"))
227+
Expect(logs.String()).To(ContainSubstring("Installed Tomcat (10."))
228228
Eventually(deployment).Should(matchers.Serve(ContainSubstring("OK")))
229229
})
230230

@@ -237,7 +237,7 @@ func testTomcat(platform switchblade.Platform, fixtures string) func(*testing.T,
237237
Expect(err).NotTo(HaveOccurred(), logs.String)
238238

239239
Expect(logs.String()).To(ContainSubstring("Installing OpenJDK (17."))
240-
Expect(logs.String()).To(ContainSubstring("Tomcat 10"))
240+
Expect(logs.String()).To(ContainSubstring("Installed Tomcat (10."))
241241
Eventually(deployment).Should(matchers.Serve(ContainSubstring("OK")))
242242
})
243243
})
@@ -258,7 +258,7 @@ func testTomcat(platform switchblade.Platform, fixtures string) func(*testing.T,
258258
Expect(err).NotTo(HaveOccurred(), logs.String)
259259

260260
Expect(logs.String()).To(ContainSubstring("Installing OpenJDK (17."))
261-
Expect(logs.String()).To(ContainSubstring("Tomcat 10.1."))
261+
Expect(logs.String()).To(ContainSubstring("Installed Tomcat (10.1."))
262262
Eventually(deployment).Should(matchers.Serve(ContainSubstring("OK")))
263263
})
264264
})

0 commit comments

Comments
 (0)