WIP: Fix issues with changed IRIs effecting test_excelparser

ontopy/ontology.py

@@ -968,7 +968,7 @@
                     )
 
         elif write_catalog_file:
             write_catalog(
                 {self.get_version(as_iri=True): filename},
                 output=catalog_file,
                 directory=dir,
@@ -1941,6 +1941,14 @@
         """
         return self.new_entity(name, parent, "annotation_property")
 
+    def difference(self, other: owlready2.Ontology) -> set:
+        """Return a set of triples that are in this, but not in the
+        `other` ontology."""
+        # pylint: disable=invalid-name
+        s1 = set(self.get_unabbreviated_triples(blank="_:b"))
+        s2 = set(other.get_unabbreviated_triples(blank="_:b"))
+        return s1.difference(s2)
+
 
 class BlankNode:
     """Represents a blank node.
@@ -2008,31 +2016,31 @@
 
 
 def _get_unabbreviated_triples(
-    self, subject=None, predicate=None, obj=None, blank=None
+    onto, subject=None, predicate=None, obj=None, blank=None
 ):
     """Help function returning all matching triples unabbreviated.
 
     If `blank` is given, it will be used to represent blank nodes.
     """
     # pylint: disable=invalid-name
     abb = (
-        None if subject is None else self._abbreviate(subject),
-        None if predicate is None else self._abbreviate(predicate),
-        None if obj is None else self._abbreviate(obj),
+        None if subject is None else onto._abbreviate(subject),
+        None if predicate is None else onto._abbreviate(predicate),
+        None if obj is None else onto._abbreviate(obj),
     )
-    for s, p, o in self._get_obj_triples_spo_spo(*abb):
+    for s, p, o in onto._get_obj_triples_spo_spo(*abb):
         yield (
-            _unabbreviate(self, s, blank=blank),
-            _unabbreviate(self, p, blank=blank),
-            _unabbreviate(self, o, blank=blank),
+            _unabbreviate(onto, s, blank=blank),
+            _unabbreviate(onto, p, blank=blank),
+            _unabbreviate(onto, o, blank=blank),
         )
-    for s, p, o, d in self._get_data_triples_spod_spod(*abb, d=None):
+    for s, p, o, d in onto._get_data_triples_spod_spod(*abb, d=None):
         yield (
-            _unabbreviate(self, s, blank=blank),
-            _unabbreviate(self, p, blank=blank),
+            _unabbreviate(onto, s, blank=blank),
+            _unabbreviate(onto, p, blank=blank),
             f'"{o}"{d}'
             if isinstance(d, str)
-            else f'"{o}"^^{_unabbreviate(self, d)}'
+            else f'"{o}"^^{_unabbreviate(onto, d)}'
             if d
             else o,
         )

tests/test_excelparser/result_ontology/fromexcelonto.ttl

@@ -12,7 +12,7 @@
         "Jesper Friis"@en,
         "Sylvain Gouttebroze"@en ;
     dcterms:title "A test domain ontology"@en ;
-    owl:imports <http://emmo.info/emmo-inferred>,
+    owl:imports <http://emmo.info/emmo>,
         <http://ontology.info/ontology> ;
     owl:versionInfo "0.01"@en .
 

tests/test_excelparser/result_ontology/fromexcelonto_only_classes.ttl

@@ -12,7 +12,7 @@
         "Jesper Friis"@en,
         "Sylvain Gouttebroze"@en ;
     dcterms:title "A test domain ontology"@en ;
-    owl:imports <http://emmo.info/emmo-inferred>,
+    owl:imports <http://emmo.info/emmo>,
         <http://ontology.info/ontology> ;
     owl:versionInfo "0.01"@en .
 

tests/test_excelparser/test_excelparser.py

@@ -91,14 +91,20 @@ def test_excelparser(repo_dir: "Path") -> None:
         update_xlspath, force=True, input_ontology=ontology
     )
     assert updated_onto.ATotallyNewPattern
-    assert updated_onto.Pattern.iri == onto.Pattern.iri
+    assert updated_onto.FinitePattern.iri == onto.FinitePattern.iri
     assert len(list(onto.classes())) + 1 == len(list(updated_onto.classes()))
 
 
 def test_excelparser_only_classes(repo_dir: "Path") -> None:
     """This loads the excelfile used and tests that the resulting ontology prior
     to version 0.5.2 in which only classes where considered, but with empty sheets
     for properties."""
+
+    # if True:
+    #    from pathlib import Path
+    #
+    #    repo_dir = Path(__file__).resolve().parent.parent.parent
+
     ontopath = (
         repo_dir
         / "tests"
@@ -119,6 +125,12 @@ def test_excelparser_only_classes(repo_dir: "Path") -> None:
     # Used for printing new ontology when debugging
     # ontology.save("test_only_classes.ttl")
 
+    print("-----  only in onto  -----")
+    print(onto.difference(ontology))
+
+    print("-----  only in ontology  -----")
+    print(ontology.difference(onto))
+
     assert onto == ontology
     assert errors["already_defined"] == {"SpecialPattern"}
     assert errors["in_imported_ontologies"] == {"Atom"}
@@ -143,5 +155,5 @@ def test_excelparser_only_classes(repo_dir: "Path") -> None:
         update_xlspath, force=True, input_ontology=ontology
     )
     assert updated_onto.ATotallyNewPattern
-    assert updated_onto.Pattern.iri == onto.Pattern.iri
+    assert updated_onto.FinitePattern.iri == onto.FinitePattern.iri
     assert len(list(onto.classes())) + 1 == len(list(updated_onto.classes()))