Some corrections/All tests running

feup-infolab · Mar 19, 2020 · 1ad80bf · 1ad80bf
1 parent 056b0c3
commit 1ad80bf
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 15 deletions.
diff --git a/src/Models/CRM/v5_0_2/NodeEntities/E18_Physical_Thing.py b/src/Models/CRM/v5_0_2/NodeEntities/E18_Physical_Thing.py
@@ -14,25 +14,22 @@
 from src.Models.CRM.v5_0_2.NodeProperties.P30_transferred_custody_of import P30_transferred_custody_of
 from src.Models.CRM.v5_0_2.NodeProperties.P31_has_modified import P31_has_modified
 from src.Models.CRM.v5_0_2.NodeProperties.P34_concerned import P34_concerned
-from src.Models.CRM.v5_0_2.NodeProperties.P7_took_place_at import \
-    P7_took_place_at
+from src.Models.CRM.v5_0_2.NodeProperties.P46_is_composed_of import P46_is_composed_of
+from src.Models.CRM.v5_0_2.NodeProperties.P7_took_place_at import P7_took_place_at
 from src.Models.CRM.v5_0_2.NodeProperties.P156_occupies import P156_occupies
 
 
-class P46_is_composed_of(StructuredRel):
-    pass
 
 
 class E18_Physical_Thing(E72_Legal_Object):
     is_composed_of = RelationshipTo(
         ".E18_Physical_Thing.E18_Physical_Thing",
         "P46_is_composed_of",
         model=P46_is_composed_of)
-    took_place_on_or_within = RelationshipFrom(
-        ".E4_Period.E4_Period",
-        "P8_took_place_on_or_within",
-        model=P8_took_place_on_or_within)
-
+   # took_place_on_or_within = RelationshipFrom(
+   #     ".E4_Period.E4_Period",
+   #     "P8_took_place_on_or_within",
+   #     model=P8_took_place_on_or_within)
     occupies = RelationshipTo(
         ".E53_Place.E53_Place", "P156_occupies", model=P156_occupies
     )

diff --git a/src/Models/CRM/v5_0_2/NodeEntities/E1_CRM_Entity.py b/src/Models/CRM/v5_0_2/NodeEntities/E1_CRM_Entity.py
@@ -34,7 +34,7 @@ class E1_CRM_Entity(StructuredNode):
         "P41_classified",
         model=P41_classified)
     depicts = RelationshipFrom(
-        ".E24_Physical_Man_Made_Thing.E24_Physical_Man_Made_Thing",
+        ".E24_Physical_Human_Made_Thing.E24_Physical_Human_Made_Thing",
         "P62_depicts",
         model=P62_depicts)
     refers_to = RelationshipFrom(

diff --git a/src/Models/CRM/v5_0_2/NodeEntities/E39_Actor.py b/src/Models/CRM/v5_0_2/NodeEntities/E39_Actor.py
@@ -60,7 +60,7 @@ class E39_Actor(E77_Persistent_Item):
         "P107_has_current_or_former_member",
         model=P107_has_current_or_former_member)
     has_current_or_former_curator = RelationshipFrom(
-        ".E78_Collection.E78_Collection",
+        ".E78_Curated_Holding.E78_Curated_Holding",
         "P109_has_current_or_former_curator",
         model=P109_has_current_or_former_curator)
     joined = RelationshipFrom(

diff --git a/src/Models/CRM/v5_0_2/NodeEntities/E53_Place.py b/src/Models/CRM/v5_0_2/NodeEntities/E53_Place.py
@@ -1,7 +1,6 @@
 from neomodel import RelationshipTo, RelationshipFrom
 from src.Models.CRM.v5_0_2.NodeEntities.E1_CRM_Entity import E1_CRM_Entity
-from src.Models.CRM.v5_0_2.NodeEntities.E18_Physical_Thing import \
-    E18_Physical_Thing
+from src.Models.CRM.v5_0_2.NodeEntities.E18_Physical_Thing import E18_Physical_Thing
 from src.Models.CRM.v5_0_2.NodeEntities.E4_Period import E4_Period
 from src.Models.CRM.v5_0_2.NodeProperties.P121_overlaps_with import P121_overlaps_with
 from src.Models.CRM.v5_0_2.NodeProperties.P122_borders_with import P122_borders_with

diff --git a/src/Models/CRM/v5_0_2/NodeEntities/E80_Part_Removal.py b/src/Models/CRM/v5_0_2/NodeEntities/E80_Part_Removal.py
@@ -2,5 +2,5 @@
     E11_Modification
 
 
-class E79_Part_Removal(E11_Modification):
+class E80_Part_Removal(E11_Modification):
     pass
diff --git a/test/Unit/test_relations.py b/test/Unit/test_relations.py
@@ -145,7 +145,6 @@ def test_serialization(self):
         # Creation of relationship
         e55_3.hasType.connect(e21)
         # Obtaining Json
-        e1.fu
         json_a = json.dumps(e21.to_json())
         json_b = json.dumps(e55_3.to_json())
         json_c = json.dumps(e55_3.hasType.relationship(e21).to_json())