chore: fix flaky tests that depends on mock count

vaadin · Dec 10, 2020 · a465c1a · a465c1a
1 parent 7bb6181
commit a465c1a
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/flow-server/src/test/java/com/vaadin/flow/server/startup/DevModeInitializerTestBase.java b/flow-server/src/test/java/com/vaadin/flow/server/startup/DevModeInitializerTestBase.java
@@ -66,9 +66,9 @@ public class DevModeInitializerTestBase {
     File webpackFile;
     String baseDir;
     Lookup lookup = Mockito.mock(Lookup.class);;
-    EndpointGeneratorTaskFactory endpointGeneratorTaskFactory = Mockito.mock(EndpointGeneratorTaskFactory.class);
-    TaskGenerateConnect taskGenerateConnect = Mockito.mock(TaskGenerateConnect.class);
-    TaskGenerateOpenApi taskGenerateOpenApi = Mockito.mock(TaskGenerateOpenApi.class);
+    EndpointGeneratorTaskFactory endpointGeneratorTaskFactory;
+    TaskGenerateConnect taskGenerateConnect;
+    TaskGenerateOpenApi taskGenerateOpenApi;
 
     public final TemporaryFolder temporaryFolder = new TemporaryFolder();
 
@@ -94,6 +94,9 @@ public void setup() throws Exception {
 
         Mockito.when(servletContext.getAttribute(Lookup.class.getName()))
                 .thenReturn(lookup);
+        endpointGeneratorTaskFactory = Mockito.mock(EndpointGeneratorTaskFactory.class);
+        taskGenerateConnect = Mockito.mock(TaskGenerateConnect.class);
+        taskGenerateOpenApi = Mockito.mock(TaskGenerateOpenApi.class);
         Mockito.doReturn(endpointGeneratorTaskFactory).when(lookup)
                 .lookup(EndpointGeneratorTaskFactory.class);
         Mockito.doReturn(taskGenerateConnect).when(endpointGeneratorTaskFactory)