Adjusted tests to use ${request.contextPath}

chkal · chkal · commit 9e7542c2dc1d · 2018-06-06T10:09:31.000+02:00
diff --git a/test/annotations/src/main/webapp/WEB-INF/views/error.jsp b/test/annotations/src/main/webapp/WEB-INF/views/error.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>Error</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
     <h1>Error</h1>
diff --git a/test/annotations/src/main/webapp/WEB-INF/views/success.jsp b/test/annotations/src/main/webapp/WEB-INF/views/success.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>Success</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
     <h1>Success</h1>
diff --git a/test/book-cdi/src/main/webapp/WEB-INF/views/book.jsp b/test/book-cdi/src/main/webapp/WEB-INF/views/book.jsp
@@ -3,7 +3,7 @@
 <html>
     <head>
         <title>Book Information</title>
-        <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css">
+        <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css">
     </head>
     <body>
     <h1>Book Information</h1>
diff --git a/test/book-models/src/main/webapp/WEB-INF/views/book.jsp b/test/book-models/src/main/webapp/WEB-INF/views/book.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>Book Information</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
 <h1>Book Information</h1>
diff --git a/test/conversation/src/main/webapp/WEB-INF/views/start.jsp b/test/conversation/src/main/webapp/WEB-INF/views/start.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>Starting Conversation</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
     <h1>Starting Conversation</h1>
diff --git a/test/conversation/src/main/webapp/WEB-INF/views/stop.jsp b/test/conversation/src/main/webapp/WEB-INF/views/stop.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>Stopping Conversation</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
     <h1>Stopping Conversation</h1>
diff --git a/test/conversation/src/main/webapp/WEB-INF/views/tellme.jsp b/test/conversation/src/main/webapp/WEB-INF/views/tellme.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>In Conversation</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
     <h1>In Conversation</h1>
diff --git a/test/csrf-property/src/main/webapp/WEB-INF/views/csrf.jsp b/test/csrf-property/src/main/webapp/WEB-INF/views/csrf.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>CSRF Protection Test</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
     <h1>CSRF Protection Test</h1>
diff --git a/test/csrf-property/src/main/webapp/WEB-INF/views/error.jsp b/test/csrf-property/src/main/webapp/WEB-INF/views/error.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>CSRF Protection Error</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
     <h1>CSRF Protection Failed</h1>
diff --git a/test/csrf-property/src/main/webapp/WEB-INF/views/ok.jsp b/test/csrf-property/src/main/webapp/WEB-INF/views/ok.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>CSRF Protection OK</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
     <h1>CSRF Protection OK</h1>
diff --git a/test/csrf/src/main/webapp/WEB-INF/views/csrf.jsp b/test/csrf/src/main/webapp/WEB-INF/views/csrf.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>CSRF Protection Test</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
     <h1>CSRF Protection Test</h1>
diff --git a/test/csrf/src/main/webapp/WEB-INF/views/ok.jsp b/test/csrf/src/main/webapp/WEB-INF/views/ok.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>CSRF Protection OK</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
     <h1>CSRF Protection OK</h1>
diff --git a/test/events/src/main/webapp/WEB-INF/views/event.jsp b/test/events/src/main/webapp/WEB-INF/views/event.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>MVC Events</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
     <h1>Event Information</h1>
diff --git a/test/exceptions/src/main/webapp/WEB-INF/views/bye.jsp b/test/exceptions/src/main/webapp/WEB-INF/views/bye.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>Bye World</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
 <h1>Bye World</h1>
diff --git a/test/exceptions/src/main/webapp/WEB-INF/views/hello.jsp b/test/exceptions/src/main/webapp/WEB-INF/views/hello.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>Hello World</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
 <h1>Hello World</h1>
diff --git a/test/facelets/src/main/webapp/book.xhtml b/test/facelets/src/main/webapp/book.xhtml
@@ -4,7 +4,7 @@
       xmlns:h="http://xmlns.jcp.org/jsf/html">
     <h:head>
         <title>Book Information</title>
-        <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+        <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
     </h:head>
     <h:body>
         <h1>Book Information</h1>
diff --git a/test/facelets/src/main/webapp/index.html b/test/facelets/src/main/webapp/index.html
@@ -3,7 +3,7 @@
     <head>
         <title>Book Controllers using Facelets</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+        <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
     </head>
     <body>
         <h1>Book Controllers using Facelets</h1>
diff --git a/test/freemarker/src/main/webapp/WEB-INF/views/hello.ftl b/test/freemarker/src/main/webapp/WEB-INF/views/hello.ftl
@@ -1,7 +1,7 @@
 <html>
     <head>
       <title>Hello There</title>
-        <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+        <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
     </head>
     <body>
       <h1>Hello ${user?html}!</h1>
diff --git a/test/handlebars/src/main/webapp/WEB-INF/views/person.hbs b/test/handlebars/src/main/webapp/WEB-INF/views/person.hbs
@@ -3,7 +3,7 @@
 <head lang="en">
     <meta charset="UTF-8">
     <title>Person View</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
     <h1>Person</h1>
diff --git a/test/jade/src/main/webapp/WEB-INF/views/config.jade b/test/jade/src/main/webapp/WEB-INF/views/config.jade
@@ -2,7 +2,7 @@ doctype html
 html
   head
     title= pageName
-    link(rel='stylesheet', href='#{mvc.contextPath}/ozark.css')
+    link(rel='stylesheet', href='#{request.contextPath}/ozark.css')
   body
     :systemProperties
       SystemProperties
diff --git a/test/jade/src/main/webapp/WEB-INF/views/helper.jade b/test/jade/src/main/webapp/WEB-INF/views/helper.jade
@@ -2,7 +2,7 @@ doctype html
 html
   head
     title= pageName
-    link(rel='stylesheet', href='#{mvc.contextPath}/ozark.css')
+    link(rel='stylesheet', href='#{request.contextPath}/ozark.css')
   body
     h1 Hello Helper
     p.result= math.round(3.14159)
diff --git a/test/jade/src/main/webapp/WEB-INF/views/main.jade b/test/jade/src/main/webapp/WEB-INF/views/main.jade
@@ -2,7 +2,7 @@ doctype html
 html
   head
     title= pageName
-    link(rel='stylesheet', href='#{mvc.contextPath}/ozark.css')
+    link(rel='stylesheet', href='#{request.contextPath}/ozark.css')
   body
     h1 Hello #{user}
   include includes/footer.jade
diff --git a/test/jade/src/main/webapp/WEB-INF/views/markdown.jade b/test/jade/src/main/webapp/WEB-INF/views/markdown.jade
@@ -2,7 +2,7 @@ doctype html
 html
   head
     title= pageName
-    link(rel='stylesheet', href='#{mvc.contextPath}/ozark.css')
+    link(rel='stylesheet', href='#{request.contextPath}/ozark.css')
   body
     :markdown
       # Mardown introduction
diff --git a/test/jetbrick/src/main/webapp/WEB-INF/views/hello.jetx b/test/jetbrick/src/main/webapp/WEB-INF/views/hello.jetx
@@ -3,7 +3,7 @@
 <head lang="en">
     <meta charset="UTF-8">
     <title>Hello</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
     <h1>Hello ${user}!</h1>
diff --git a/test/locale/src/main/webapp/WEB-INF/views/locale.jsp b/test/locale/src/main/webapp/WEB-INF/views/locale.jsp
@@ -2,7 +2,7 @@
 <!doctype html>
 <html>
 <head>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
     <title>Request Locale</title>
 </head>
 <body>
diff --git a/test/mustache/src/main/webapp/WEB-INF/views/hello.mustache b/test/mustache/src/main/webapp/WEB-INF/views/hello.mustache
@@ -1,7 +1,7 @@
 <html>
     <head>
       <title>Hello</title>
-      <link rel="stylesheet" type="text/css" href="{{mvc.contextPath}}/ozark.css"/>
+      <link rel="stylesheet" type="text/css" href="{{request.contextPath}}/ozark.css"/>
     </head>
     <body>
       <h1>Hello {{user}}!</h1>
diff --git a/test/mvc/src/main/webapp/WEB-INF/views/mvc.jsp b/test/mvc/src/main/webapp/WEB-INF/views/mvc.jsp
@@ -3,12 +3,11 @@
 <html>
 <head>
     <title>Mvc Test</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
     <h1>Mvc Test</h1>
-    <p id="contextPath">${mvc.contextPath}</p>
-    <p id="applicationPath">${mvc.applicationPath}</p>
+    <p id="basePath">${mvc.basePath}</p>
     <p id="csrf">${mvc.csrf.name}</p>
     <p id="encoders">${mvc.encoders.html("<&>")}</p>
     <p id="config">${mvc.config.properties.get("myproperty")}</p>
diff --git a/test/mvc/src/test/java/org/mvcspec/ozark/test/mvc/MvcIT.java b/test/mvc/src/test/java/org/mvcspec/ozark/test/mvc/MvcIT.java
@@ -49,8 +49,7 @@ public void tearDown() {
     @Test
     public void test() throws Exception {
         HtmlPage page = webClient.getPage(webUrl + "resources/mvc");
-        assertEquals("/test-mvc", page.getElementById("contextPath").asText());
-        assertEquals("/resources", page.getElementById("applicationPath").asText());
+        assertEquals("/test-mvc/resources", page.getElementById("basePath").asText());
         assertEquals(CSRF_PARAM, page.getElementById("csrf").asText());
         assertEquals("<&>", page.getElementById("encoders").asText());
         assertEquals("true", page.getElementById("config").asText());
diff --git a/test/produces/src/main/webapp/WEB-INF/views/hello.jsp b/test/produces/src/main/webapp/WEB-INF/views/hello.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>Hello World</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
 <h1>Hello World</h1>
diff --git a/test/redirect/src/main/webapp/WEB-INF/views/error.jsp b/test/redirect/src/main/webapp/WEB-INF/views/error.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>Redirect</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
     <h1>Redirect Event not reported!</h1>
diff --git a/test/redirect/src/main/webapp/WEB-INF/views/redirect.jsp b/test/redirect/src/main/webapp/WEB-INF/views/redirect.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>Redirect</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
     <h1>Redirect Works!</h1>
diff --git a/test/redirectScope/src/main/webapp/WEB-INF/views/redirect.jsp b/test/redirectScope/src/main/webapp/WEB-INF/views/redirect.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>Redirect</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css">
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css">
 </head>
 <body>
     <h1>Redirect Works!</h1>
diff --git a/test/redirectScope2/src/main/webapp/WEB-INF/views/redirect.jsp b/test/redirectScope2/src/main/webapp/WEB-INF/views/redirect.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>Redirect</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css">
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css">
 </head>
 <body>
     <h1>Redirect Works!</h1>
diff --git a/test/returns/src/main/webapp/WEB-INF/views/bye.jsp b/test/returns/src/main/webapp/WEB-INF/views/bye.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>Bye World</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
 <h1>Bye World</h1>
diff --git a/test/returns/src/main/webapp/WEB-INF/views/hello.jsp b/test/returns/src/main/webapp/WEB-INF/views/hello.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>Hello World</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
 <h1>Hello World</h1>
diff --git a/test/thymeleaf/src/main/webapp/WEB-INF/views/hello.html b/test/thymeleaf/src/main/webapp/WEB-INF/views/hello.html
@@ -1,7 +1,7 @@
 <html>
     <head>
       <title>Hello</title>
-      <link rel="stylesheet" type="text/css" th:href="@{~{cp}/ozark.css(cp=${mvc.contextPath})}" />
+      <link rel="stylesheet" type="text/css" th:href="@{~{cp}/ozark.css(cp=${request.contextPath})}" />
     </head>
     <body>
       <h1>Hello <span th:text="${user}"/>!</h1>
diff --git a/test/uri-builder/src/main/webapp/WEB-INF/views/uri-builder.jsp b/test/uri-builder/src/main/webapp/WEB-INF/views/uri-builder.jsp
@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8">
     <title>MvcUriBuilder examples</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
 <div class="container">
diff --git a/test/validation-i18n/src/main/webapp/WEB-INF/views/form.jsp b/test/validation-i18n/src/main/webapp/WEB-INF/views/form.jsp
@@ -3,7 +3,7 @@
 <!doctype html>
 <html>
     <head>
-        <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+        <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
         <title>Validation</title>
     </head>
     <body>
diff --git a/test/validation/src/main/webapp/WEB-INF/views/binderror.jsp b/test/validation/src/main/webapp/WEB-INF/views/binderror.jsp
@@ -2,7 +2,7 @@
 <!doctype html>
 <html>
 <head>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
     <title>Form Binding Error</title>
 </head>
 <body>
diff --git a/test/validation/src/main/webapp/WEB-INF/views/data.jsp b/test/validation/src/main/webapp/WEB-INF/views/data.jsp
@@ -2,7 +2,7 @@
 <!doctype html>
 <html>
 <head>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
     <title>Form Validation</title>
 </head>
 <body>
diff --git a/test/validation/src/main/webapp/WEB-INF/views/error.jsp b/test/validation/src/main/webapp/WEB-INF/views/error.jsp
@@ -2,7 +2,7 @@
 <!doctype html>
 <html>
 <head>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
     <title>Form Validation</title>
 </head>
 <body>
diff --git a/test/velocity/src/main/webapp/WEB-INF/views/hello.vm b/test/velocity/src/main/webapp/WEB-INF/views/hello.vm
@@ -1,7 +1,7 @@
 <html>
     <head>
       <title>Hello</title>
-      <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+      <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
     </head>
     <body>
       <h1>Hello $mvc.encoders.html($user)!</h1>
diff --git a/test/view-annotation/src/main/webapp/WEB-INF/views/bye.jsp b/test/view-annotation/src/main/webapp/WEB-INF/views/bye.jsp
@@ -3,7 +3,7 @@
 <html>
 <head>
     <title>Bye World</title>
-    <link rel="stylesheet" type="text/css" href="${mvc.contextPath}/ozark.css"/>
+    <link rel="stylesheet" type="text/css" href="${request.contextPath}/ozark.css"/>
 </head>
 <body>
 <h1>Bye World</h1>
diff --git a/test/view-annotation/src/main/webapp/WEB-INF/views/hello.jsp b/test/view-annotation/src/main/webapp/WEB-INF/views/hello.jsp
