Testing property/class structuring. (#4628)

pascalfleury · web-flow · commit 3ce96b89bc59 · 2025-12-05T16:51:22.000+01:00
* Add a test to catch Class/Property mismatch in equivalences.

* Fix all Class/Property conflicts.

This was done by inspecting the type of the referenced object in case
it came from another onltology.

* Adding tests for checking the proper class/properrty structuring.

This adds some tests to verify that property hierarchies are done
using property-related relations, and class hierarchies are done using
class-related relations.
diff --git a/data/schema.ttl b/data/schema.ttl
@@ -4241,7 +4241,6 @@ See also the <a href="/docs/hotels.html">dedicated document on the use of schema
 :address a rdf:Property ;
     rdfs:label "address" ;
     rdfs:comment "Physical address of the item." ;
-    owl:equivalentProperty gs1:PostalAddress ;
     :domainIncludes :GeoCoordinates,
         :GeoShape,
         :Organization,
@@ -4253,7 +4252,6 @@ See also the <a href="/docs/hotels.html">dedicated document on the use of schema
 :addressCountry a rdf:Property ;
     rdfs:label "addressCountry" ;
     rdfs:comment """The country. Recommended to be in 2-letter [ISO 3166-1 alpha-2](http://en.wikipedia.org/wiki/ISO_3166-1) format, for example "US". For backward compatibility, a 3-letter [ISO 3166-1 alpha-3](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3) country code such as "SGP" or a full country name such as "Singapore" can also be used.""" ;
-    owl:equivalentProperty gs1:Country ;
     :domainIncludes :DefinedRegion,
         :GeoCoordinates,
         :GeoShape,
@@ -6487,7 +6485,6 @@ In the context of [[ShippingService]], use the [[ServicePeriod]] format, that co
 :hasDeliveryMethod a rdf:Property ;
     rdfs:label "hasDeliveryMethod" ;
     rdfs:comment "Method used for delivery or shipping." ;
-    owl:equivalentProperty unece:TransportMethod ;
     :domainIncludes :DeliveryEvent,
         :ParcelDelivery ;
     :rangeIncludes :DeliveryMethod .
@@ -7927,7 +7924,6 @@ Note: for historical reasons, any textual label and formal code provided as a li
     rdfs:label "paymentMethod" ;
     rdfs:comment "The name of the credit card or other method of payment for the order." ;
     rdfs:subPropertyOf fibo-fbc-pas-fpas:hasPaymentMechanism ;
-    owl:equivalentProperty unece:PaymentMeans ;
     :domainIncludes :Invoice,
         :Order ;
     :rangeIncludes :PaymentMethod,
diff --git a/software/tests/test_graphs.py b/software/tests/test_graphs.py
@@ -539,18 +539,53 @@ def test_EnumerationWithoutEnums(self):
         """,
         error_message="Enumeration Type without Enumeration value")
 
-    def test_owlEquivalences(self):
+    def test_illegalOwlClassPropertyMixup(self):
         self.assertNoMatch("""
         PREFIX owl: <http://www.w3.org/2002/07/owl#>
         SELECT ?term ?equivType WHERE {
             ?term owl:equivalentClass ?equivType .
-            FILTER EXISTS { ?term owl:equivalentProperty ?equivType . }
+            ?term owl:equivalentProperty ?equivType .
           }
           ORDER BY ?term
         """,
         error_message="Equivalence cannot hold for both Class and Property!",
         row_pattern="Term '%(term)s' is both equivalent Class and Property of %(equivType)s")
 
+        self.assertNoMatch("""
+        PREFIX owl: <http://www.w3.org/2002/07/owl#>
+        SELECT ?cls ?prop ?equivType WHERE {
+            ?cls owl:equivalentClass ?equivType .
+            ?prop owl:equivalentProperty ?equivType .
+          }
+          ORDER BY ?cls
+        """,
+        error_message="A type cannot be both equivalentClass and equivalentProperty!",
+        row_pattern="Type '%(equivType)s' cannot be both an equivalent Class (with %(cls)s) and Property of (with %(prop)s)")
+
+    def test_properClassPropertyStructuring(self):
+        self.assertNoMatch("""
+        PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+         PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+         PREFIX owl: <http://www.w3.org/2002/07/owl#>
+
+         SELECT ?term ?target WHERE {
+           # Define the combinations of type and predicate to look for
+           VALUES (?type ?predicate) {
+             (rdfs:Class    rdfs:subPropertyOf)
+             (rdfs:Class    owl:equivalentProperty)
+             (rdfs:Property rdfs:subClassOf)
+             (rdfs:Property owl:equivalentClass)
+           }
+
+           # Apply the pattern once using the values above
+           ?term 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")
+
 
 # TODO: Unwritten tests (from basics; easier here?)
 #
