update the CLI to remove the target directory and added units

Author: dschwartz-ftadvisory

src/main/java/com/regnosys/rosetta/generator/python/PythonCodeGeneratorCLI.java

@@ -16,10 +16,12 @@
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.*;
 import java.util.*;
 import java.util.stream.Collectors;
+import org.apache.commons.io.FileUtils;
 
 /**
  * Command-line interface for generating Python code from Rosetta models.
@@ -185,6 +187,22 @@ private static void processRosettaFiles(List<Path> rosettaFiles, String tgtDir)
     }
 
     private static void writePythonFiles(Map<String, CharSequence> generatedPython, String tgtDir) {
+        Path targetRoot = Paths.get(tgtDir);
+        File targetDirFile = targetRoot.toFile();
+        // Remove existing target directory (if any), then (re)create it
+        try {
+            if (targetDirFile.exists()) {
+                if (targetDirFile.isDirectory()) {
+                    FileUtils.deleteDirectory(targetDirFile);
+                } else {
+                    FileUtils.forceDelete(targetDirFile);
+                }
+            }
+            FileUtils.forceMkdir(targetDirFile);
+        } catch (IOException e) {
+            LOGGER.error("Failed to reset target directory {}: {}", targetRoot, e.getMessage(), e);
+            return;
+        }
         for (Map.Entry<String, CharSequence> entry : generatedPython.entrySet()) {
             String filePath = entry.getKey();
             CharSequence content = entry.getValue();

test/python_unit_tests/model/test_key_ref.py

@@ -2,13 +2,27 @@
 from rune.runtime.metadata import IntWithMeta, Reference
 
 from rosetta_dsl.test.model.key_ref.A import A
-from rosetta_dsl.test.model.key_ref.B import B
-
-def test_key_ref():
+from rosetta_dsl.test.model.key_ref.BRef import BRef
+from rosetta_dsl.test.model.key_ref.BNoRef import BNoRef
+ 
+def test_resuse_ref():
     '''test key ref'''
     a = A(aValue=IntWithMeta(value=1, key="key-123"))
-    b = B(aReference=Reference(target=a, ext_key="key-123"))
-    assert(len(b.validate_model())== 0)
+    b1 = BRef(aReference=a)
+    assert(len(b1.validate_model())== 0)
+    b2 = BRef(aReference=Reference(target=a, ext_key="key-123"))
+    assert(len(b2.validate_model())== 0)
+
+def test_reuse_no_ref():
+    '''test key ref'''
+    a = A(aValue=IntWithMeta(value=1))
+    b1 = BNoRef(aReference=a)
+    assert(len(b1.validate_model())== 0)
+    b2 = BNoRef(aReference=a)
+    assert(len(b2.validate_model()) == 0)
 
 if __name__ == "__main__":
-    test_key_ref()
+    test_resuse_ref()
+    test_reuse_no_ref()
+
+#EOF    

test/python_unit_tests/rosetta/ClassMemberAccess.rosetta

@@ -1,4 +1,4 @@
-namespace rosetta_dsl.test.model : <"generate Python unit tests from Rosetta.">
+namespace rosetta_dsl.test.model.class_member_access : <"generate Python unit tests from Rosetta.">
 type ClassMemberAccess:
     one int (1..1)
     two int (0..1)

test/python_unit_tests/rosetta/KeyRefTest.rosetta

@@ -4,6 +4,9 @@ type A:
     [metadata key]
     aValue int (1..1)
 
-type B:
+type BRef:
+    aReference A (1..1) 
+        [metadata reference]
+
+type BNoRef:
     aReference A (1..1) 
-        [metadata reference]

test/python_unit_tests/semantics/test_class_member_access_operator.py

@@ -3,7 +3,7 @@
 from rune.runtime.metadata import *
 from rune.runtime.utils import *
 from rune.runtime.conditions import *
-from rosetta_dsl.test.model.ClassMemberAccess import ClassMemberAccess
+from rosetta_dsl.test.model.class_member_access.ClassMemberAccess import ClassMemberAccess
 
 class_member_access = ClassMemberAccess(one=42, three=[1, 2, 3])