adjusted tests

Ian321 · Dec 14, 2024 · b5b4f80 · b5b4f80
1 parent 385247c
commit b5b4f80
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/ss14_tiled/generate/entities.py b/ss14_tiled/generate/entities.py
@@ -263,7 +263,7 @@ def merge_entity(child: dict, parent: dict) -> dict:
     """Merge entities."""
     out = copy.deepcopy(parent)
     for (key, value) in child.items():
-        if key == "components" or key == "parent":
+        if key in ("components", "parent"):
             continue
         out[key] = value
 

diff --git a/ss14_tiled/test.py b/ss14_tiled/test.py
@@ -14,7 +14,7 @@ def test_basalt(self):
         child = {
             "type": "entity",
             "id": "BasaltTwo",
-            "parent": "BasaltOne",
+            "parent": ["BasaltOne"],
             "placement": {
                 "mode": "SnapgridCenter"
             },
@@ -29,6 +29,7 @@ def test_basalt(self):
         parent = {
             "type": "entity",
             "id": "BasaltOne",
+            "parent": [],
             "description": "Rock.",
             "placement": {
                 "mode": "SnapgridCenter"
@@ -57,7 +58,7 @@ def test_basalt(self):
         expected = {
             "type": "entity",
             "id": "BasaltTwo",
-            "parent": "BasaltOne",
+            "parent": ["BasaltOne"],
             "description": "Rock.",
             "placement": {
                 "mode": "SnapgridCenter"
@@ -91,20 +92,21 @@ def test_new_component(self):
         """If the child has a new component."""
         child = {
             "id": "B",
-            "parent": "A",
+            "parent": ["A"],
             "components": [{
                 "type": "test_2"
             }]
         }
         parent = {
             "id": "A",
+            "parent": [],
             "components": [{
                 "type": "test_1"
             }]
         }
         expected = {
             "id": "B",
-            "parent": "A",
+            "parent": ["A"],
             "components": [{
                 "type": "test_1"
             }, {