Adding more structural tests for the schema. (#4629)

pascalfleury · web-flow · commit 5f489c033165 · 2025-12-06T00:35:19.000+01:00
* Also check for target types.

* Fix the typo in comments.
diff --git a/software/tests/test_graphs.py b/software/tests/test_graphs.py
@@ -568,7 +568,7 @@ def test_properClassPropertyStructuring(self):
          PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
          PREFIX owl: <http://www.w3.org/2002/07/owl#>
 
-         SELECT ?term ?target WHERE {
+         SELECT ?term ?predicate ?target WHERE {
            # Define the combinations of type and predicate to look for
            VALUES (?type ?predicate) {
              (rdfs:Class    rdfs:subPropertyOf)
@@ -577,14 +577,21 @@ def test_properClassPropertyStructuring(self):
              (rdfs:Property owl:equivalentClass)
            }
 
-           # Apply the pattern once using the values above
-           ?term a ?type .
-           ?term ?predicate ?target .
-
+           {
+             # ?term must be of the right type for the predicate
+             ?term a ?type .
+             ?term ?predicate ?target .
+           }
+           UNION
+           {
+             # ?target must be of the right type for the predicate
+             ?target a ?type .
+             ?term ?predicate ?target .
+           }
          } ORDER BY ?term
         """,
         error_message="A type cannot be a Class (Property) and also be a subPropertyOf (subClassOf) or something!",
-        row_pattern="'%(term)s' is a Class/Property and also a subPropertyOf/subClassOf %(target)s")
+        row_pattern="'%(term)s' is %(predicate)s of %(target)s")
 
 
 # TODO: Unwritten tests (from basics; easier here?)
