From a465c1a00f2d65af64b8845a5eb3672dbc21e1fd Mon Sep 17 00:00:00 2001 From: haijian Date: Thu, 10 Dec 2020 23:53:37 +0200 Subject: [PATCH] chore: fix flaky tests that depends on mock count --- .../flow/server/startup/DevModeInitializerTestBase.java | 9 ++++++--- 1 file changed, 6 insertions(+), 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 index d9a0c55398a..fba08cee562 100644 --- 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)