test: Use 'urlmapping' instead of 'vaadin' for clarity (#13800)

Also reduce log spam from serialization errors
vaadin · May 19, 2022 · 9c57186 · 9c57186
1 parent 358ae99
commit 9c57186
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 16 deletions.
diff --git a/...ing-tests/test-spring-security-flow-contextpath/src/main/resources/application.properties b/...ing-tests/test-spring-security-flow-contextpath/src/main/resources/application.properties
@@ -1,4 +1,4 @@
 server.port=8888
 logging.level.org.springframework.security=DEBUG
 server.servlet.context-path=/context
-
+server.servlet.session.persistent=false
diff --git a/...w-urlmapping/src/main/java/com/vaadin/flow/spring/flowsecurityurlmapping/Application.java b/...w-urlmapping/src/main/java/com/vaadin/flow/spring/flowsecurityurlmapping/Application.java
@@ -18,6 +18,8 @@
 public class Application
         extends com.vaadin.flow.spring.flowsecurity.Application {
 
+    protected static final String URL_MAPPING = "/urlmapping";
+
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }
@@ -38,13 +40,13 @@ protected void doFilterInternal(HttpServletRequest request,
                             HttpServletResponse response,
                             FilterChain filterChain)
                             throws ServletException, IOException {
-                        request.getRequestDispatcher(
-                                request.getRequestURI().substring(7))
+                        request.getRequestDispatcher(request.getRequestURI()
+                                .substring(URL_MAPPING.length()))
                                 .forward(request, response);
                     }
                 });
-        registrationBean.addUrlPatterns("/vaadin/public/images/*",
-                "/vaadin/public/profiles/*");
+        registrationBean.addUrlPatterns(URL_MAPPING + "/public/images/*",
+                URL_MAPPING + "/public/profiles/*");
         registrationBean.setOrder(Ordered.HIGHEST_PRECEDENCE);
         return registrationBean;
     }

diff --git a/...ring-tests/test-spring-security-flow-urlmapping/src/main/resources/application.properties b/...ring-tests/test-spring-security-flow-urlmapping/src/main/resources/application.properties
@@ -1,4 +1,4 @@
 server.port=8888
 logging.level.org.springframework.security=DEBUG
-vaadin.urlMapping=/vaadin/*
-
+vaadin.urlMapping=/urlmapping/*
+server.servlet.session.persistent=false
diff --git a/...low-urlmapping/src/test/java/com/vaadin/flow/spring/flowsecurityurlmapping/AppViewIT.java b/...low-urlmapping/src/test/java/com/vaadin/flow/spring/flowsecurityurlmapping/AppViewIT.java
@@ -3,6 +3,6 @@
 public class AppViewIT extends com.vaadin.flow.spring.flowsecurity.AppViewIT {
     @Override
     protected String getUrlMappingBasePath() {
-        return "/vaadin";
+        return "/urlmapping";
     }
 }
diff --git a/...s/vaadin-spring-tests/test-spring-security-flow/src/main/resources/application.properties b/...s/vaadin-spring-tests/test-spring-security-flow/src/main/resources/application.properties
@@ -1,3 +1,3 @@
 server.port=8888
 logging.level.org.springframework.security=DEBUG
-
+server.servlet.session.persistent=false
diff --git a/...g-tests/test-spring-security-fusion-contextpath/src/main/resources/application.properties b/...g-tests/test-spring-security-fusion-contextpath/src/main/resources/application.properties
@@ -3,3 +3,4 @@ logging.level.org.springframework.security=DEBUG
 logging.level.com.vaadin.flow.server.connect.auth=DEBUG
 logging.level.com.vaadin.flow.server.auth=DEBUG
 server.servlet.context-path = /context
+server.servlet.session.persistent=false
diff --git a/...urlmapping/src/main/java/com/vaadin/flow/spring/fusionsecurityurlmapping/Application.java b/...urlmapping/src/main/java/com/vaadin/flow/spring/fusionsecurityurlmapping/Application.java
@@ -17,6 +17,8 @@
 public class Application
         extends com.vaadin.flow.spring.fusionsecurity.Application {
 
+    protected static final String URL_MAPPING = "/urlmapping";
+
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }
@@ -37,15 +39,14 @@ protected void doFilterInternal(HttpServletRequest request,
                             HttpServletResponse response,
                             FilterChain filterChain)
                             throws ServletException, IOException {
-                        request.getRequestDispatcher(
-                                request.getRequestURI().substring(7))
+                        request.getRequestDispatcher(request.getRequestURI()
+                                .substring(URL_MAPPING.length()))
                                 .forward(request, response);
                     }
                 });
-        registrationBean.addUrlPatterns("/vaadin/public/images/*",
-                "/vaadin/public/profiles/*");
+        registrationBean.addUrlPatterns(URL_MAPPING + "/public/images/*",
+                URL_MAPPING + "/public/profiles/*");
         registrationBean.setOrder(Ordered.HIGHEST_PRECEDENCE);
         return registrationBean;
     }
-
 }
diff --git a/...ng-tests/test-spring-security-fusion-urlmapping/src/main/resources/application.properties b/...ng-tests/test-spring-security-fusion-urlmapping/src/main/resources/application.properties
@@ -2,4 +2,5 @@ server.port=9999
 logging.level.org.springframework.security=DEBUG
 logging.level.com.vaadin.flow.server.connect.auth=DEBUG
 logging.level.com.vaadin.flow.server.auth=DEBUG
-vaadin.urlMapping = /vaadin/*
+vaadin.urlMapping = /urlmapping/*
+server.servlet.session.persistent=false
diff --git a/...urlmapping/src/test/java/com/vaadin/flow/spring/fusionsecuritycontextpath/SecurityIT.java b/...urlmapping/src/test/java/com/vaadin/flow/spring/fusionsecuritycontextpath/SecurityIT.java
@@ -5,7 +5,7 @@ public class SecurityIT
 
     @Override
     protected String getUrlMappingBasePath() {
-        return "/vaadin";
+        return "/urlmapping";
     }
 
 }
diff --git a/...vaadin-spring-tests/test-spring-security-fusion/src/main/resources/application.properties b/...vaadin-spring-tests/test-spring-security-fusion/src/main/resources/application.properties
@@ -2,3 +2,4 @@ server.port=9999
 logging.level.org.springframework.security=DEBUG
 logging.level.com.vaadin.flow.server.connect.auth=DEBUG
 logging.level.com.vaadin.flow.server.auth=DEBUG
+server.servlet.session.persistent=false