fixup! Reformat the templates for Kotlin model code

casid · Jan 16, 2024 · 4848042 · 4848042
1 parent eec51dc
commit 4848042
Show file tree

Hide file tree

Showing 4 changed files with 123 additions and 25 deletions.
diff --git a/jte-models/src/main/jte/dynamictemplates/kmain.jte b/jte-models/src/main/jte/dynamictemplates/kmain.jte
@@ -8,7 +8,6 @@
 @param Set<TemplateDescription> templates
 @param Iterable<String> imports
 @param ModelConfig modelConfig
-
 @file:Suppress("ktlint")
 package ${config.packageName()}
 

diff --git a/jte-models/src/main/jte/interfacetemplates/kmain.jte b/jte-models/src/main/jte/interfacetemplates/kmain.jte
@@ -7,7 +7,6 @@
 @param Set<TemplateDescription> templates
 @param Iterable<String> imports
 @param ModelConfig modelConfig
-
 @file:Suppress("ktlint")
 package ${config.packageName()}
 

diff --git a/jte-models/src/main/jte/statictemplates/kmain.jte b/jte-models/src/main/jte/statictemplates/kmain.jte
@@ -8,7 +8,6 @@
 @param Set<TemplateDescription> templates
 @param Iterable<String> imports
 @param ModelConfig modelConfig
-
 @file:Suppress("ktlint")
 package ${config.packageName()}
 

diff --git a/jte-models/src/test/java/gg/jte/models/generator/TestModelExtension.java b/jte-models/src/test/java/gg/jte/models/generator/TestModelExtension.java
@@ -219,13 +219,70 @@ public void generatesKotlinWithoutDefaultValueForContentParams() {
             );
 
             // Then
-            generatedPaths.forEach(path -> {
-                try {
-                    assertThat(Files.readString(path)).contains("fun hello(content: gg.jte.Content): JteModel");
-                } catch (IOException ex) {
-                    fail("Could not read file " + path, ex);
+            var actual = generatedPaths.stream().collect(Collectors.toMap(
+                path -> path.getFileName().toString(),
+                path -> {
+                    try {
+                        return Files.readString(path);
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
                 }
-            });
+            ));
+            var expected = Map.of(
+                "Templates.kt", """
+                    @file:Suppress("ktlint")
+                    package test.myktemplates
+
+                    import gg.jte.models.runtime.*
+
+                    interface Templates {
+                       \s
+                        @JteView("hello.kte")
+                        fun hello(content: gg.jte.Content): JteModel
+
+                    }""",
+                "StaticTemplates.kt", """
+                    @file:Suppress("ktlint")
+                    package test.myktemplates
+
+                    import gg.jte.models.runtime.*
+                    import gg.jte.ContentType
+                    import gg.jte.html.HtmlTemplateOutput
+
+                    class StaticTemplates : Templates {
+                       \s
+                        override fun hello(content: gg.jte.Content): JteModel = StaticJteModel<TemplateOutput>(
+                            ContentType.Plain,
+                            { output, interceptor -> JtehelloGenerated.render(output, interceptor, content) },
+                            "hello.kte",
+                            "test.myktemplates",
+                            JtehelloGenerated.JTE_LINE_INFO
+                        )
+
+                    }""",
+                "DynamicTemplates.kt", """
+                    @file:Suppress("ktlint")
+                    package test.myktemplates
+                                         
+                    import gg.jte.TemplateEngine
+                    import gg.jte.models.runtime.*
+                                         
+                    class DynamicTemplates(private val engine: TemplateEngine) : Templates {
+                       \s
+                        override fun hello(content: gg.jte.Content): JteModel {
+                           \s
+                            val paramMap = buildMap<String, Any?> {
+                           \s
+                                put("content", content)
+                            }
+                           \s
+                            return DynamicJteModel(engine, "hello.kte", paramMap)
+                        }
+                                         
+                    }"""
+            );
+            assertThat(actual).containsExactlyInAnyOrderEntriesOf(expected);
         }
 
         @Test
@@ -244,23 +301,67 @@ public void generatesKotlinFacadesWithNoParameters() {
             );
 
             // Then
-            generatedPaths.forEach(path -> {
-                try {
-                    assertThat(Files.readString(path)).contains("fun hello(): JteModel");
-                } catch (IOException ex) {
-                    fail("Could not read file " + path, ex);
+            var actual = generatedPaths.stream().collect(Collectors.toMap(
+                path -> path.getFileName().toString(),
+                path -> {
+                    try {
+                        return Files.readString(path);
+                    } catch (IOException e) {
+                        throw new RuntimeException(e);
+                    }
                 }
-            });
-
-            // Dynamic has a map with explicit generics types declared.
-            // This is relevant for empty maps (templates with no params).
-            assertThat(generatedPaths).anySatisfy(path -> {
-                try {
-                    assertThat(Files.readString(path)).contains("val paramMap = mapOf<String, Any?>");
-                } catch (IOException ex) {
-                    fail("Could not read file " + path, ex);
-                }
-            });
+            ));
+            var expected = Map.of(
+                "Templates.kt", """
+                    @file:Suppress("ktlint")
+                    package test.myktemplates
+                                         
+                    import gg.jte.models.runtime.*
+                                         
+                    interface Templates {
+                       \s
+                        @JteView("hello.kte")
+                        fun hello(): JteModel
+                                         
+                    }""",
+                "StaticTemplates.kt", """
+                    @file:Suppress("ktlint")
+                    package test.myktemplates
+
+                    import gg.jte.models.runtime.*
+                    import gg.jte.ContentType
+                    import gg.jte.html.HtmlTemplateOutput
+
+                    class StaticTemplates : Templates {
+                       \s
+                        override fun hello(): JteModel = StaticJteModel<TemplateOutput>(
+                            ContentType.Plain,
+                            { output, interceptor -> JtehelloGenerated.render(output, interceptor) },
+                            "hello.kte",
+                            "test.myktemplates",
+                            JtehelloGenerated.JTE_LINE_INFO
+                        )
+
+                    }""",
+                "DynamicTemplates.kt", """
+                    @file:Suppress("ktlint")
+                    package test.myktemplates
+                                    
+                    import gg.jte.TemplateEngine
+                    import gg.jte.models.runtime.*
+                                    
+                    class DynamicTemplates(private val engine: TemplateEngine) : Templates {
+                       \s
+                        override fun hello(): JteModel {
+                           \s
+                            val paramMap = emptyMap<String, Any?>()
+                           \s
+                            return DynamicJteModel(engine, "hello.kte", paramMap)
+                        }
+
+                    }"""
+            );
+            assertThat(actual).containsExactlyInAnyOrderEntriesOf(expected);
         }
     }
 }