22
33import java .util .Collections ;
44import java .util .HashSet ;
5+ import java .util .Optional ;
56import java .util .Set ;
67
78import javax .servlet .http .HttpServletRequest ;
@@ -107,7 +108,7 @@ public void isFrameworkInternalRequest_noType() {
107108
108109 @ Test
109110 public void isFrameworkInternalRequest_validType_withPath () {
110- HttpServletRequest request = createRequest ("/ hello" , RequestType .INIT );
111+ HttpServletRequest request = createRequest ("hello" , RequestType .INIT );
111112
112113 Assert .assertFalse (
113114 HandlerHelper .isFrameworkInternalRequest ("/" , request ));
@@ -119,17 +120,19 @@ public void isFrameworkInternalRequest_validType_withPath() {
119120 HandlerHelper .isFrameworkInternalRequest ("/foo/*" , request ));
120121 Assert .assertTrue (
121122 HandlerHelper .isFrameworkInternalRequest ("/hello" , request ));
122- Assert .assertTrue (
123+ Assert .assertFalse (
123124 HandlerHelper .isFrameworkInternalRequest ("/hello/*" , request ));
124125 }
125126
126127 @ Test
127128 public void isFrameworkInternalRequest_validType_withServletMappingAndPath () {
128- HttpServletRequest request = createRequest ("/ " , RequestType .INIT );
129+ HttpServletRequest request = createRequest ("" , RequestType .INIT );
129130 Mockito .when (request .getServletPath ()).thenReturn ("/servlet" );
130131
131132 Assert .assertFalse (
132133 HandlerHelper .isFrameworkInternalRequest ("/" , request ));
134+ Assert .assertFalse (
135+ HandlerHelper .isFrameworkInternalRequest ("" , request ));
133136 Assert .assertTrue (
134137 HandlerHelper .isFrameworkInternalRequest ("/servlet" , request ));
135138 }
@@ -194,11 +197,89 @@ public void isFrameworkInternalRequest_vaadinRequest_nonRootServlet_pathInsideSe
194197 BootstrapHandler .isFrameworkInternalRequest (request ));
195198 }
196199
200+ @ Test
201+ public void getPathIfInsideServlet_default_servlet () {
202+ String servletMapping = "/*" ;
203+ Assert .assertEquals (Optional .of ("" ),
204+ HandlerHelper .getPathIfInsideServlet (servletMapping , "" ));
205+ Assert .assertEquals (Optional .of ("/" ),
206+ HandlerHelper .getPathIfInsideServlet (servletMapping , "/" ));
207+ Assert .assertEquals (Optional .of ("foo" ),
208+ HandlerHelper .getPathIfInsideServlet (servletMapping , "foo" ));
209+ Assert .assertEquals (Optional .of ("/foo" ),
210+ HandlerHelper .getPathIfInsideServlet (servletMapping , "/foo" ));
211+ }
212+
213+ @ Test
214+ public void getPathIfInsideServlet_root_only_servlet () {
215+ String servletMapping = "" ;
216+ Assert .assertEquals (Optional .of ("" ),
217+ HandlerHelper .getPathIfInsideServlet (servletMapping , "" ));
218+ Assert .assertEquals (Optional .empty (),
219+ HandlerHelper .getPathIfInsideServlet (servletMapping , "/" ));
220+ Assert .assertEquals (Optional .empty (),
221+ HandlerHelper .getPathIfInsideServlet (servletMapping , "foo" ));
222+ Assert .assertEquals (Optional .empty (),
223+ HandlerHelper .getPathIfInsideServlet (servletMapping , "/foo" ));
224+ }
225+
226+ @ Test
227+ public void getPathIfInsideServlet_all_urls_servlet () {
228+ String servletMapping = "/" ;
229+ Assert .assertEquals (Optional .of ("" ),
230+ HandlerHelper .getPathIfInsideServlet (servletMapping , "" ));
231+ Assert .assertEquals (Optional .of ("/" ),
232+ HandlerHelper .getPathIfInsideServlet (servletMapping , "/" ));
233+ Assert .assertEquals (Optional .of ("foo" ),
234+ HandlerHelper .getPathIfInsideServlet (servletMapping , "foo" ));
235+ Assert .assertEquals (Optional .of ("/foo" ),
236+ HandlerHelper .getPathIfInsideServlet (servletMapping , "/foo" ));
237+ }
238+
239+ @ Test
240+ public void getPathIfInsideServlet_sevlet_using_single_path () {
241+ String servletMapping = "/foo" ;
242+ Assert .assertEquals (Optional .empty (),
243+ HandlerHelper .getPathIfInsideServlet (servletMapping , "" ));
244+ Assert .assertEquals (Optional .empty (),
245+ HandlerHelper .getPathIfInsideServlet (servletMapping , "bar" ));
246+ Assert .assertEquals (Optional .empty (),
247+ HandlerHelper .getPathIfInsideServlet (servletMapping , "/bar" ));
248+ Assert .assertEquals (Optional .of ("" ),
249+ HandlerHelper .getPathIfInsideServlet (servletMapping , "foo" ));
250+ Assert .assertEquals (Optional .empty (),
251+ HandlerHelper .getPathIfInsideServlet (servletMapping , "foo/" ));
252+ Assert .assertEquals (Optional .empty (), HandlerHelper
253+ .getPathIfInsideServlet (servletMapping , "foo/bar" ));
254+ }
255+
256+ @ Test
257+ public void getPathIfInsideServlet_sevlet_with_context_path () {
258+ String servletMapping = "/foo/*" ;
259+ Assert .assertEquals (Optional .empty (),
260+ HandlerHelper .getPathIfInsideServlet (servletMapping , "" ));
261+ Assert .assertEquals (Optional .empty (),
262+ HandlerHelper .getPathIfInsideServlet (servletMapping , "bar" ));
263+ Assert .assertEquals (Optional .empty (),
264+ HandlerHelper .getPathIfInsideServlet (servletMapping , "/bar" ));
265+ Assert .assertEquals (Optional .empty (),
266+ HandlerHelper .getPathIfInsideServlet (servletMapping , "/foo" ));
267+ Assert .assertEquals (Optional .empty (),
268+ HandlerHelper .getPathIfInsideServlet (servletMapping , "/foos" ));
269+ Assert .assertEquals (Optional .empty (), HandlerHelper
270+ .getPathIfInsideServlet (servletMapping , "/foos/bar" ));
271+ Assert .assertEquals (Optional .of ("" ),
272+ HandlerHelper .getPathIfInsideServlet (servletMapping , "/foo/" ));
273+ Assert .assertEquals (Optional .of ("bar" ), HandlerHelper
274+ .getPathIfInsideServlet (servletMapping , "/foo/bar" ));
275+ }
276+
197277 private VaadinRequest createVaadinRequest (String requestPath ,
198278 String servletPath , RequestType type ) {
199279 HttpServletRequest servletRequest = createRequest (requestPath , type );
200280 if (servletPath .equals ("/*" )) {
201- // This is what the spec says HttpServletRequest#getServletPath
281+ // This is what the spec says
282+ // HttpServletRequest#getServletPath
202283 servletPath = "" ;
203284 }
204285 Mockito .when (servletRequest .getServletPath ()).thenReturn (servletPath );
0 commit comments