fix: fix failing unit test after refactoring (#714)

vaadin · Jan 14, 2021 · 862b851 · 862b851
1 parent 071bd3b
commit 862b851
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/vaadin-spring/src/test/java/com/vaadin/flow/spring/VaadinServletContextInitializerTest.java b/vaadin-spring/src/test/java/com/vaadin/flow/spring/VaadinServletContextInitializerTest.java
@@ -7,6 +7,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Stream;
@@ -15,7 +16,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
@@ -29,13 +29,13 @@
 import org.springframework.core.env.Environment;
 
 import com.vaadin.flow.component.Component;
-import com.vaadin.flow.di.Lookup;
 import com.vaadin.flow.function.DeploymentConfiguration;
 import com.vaadin.flow.router.BeforeEnterEvent;
 import com.vaadin.flow.router.ErrorParameter;
 import com.vaadin.flow.router.HasErrorParameter;
 import com.vaadin.flow.router.NotFoundException;
 import com.vaadin.flow.router.RouteNotFoundError;
+import com.vaadin.flow.server.VaadinContext;
 import com.vaadin.flow.server.VaadinServletContext;
 import com.vaadin.flow.server.startup.ApplicationConfiguration;
 import com.vaadin.flow.server.startup.ApplicationRouteRegistry;
@@ -83,8 +83,6 @@ public void onStartup_devModeNotInitialized_devModeInitialized()
 
         VaadinServletContextInitializer vaadinServletContextInitializer = getStubbedVaadinServletContextInitializer();
 
-        ArgumentCaptor<Lookup> capture = ArgumentCaptor.forClass(Lookup.class);
-
         // Simulate Spring context start only
         vaadinServletContextInitializer.onStartup(servletContext);
 
@@ -95,9 +93,10 @@ public void onStartup_devModeNotInitialized_devModeInitialized()
             // onStartup() call,
             // that means DevModeInitializer.initDevModeHandler() should has
             // been called exactly one time
-            DevModeInitializer.initDevModeHandler(Mockito.any(), Mockito.any());
-            theMock.verify(() -> DevModeInitializer
-                    .initDevModeHandler(Mockito.any(), Mockito.any()));
+            DevModeInitializer.initDevModeHandler(Mockito.mock(Set.class),
+                    Mockito.mock(VaadinContext.class));
+            theMock.verify(() -> DevModeInitializer.initDevModeHandler(
+                    Mockito.any(), Mockito.any(VaadinContext.class)));
             theMock.verifyNoMoreInteractions();
         }
 
@@ -123,9 +122,10 @@ public void onStartup_devModeAlreadyInitialized_devModeInitializationSkipped()
             // onStartup() call,
             // that means DevModeInitializer.initDevModeHandler() should has
             // been called exactly one time
-            DevModeInitializer.initDevModeHandler(Mockito.any(), Mockito.any());
-            theMock.verify(() -> DevModeInitializer
-                    .initDevModeHandler(Mockito.any(), Mockito.any()));
+            DevModeInitializer.initDevModeHandler(Mockito.mock(Set.class),
+                    Mockito.mock(VaadinContext.class));
+            theMock.verify(() -> DevModeInitializer.initDevModeHandler(
+                    Mockito.any(), Mockito.any(VaadinContext.class)));
             theMock.verifyNoMoreInteractions();
         }
     }