update key ref unit tests

Author: dschwartz-ftadvisory

test/python_unit_tests/model/test_key_ref.py

@@ -1,28 +1,39 @@
 '''key ref unit test'''
 from rune.runtime.metadata import IntWithMeta, Reference
 
-from rosetta_dsl.test.model.key_ref.A import A
+from rosetta_dsl.test.model.key_ref.ARef import ARef
+from rosetta_dsl.test.model.key_ref.ANoRef import ANoRef
 from rosetta_dsl.test.model.key_ref.BRef import BRef
-from rosetta_dsl.test.model.key_ref.BNoRef import BNoRef
+from rosetta_dsl.test.model.key_ref.BNoRefARef import BNoRefARef
+from rosetta_dsl.test.model.key_ref.BNoRefANoRef import BNoRefANoRef
 
 def test_resuse_ref():
     '''test key ref'''
-    a = A(aValue=IntWithMeta(value=1, key="key-123"))
+    a = ARef(aValue=IntWithMeta(value=1, key="key-123"))
     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():
+def test_reuse_a_ref():
     '''test key ref'''
-    a = A(aValue=IntWithMeta(value=1))
-    b1 = BNoRef(aReference=a)
+    a = ARef(aValue=IntWithMeta(value=1))
+    b1 = BNoRefARef(aReference=a)
     assert(len(b1.validate_model())== 0)
-    b2 = BNoRef(aReference=a)
+    b2 = BNoRefARef(aReference=a)
+    assert(len(b2.validate_model()) == 0)
+
+def test_reuse_a_no_ref():
+    '''test key ref'''
+    a = ANoRef(aValue=IntWithMeta(value=1))
+    b1 = BNoRefANoRef(aReference=a)
+    assert(len(b1.validate_model())== 0)
+    b2 = BNoRefANoRef(aReference=a)
     assert(len(b2.validate_model()) == 0)
 
 if __name__ == "__main__":
     test_resuse_ref()
-    test_reuse_no_ref()
+    test_reuse_a_ref()
+    test_reuse_a_no_ref()
 
 #EOF    

test/python_unit_tests/rosetta/KeyRefTest.rosetta

@@ -1,12 +1,18 @@
 namespace rosetta_dsl.test.model.key_ref : <"generate Python unit tests from Rosetta.">
 
-type A:
+type ANoRef:
+    aValue int (1..1)
+
+type ARef:
     [metadata key]
     aValue int (1..1)
 
 type BRef:
-    aReference A (1..1) 
+    aReference ARef (1..1) 
         [metadata reference]
 
-type BNoRef:
-    aReference A (1..1) 
+type BNoRefARef:
+    aReference ARef (1..1) 
+
+type BNoRefANoRef:
+    aReference ANoRef (1..1)