@@ -287,6 +287,19 @@ public void testAnonymousRouteRequest_fooMappedServlet_publicViewPathOutsideServ
287287 Assert .assertFalse (requestUtil .isAnonymousRoute (request ));
288288 }
289289
290+ @ Test
291+ public void testRouteRequest_servletNotInited () {
292+ Mockito .when (vaadinConfigurationProperties .getUrlMapping ())
293+ .thenReturn ("/*" );
294+ setupMockServlet (false );
295+ MockHttpServletRequest request = createRequest (null );
296+ request .setServletPath ("/" );
297+ Assert .assertFalse (requestUtil .isAnonymousRoute (request ));
298+ request = createRequest ("other" );
299+ request .setServletPath ("/" );
300+ Assert .assertFalse (requestUtil .isAnonymousRoute (request ));
301+ }
302+
290303 @ Test
291304 public void testApplyUrlMapping_fooMappedServlet_prependMapping () {
292305 Mockito .when (vaadinConfigurationProperties .getUrlMapping ())
@@ -337,6 +350,10 @@ public void testApplyUrlMapping_nullMappedServlet_prependMapping() {
337350 }
338351
339352 private SpringServlet setupMockServlet () {
353+ return setupMockServlet (true );
354+ }
355+
356+ private SpringServlet setupMockServlet (boolean inited ) {
340357 SpringServlet servlet = Mockito .mock (SpringServlet .class );
341358 SpringVaadinServletService service = Mockito
342359 .mock (SpringVaadinServletService .class );
@@ -345,7 +362,9 @@ private SpringServlet setupMockServlet() {
345362
346363 Mockito .when (springServletRegistration .getServlet ())
347364 .thenReturn (servlet );
348- Mockito .when (servlet .getService ()).thenReturn (service );
365+ if (inited ) {
366+ Mockito .when (servlet .getService ()).thenReturn (service );
367+ }
349368 Mockito .when (service .getRouter ()).thenReturn (router );
350369 Mockito .when (router .getRegistry ()).thenReturn (routeRegistry );
351370 return servlet ;
0 commit comments