Fix VaadinBootBaseTest

mvysny · Sep 15, 2024 · 30a2f14 · 30a2f14
1 parent bacd1ff
commit 30a2f14
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/common/src/test/java/com/github/mvysny/vaadinboot/common/VaadinBootBaseTest.java b/common/src/test/java/com/github/mvysny/vaadinboot/common/VaadinBootBaseTest.java
@@ -109,7 +109,7 @@ public void testContextRootParsedCorrectlyFromSystemProperty() {
 
     @Test
     public void testContextRootParsedCorrectlyFromSystemEnv() {
-        env.put("SERVER_SERVLET_CONTEXT-PATH", "/foo");
+        env.put("SERVER_SERVLET_CONTEXT_PATH", "/foo");
         assertEquals("/foo", new VaadinBoot().contextRoot);
         // system property takes precedence
         System.setProperty("server.servlet.context-path", "/bar");
@@ -118,6 +118,18 @@ public void testContextRootParsedCorrectlyFromSystemEnv() {
         assertEquals("", new VaadinBoot().withContextRoot("/").contextRoot);
     }
 
+    @Test
+    public void contextRootPostprocessedCorrectly() {
+        env.put("SERVER_SERVLET_CONTEXT_PATH", "/foo");
+        assertEquals("/foo", new VaadinBoot().contextRoot);
+        env.put("SERVER_SERVLET_CONTEXT_PATH", "/");
+        assertEquals("", new VaadinBoot().contextRoot);
+        env.put("SERVER_SERVLET_CONTEXT_PATH", "foo/bar");
+        assertEquals("/foo/bar", new VaadinBoot().contextRoot);
+        env.put("SERVER_SERVLET_CONTEXT_PATH", "foo/bar/");
+        assertEquals("/foo/bar", new VaadinBoot().contextRoot);
+    }
+
     @Test
     public void failureToStartPropagatedProperly() throws Exception {
         final DummyWebServer.FailsToStart webServer = new DummyWebServer.FailsToStart();