add java keyword test

finos · Sep 5, 2024 · f1bc6b9 · f1bc6b9
1 parent 25f5c5a
commit f1bc6b9
Show file tree

Hide file tree

Showing 10 changed files with 111 additions and 3 deletions.
diff --git a/...ion/src/test/java/org/finos/legend/sdlc/test/junit/TestJUnitTestGeneratorCompilation.java b/...ion/src/test/java/org/finos/legend/sdlc/test/junit/TestJUnitTestGeneratorCompilation.java
@@ -91,6 +91,13 @@ public void testSourceToTargetM2M()
         testCompilation("model.mapping.TestSourceToTargetM2M", "model::mapping::SourceToTargetM2M");
     }
 
+    @Test
+    public void testJavaKeyWordCompilation()
+    {
+        testCompilation("model.mapping.Test_public", "model::mapping::public");
+        testCompilation("model.mapping.Test__", "model::mapping::_");
+    }
+
     @Test
     public void testTestService()
     {

diff --git a/...n/src/test/java/org/finos/legend/sdlc/test/junit/TestJUnitTestGeneratorSerialization.java b/...n/src/test/java/org/finos/legend/sdlc/test/junit/TestJUnitTestGeneratorSerialization.java
@@ -67,7 +67,10 @@ public void testWriteTestClassesWithoutRootPackage() throws IOException
                 "generated/java/testTestSuites/TestTestService2.java", "generated/java/testTestSuites/TestServiceStoreMapping.java",
                 "generated/java/testTestSuites/TestMyServiceIsVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVery_38d23576.java",
                 "generated/java/testTestSuites/TestMyServiceIsââVeryââVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryââââVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryV_a0bb3f4b.java",
-                "generated/java/model/domain/TestFunctionTest__String_0_1_.java");
+                "generated/java/model/domain/TestFunctionTest__String_0_1_.java",
+                "generated/java/model/mapping/Test__.java",
+                "generated/java/model/mapping/Test_public.java"
+        );
     }
 
     @Test
@@ -82,7 +85,10 @@ public void testWriteTestClasses() throws IOException
                 "generated/java/org/finos/legend/sdlc/test/junit/junit4/testTestSuites/TestServiceStoreMapping.java",
                 "generated/java/org/finos/legend/sdlc/test/junit/junit4/testTestSuites/TestMyServiceIsVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVery_38d23576.java",
                 "generated/java/org/finos/legend/sdlc/test/junit/junit4/testTestSuites/TestMyServiceIsââVeryââVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryââââVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryV_a0bb3f4b.java",
-                "generated/java/org/finos/legend/sdlc/test/junit/junit4/model/domain/TestFunctionTest__String_0_1_.java");
+                "generated/java/org/finos/legend/sdlc/test/junit/junit4/model/domain/TestFunctionTest__String_0_1_.java",
+                "generated/java/org/finos/legend/sdlc/test/junit/junit4/model/mapping/Test__.java",
+                "generated/java/org/finos/legend/sdlc/test/junit/junit4/model/mapping/Test_public.java"
+        );
     }
 
     @Test
@@ -97,7 +103,10 @@ public void testWriteTestClassesOtherPackage() throws IOException
                 "generated/java/other/test/pkg/testTestSuites/TestServiceStoreMapping.java",
                 "generated/java/other/test/pkg/testTestSuites/TestMyServiceIsVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVery_38d23576.java",
                 "generated/java/other/test/pkg/testTestSuites/TestMyServiceIsââVeryââVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryââââVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryVeryV_a0bb3f4b.java",
-                "generated/java/other/test/pkg/model/domain/TestFunctionTest__String_0_1_.java");
+                "generated/java/other/test/pkg/model/domain/TestFunctionTest__String_0_1_.java",
+                "generated/java/other/test/pkg/model/mapping/Test__.java",
+                "generated/java/other/test/pkg/model/mapping/Test_public.java"
+        );
     }
 
     private void testWriteTestClasses(String rootPackage, String... expectedResources) throws IOException

diff --git a/legend-sdlc-test-generation/src/test/resources/entities/model/mapping/_.json b/legend-sdlc-test-generation/src/test/resources/entities/model/mapping/_.json
@@ -0,0 +1,10 @@
+{
+  "classifierPath": "meta::pure::mapping::Mapping",
+  "content": {
+    "package": "model::mapping",
+    "_type": "mapping",
+    "name": "_",
+    "classMappings": [],
+    "tests": []
+  }
+}
diff --git a/legend-sdlc-test-generation/src/test/resources/entities/model/mapping/public.json b/legend-sdlc-test-generation/src/test/resources/entities/model/mapping/public.json
@@ -0,0 +1,10 @@
+{
+  "classifierPath": "meta::pure::mapping::Mapping",
+  "content": {
+    "package": "model::mapping",
+    "_type": "mapping",
+    "name": "public",
+    "classMappings": [],
+    "tests": []
+  }
+}
diff --git a/legend-sdlc-test-generation/src/test/resources/generated/java/model/mapping/Test__.java b/legend-sdlc-test-generation/src/test/resources/generated/java/model/mapping/Test__.java
@@ -0,0 +1,12 @@
+amend package model.mapping;
+
+import org.finos.legend.sdlc.test.junit.pure.v1.AbstractMappingTest;
+
+public class Test__ extends AbstractMappingTest
+{
+    @Override
+    protected String getEntityPath()
+    {
+        return "model::mapping::_";
+    }
+}
diff --git a/legend-sdlc-test-generation/src/test/resources/generated/java/model/mapping/Test_public.java b/legend-sdlc-test-generation/src/test/resources/generated/java/model/mapping/Test_public.java
@@ -0,0 +1,12 @@
+package model.mapping;
+
+import org.finos.legend.sdlc.test.junit.pure.v1.AbstractMappingTest;
+
+public class Test_public extends AbstractMappingTest
+{
+    @Override
+    protected String getEntityPath()
+    {
+        return "model::mapping::public";
+    }
+}
diff --git a/...esources/generated/java/org/finos/legend/sdlc/test/junit/junit4/model/mapping/Test__.java b/...esources/generated/java/org/finos/legend/sdlc/test/junit/junit4/model/mapping/Test__.java
@@ -0,0 +1,12 @@
+package org.finos.legend.sdlc.test.junit.junit4.model.mapping;
+
+import org.finos.legend.sdlc.test.junit.pure.v1.AbstractMappingTest;
+
+public class Test__ extends AbstractMappingTest
+{
+    @Override
+    protected String getEntityPath()
+    {
+        return "model::mapping::_";
+    }
+}
diff --git a/...ces/generated/java/org/finos/legend/sdlc/test/junit/junit4/model/mapping/Test_public.java b/...ces/generated/java/org/finos/legend/sdlc/test/junit/junit4/model/mapping/Test_public.java
@@ -0,0 +1,12 @@
+package org.finos.legend.sdlc.test.junit.junit4.model.mapping;
+
+import org.finos.legend.sdlc.test.junit.pure.v1.AbstractMappingTest;
+
+public class Test_public extends AbstractMappingTest
+{
+    @Override
+    protected String getEntityPath()
+    {
+        return "model::mapping::public";
+    }
+}
diff --git a/...est-generation/src/test/resources/generated/java/other/test/pkg/model/mapping/Test__.java b/...est-generation/src/test/resources/generated/java/other/test/pkg/model/mapping/Test__.java
@@ -0,0 +1,12 @@
+package other.test.pkg.model.mapping;
+
+import org.finos.legend.sdlc.test.junit.pure.v1.AbstractMappingTest;
+
+public class Test__ extends AbstractMappingTest
+{
+    @Override
+    protected String getEntityPath()
+    {
+        return "model::mapping::_";
+    }
+}
diff --git a/...eneration/src/test/resources/generated/java/other/test/pkg/model/mapping/Test_public.java b/...eneration/src/test/resources/generated/java/other/test/pkg/model/mapping/Test_public.java
@@ -0,0 +1,12 @@
+package other.test.pkg.model.mapping;
+
+import org.finos.legend.sdlc.test.junit.pure.v1.AbstractMappingTest;
+
+public class Test_public extends AbstractMappingTest
+{
+    @Override
+    protected String getEntityPath()
+    {
+        return "model::mapping::public";
+    }
+}