#266 make mixed template generation order independant

casid · Aug 31, 2023 · b4c5e28 · b4c5e28
1 parent f432fcd
commit b4c5e28
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/jte-kotlin/src/test/java/gg/jte/kotlin/DummyCodeResolver.java b/jte-kotlin/src/test/java/gg/jte/kotlin/DummyCodeResolver.java
@@ -2,13 +2,10 @@
 
 import gg.jte.CodeResolver;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class DummyCodeResolver implements CodeResolver {
-    private final Map<String, String> codeLookup = new HashMap<>();
+    private final Map<String, String> codeLookup = new TreeMap<>();
 
     @Override
     public String resolve(String name) {

diff --git a/jte-kotlin/src/test/java/gg/jte/kotlin/TemplateEngineTest.java b/jte-kotlin/src/test/java/gg/jte/kotlin/TemplateEngineTest.java
@@ -1197,6 +1197,16 @@ void mixedTemplates_callJteFromKte_withParams() {
         thenOutputIs("Hello, Java says 42, foo!");
     }
 
+    @Test
+    void mixedTemplates_callJteFromKte_generateAll() {
+        dummyCodeResolver.givenCode("a.jte", "Java!"); // Hack: named 'a' to be generated first
+        dummyCodeResolver.givenCode(templateName = "b.kte", "Hello @template.a()");
+
+        List<String> generated = templateEngine.generateAll();
+
+        assertThat(generated).hasSize(2);
+    }
+
     @Test
     void nestedKotlinStringTemplates() {
         givenRawTemplate("@import java.time.format.DateTimeFormatter\n" +

diff --git a/jte/src/main/java/gg/jte/compiler/ClassDefinition.java b/jte/src/main/java/gg/jte/compiler/ClassDefinition.java
@@ -49,12 +49,15 @@ public boolean equals(Object o) {
 
         ClassDefinition that = (ClassDefinition) o;
 
-        return name.equals(that.name);
+        if (!name.equals(that.name)) return false;
+        return extension.equals(that.extension);
     }
 
     @Override
     public int hashCode() {
-        return name.hashCode();
+        int result = name.hashCode();
+        result = 31 * result + extension.hashCode();
+        return result;
     }
 
     public String getSourceFileName() {