Fix tests

Author: alessiostalla

.github/workflows/pythonapp.yml

@@ -36,4 +36,4 @@ jobs:
       - name: Test with pytest
         run: |
           pip install pytest pytest-cov pyecore==0.12.2
-          pytest --cov=pylasu --cov-fail-under=40 tests
+          pytest --cov=pylasu --cov-fail-under=50 tests

pylasu/emf/model.py

@@ -40,12 +40,13 @@ def to_eobject(self: Node, resource: Resource, mappings=None):
         raise Exception("Unknown classifier for " + str(type(self)))
     eobject = eclass()
     mappings[id(self)] = eobject
-    for (p, v) in self.properties:
+    for p in self.properties:
+        v = p.value
         ev = translate_value(v, resource, mappings)
         if isinstance(v, list):
-            eobject.eGet(p).extend(ev)
+            eobject.eGet(p.name).extend(ev)
         else:
-            eobject.eSet(p, ev)
+            eobject.eSet(p.name, ev)
     return eobject
 
 

pylasu/model/processing.py

@@ -21,7 +21,7 @@ def assign_parents(self: Node):
 
 
 def children(self: Node):
-    yield from nodes_in(v for _, v in self.properties)
+    yield from nodes_in(p.value for p in self.properties)
 
 
 Node.children = internal_property(children)
@@ -44,7 +44,9 @@ def search_by_type(self: Node, target_type, walker=walk):
 
 @extension_method(Node)
 def transform_children(self: Node, operation: Callable[[Node], Node]):
-    for name, value in self.properties:
+    for prop in self.properties:
+        name = prop.name
+        value = prop.value
         if isinstance(value, Node):
             new_value = operation(value)
             if new_value != value:

tests/test_model.py

@@ -10,6 +10,7 @@
 @dataclasses.dataclass
 class SomeNode(Node, Named):
     foo = 3
+    bar: int = dataclasses.field(init=False)
     __private__ = 4
     ref: Node = None
     multiple: List[Node] = dataclasses.field(default_factory=list)
@@ -66,17 +67,17 @@ def test_node_with_position(self):
 
     def test_node_properties(self):
         node = SomeNode("n").with_position(Position(Point(1, 0), Point(2, 1)))
-        self.assertIsNotNone(next(n for n, _ in node.properties if n == 'foo'))
-        self.assertIsNotNone(next(n for n, _ in node.properties if n == 'bar'))
-        self.assertIsNotNone(next(n for n, _ in node.properties if n == "name"))
+        self.assertIsNotNone(next(n for n in node.properties if n.name == 'foo'))
+        self.assertIsNotNone(next(n for n in node.properties if n.name == 'bar'))
+        self.assertIsNotNone(next(n for n in node.properties if n.name == "name"))
         with self.assertRaises(StopIteration):
-            next(n for n, _ in node.properties if n == '__private__')
+            next(n for n in node.properties if n.name == '__private__')
         with self.assertRaises(StopIteration):
-            next(n for n, _ in node.properties if n == 'non_existent')
+            next(n for n in node.properties if n.name == 'non_existent')
         with self.assertRaises(StopIteration):
-            next(n for n, _ in node.properties if n == 'properties')
+            next(n for n in node.properties if n.name == 'properties')
         with self.assertRaises(StopIteration):
-            next(n for n, _ in node.properties if n == "origin")
+            next(n for n in node.properties if n.name == "origin")
 
     def test_scope_lookup_0(self):
         """Symbol found in local scope with name and default type"""
@@ -137,13 +138,15 @@ def test_scope_lookup_7(self):
 
     def test_node_properties_meta(self):
         pds = [pd for pd in sorted(SomeNode.node_properties, key=lambda x: x.name)]
-        self.assertEqual(4, len(pds))
-        self.assertEqual("foo", pds[0].name)
+        self.assertEqual(5, len(pds))
+        self.assertEqual("bar", pds[0].name)
         self.assertFalse(pds[0].provides_nodes)
-        self.assertEqual("multiple", pds[1].name)
-        self.assertTrue(pds[1].provides_nodes)
-        self.assertEqual(Multiplicity.MANY, pds[1].multiplicity)
-        self.assertEqual("name", pds[2].name)
-        self.assertFalse(pds[2].provides_nodes)
-        self.assertEqual("ref", pds[3].name)
-        self.assertTrue(pds[3].provides_nodes)
+        self.assertEqual("foo", pds[1].name)
+        self.assertFalse(pds[1].provides_nodes)
+        self.assertEqual("multiple", pds[2].name)
+        self.assertTrue(pds[2].provides_nodes)
+        self.assertEqual(Multiplicity.MANY, pds[2].multiplicity)
+        self.assertEqual("name", pds[3].name)
+        self.assertFalse(pds[3].provides_nodes)
+        self.assertEqual("ref", pds[4].name)
+        self.assertTrue(pds[4].provides_nodes)