Fix test expectation

Add file for cleanup add test for file creation and generated content
vaadin · Sep 12, 2024 · 2ef97f8 · 2ef97f8
1 parent 2a23488
commit 2ef97f8
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 1 deletion.
diff --git a/flow-server/src/main/java/com/vaadin/flow/server/frontend/TaskGenerateReactFiles.java b/flow-server/src/main/java/com/vaadin/flow/server/frontend/TaskGenerateReactFiles.java
@@ -225,7 +225,9 @@ private void cleanup() throws ExecutionFailedException {
                     FLOW_REACT_ADAPTER_TSX);
             File frontendGeneratedFolderRoutesTsx = new File(
                     frontendGeneratedFolder, FrontendUtils.ROUTES_TSX);
+            File layoutsJson = new File(frontendGeneratedFolder, LAYOUTS_JSON);
             FileUtils.deleteQuietly(flowTsx);
+            FileUtils.deleteQuietly(layoutsJson);
             FileUtils.deleteQuietly(vaadinReactTsx);
             FileUtils.deleteQuietly(reactAdapterTsx);
             FileUtils.deleteQuietly(frontendGeneratedFolderRoutesTsx);

diff --git a/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskGenerateReactFilesTest.java b/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskGenerateReactFilesTest.java
@@ -31,7 +31,9 @@
 
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.Tag;
+import com.vaadin.flow.router.Layout;
 import com.vaadin.flow.router.Route;
+import com.vaadin.flow.router.RouterLayout;
 import com.vaadin.flow.server.ExecutionFailedException;
 import com.vaadin.flow.server.frontend.scanner.ClassFinder;
 import com.vaadin.tests.util.MockOptions;
@@ -82,6 +84,27 @@ public void reactFilesAreWrittenToFrontend()
                         "routes.tsx").exists());
         Assert.assertFalse("Missing ./frontend/routes.tsx",
                 new File(frontend, "routes.tsx").exists());
+        Assert.assertTrue(
+                "Missing ./frontend/" + FrontendUtils.GENERATED
+                        + "layouts.json",
+                new File(new File(frontend, FrontendUtils.GENERATED),
+                        "layouts.json").exists());
+    }
+
+    @Test
+    public void layoutsJson_containsExpectedPaths()
+            throws ExecutionFailedException, IOException {
+        Mockito.when(options.getClassFinder().getAnnotatedClasses(Layout.class))
+                .thenReturn(Collections.singleton(TestLayout.class));
+
+        TaskGenerateReactFiles task = new TaskGenerateReactFiles(options);
+        task.execute();
+
+        String layoutsContent = FileUtils.readFileToString(
+                new File(options.getFrontendGeneratedFolder(), "layouts.json"));
+
+        Assert.assertEquals("[{\"path\":\"/test\"}]", layoutsContent);
+
     }
 
     @Test
@@ -555,4 +578,9 @@ public void routesContainExport_oneSingleExport_exceptionThrown()
     @Route("test")
     private class TestRoute extends Component {
     }
+
+    @Tag("div")
+    @Layout("/test")
+    private class TestLayout extends Component implements RouterLayout {
+    }
 }
diff --git a/...in-dev-server/src/test/java/com/vaadin/base/devserver/startup/DevModeClassFinderTest.java b/...in-dev-server/src/test/java/com/vaadin/base/devserver/startup/DevModeClassFinderTest.java
@@ -37,6 +37,7 @@
 import com.vaadin.flow.component.page.AppShellConfigurator;
 import com.vaadin.flow.internal.Template;
 import com.vaadin.flow.router.HasErrorParameter;
+import com.vaadin.flow.router.Layout;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.server.LoadDependenciesOnStartup;
 import com.vaadin.flow.server.PWA;
@@ -69,7 +70,8 @@ public void applicableClasses_knownClasses() {
                 CssImport.Container.class, Theme.class, NoTheme.class,
                 HasErrorParameter.class, PWA.class, AppShellConfigurator.class,
                 Template.class, LoadDependenciesOnStartup.class,
-                Component.class, TypeScriptBootstrapModifier.class);
+                Component.class, TypeScriptBootstrapModifier.class,
+                Layout.class);
 
         for (Class<?> clz : classes) {
             assertTrue("should be a known class " + clz.getName(),