apply code review suggestions

vaadin · Dec 13, 2020 · e137f3c · e137f3c
1 parent a465c1a
commit e137f3c
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 33 deletions.
diff --git a/flow-server/src/test/java/com/vaadin/flow/server/startup/DevModeInitializerTest.java b/flow-server/src/test/java/com/vaadin/flow/server/startup/DevModeInitializerTest.java
@@ -300,54 +300,93 @@ public void shouldUseFullPathScannerByDefault() throws Exception {
     @Test
     public void should_generateOpenApi_when_EndpointPresents()
             throws Exception {
+        String originalJavaSourceFolder = null;
+        try {
+            originalJavaSourceFolder = System.getProperty("vaadin." 
+                + CONNECT_JAVA_SOURCE_FOLDER_TOKEN);
 
-        // Configure a folder to check the endpoints, doesn't matter
-        // which folder, since the actual task won't be run, just
-        // to verify the mocked task is executed.
-        File src = new File(
-                getClass().getClassLoader().getResource("com").getFile());
-        System.setProperty("vaadin." + CONNECT_JAVA_SOURCE_FOLDER_TOKEN,
-                src.getAbsolutePath());
+            // Configure a folder to check the endpoints, doesn't matter
+            // which folder, since the actual task won't be run, just
+            // to verify the mocked task is executed.
+            System.setProperty("vaadin." + CONNECT_JAVA_SOURCE_FOLDER_TOKEN,
+                javaSourceFolder.getRoot().getAbsolutePath());
 
-        File generatedOpenApiJson = Paths
-                .get(baseDir, DEFAULT_CONNECT_OPENAPI_JSON_FILE).toFile();
+            File generatedOpenApiJson = Paths
+                    .get(baseDir, DEFAULT_CONNECT_OPENAPI_JSON_FILE).toFile();
+
+            Assert.assertFalse(generatedOpenApiJson.exists());
+            DevModeInitializer devModeInitializer = new DevModeInitializer();
+            devModeInitializer.onStartup(classes, servletContext);
+            waitForDevModeServer();
+
+            Mockito.verify(taskGenerateConnect, times(1)).execute();
+        } finally {
+            if (originalJavaSourceFolder != null) {
+                System.setProperty("vaadin." 
+                    + CONNECT_JAVA_SOURCE_FOLDER_TOKEN, originalJavaSourceFolder);
+            } else {
+                System.clearProperty("vaadin." 
+                    + CONNECT_JAVA_SOURCE_FOLDER_TOKEN);
+            }
+        }
 
-        Assert.assertFalse(generatedOpenApiJson.exists());
-        DevModeInitializer devModeInitializer = new DevModeInitializer();
-        devModeInitializer.onStartup(classes, servletContext);
-        waitForDevModeServer();
-
-        Mockito.verify(taskGenerateConnect, times(1)).execute();
     }
 
     @Test
     public void should_notGenerateOpenApi_when_EndpointIsNotUsed()
             throws Exception {
-        File generatedOpenApiJson = Paths
-                .get(baseDir, DEFAULT_CONNECT_OPENAPI_JSON_FILE).toFile();
-        Assert.assertFalse(generatedOpenApiJson.exists());
-        devModeInitializer.onStartup(classes, servletContext);
-
-        Mockito.verify(taskGenerateConnect, times(0)).execute();
+        String originalJavaSourceFolder = null;
+        try {
+            originalJavaSourceFolder = System.getProperty("vaadin." 
+                + CONNECT_JAVA_SOURCE_FOLDER_TOKEN);
+            System.clearProperty("vaadin." 
+                + CONNECT_JAVA_SOURCE_FOLDER_TOKEN);
+
+            File generatedOpenApiJson = Paths
+                    .get(baseDir, DEFAULT_CONNECT_OPENAPI_JSON_FILE).toFile();
+            Assert.assertFalse(generatedOpenApiJson.exists());
+            devModeInitializer.onStartup(classes, servletContext);
+
+            Mockito.verify(taskGenerateConnect, times(0)).execute();
+        } finally {
+            if (originalJavaSourceFolder != null) {
+                System.setProperty("vaadin." 
+                    + CONNECT_JAVA_SOURCE_FOLDER_TOKEN, originalJavaSourceFolder);
+            } else {
+                System.clearProperty("vaadin." 
+                    + CONNECT_JAVA_SOURCE_FOLDER_TOKEN);
+            }
+        }
     }
 
     @Test
     public void should_generateTs_files() throws Exception {
+        String originalJavaSourceFolder = null;
+        try {
+            originalJavaSourceFolder = System.getProperty("vaadin." 
+                + CONNECT_JAVA_SOURCE_FOLDER_TOKEN);
 
-        // Configure a folder to check the endpoints, doesn't matter
-        // which folder, since the actual task won't be run, just
-        // to verify the mocked task is executed.
-        File src = new File(
-                getClass().getClassLoader().getResource("com").getFile());
-        System.setProperty("vaadin." + CONNECT_JAVA_SOURCE_FOLDER_TOKEN,
-                src.getAbsolutePath());
+            // Configure a folder to check the endpoints, doesn't matter
+            // which folder, since the actual task won't be run, just
+            // to verify the mocked task is executed.
+            System.setProperty("vaadin." + CONNECT_JAVA_SOURCE_FOLDER_TOKEN,
+                javaSourceFolder.getRoot().getAbsolutePath());
 
-        DevModeInitializer devModeInitializer = new DevModeInitializer();
+            DevModeInitializer devModeInitializer = new DevModeInitializer();
 
-        devModeInitializer.onStartup(classes, servletContext);
-        waitForDevModeServer();
+            devModeInitializer.onStartup(classes, servletContext);
+            waitForDevModeServer();
 
-        Mockito.verify(taskGenerateConnect, times(1)).execute();
+            Mockito.verify(taskGenerateConnect, times(1)).execute();
+        } finally {
+            if (originalJavaSourceFolder != null) {
+                System.setProperty("vaadin." 
+                    + CONNECT_JAVA_SOURCE_FOLDER_TOKEN, originalJavaSourceFolder);
+            } else {
+                System.clearProperty("vaadin." 
+                    + CONNECT_JAVA_SOURCE_FOLDER_TOKEN);
+            }
+        }
     }
 
     @Test

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
@@ -21,6 +21,7 @@
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.rules.TemporaryFolder;
 import org.mockito.Mockito;
 
@@ -65,13 +66,16 @@ public class DevModeInitializerTestBase {
     File mainPackageFile;
     File webpackFile;
     String baseDir;
-    Lookup lookup = Mockito.mock(Lookup.class);;
+    Lookup lookup;
     EndpointGeneratorTaskFactory endpointGeneratorTaskFactory;
     TaskGenerateConnect taskGenerateConnect;
     TaskGenerateOpenApi taskGenerateOpenApi;
 
     public final TemporaryFolder temporaryFolder = new TemporaryFolder();
 
+    @Rule
+    public final TemporaryFolder javaSourceFolder = new TemporaryFolder();
+
     public static class VaadinServletSubClass extends VaadinServlet {
 
     }
@@ -92,6 +96,7 @@ public void setup() throws Exception {
         ServletRegistration vaadinServletRegistration = Mockito
                 .mock(ServletRegistration.class);
 
+        lookup = Mockito.mock(Lookup.class);;
         Mockito.when(servletContext.getAttribute(Lookup.class.getName()))
                 .thenReturn(lookup);
         endpointGeneratorTaskFactory = Mockito.mock(EndpointGeneratorTaskFactory.class);
@@ -187,6 +192,7 @@ public void teardown() throws Exception, SecurityException {
         webpackFile.delete();
         mainPackageFile.delete();
         temporaryFolder.delete();
+        javaSourceFolder.delete();
         if (getDevModeHandler() != null) {
             getDevModeHandler().stop();
         }