ISSUE-103: Switched to sh:equals, sh:notEquals, sh:lessThan, sh:lessT…

…hanOrEquals
w3c · Jan 9, 2016 · 5e2434a · 5e2434a
1 parent 7ab1a5e
commit 5e2434a
Show file tree

Hide file tree

Showing 6 changed files with 216 additions and 220 deletions.
diff --git a/data-shapes-test-suite/tests/features/core/equal-001.ttl b/data-shapes-test-suite/tests/features/core/equal-001.ttl
@@ -22,47 +22,43 @@ ex:MyShape
 	sh:scopeNode ex:InvalidResource2 ;
 	sh:scopeNode ex:InvalidResource3 ;
 	sh:scopeNode ex:InvalidResource4 ;
-	sh:constraint [
-		a sh:EqualConstraint ;
-		sh:predicate1 ex:property1 ;
-		sh:predicate2 ex:property2 ;
+	sh:property [
+		sh:predicate ex:property1 ;
+		sh:equals ex:property2 ;
 	] 
 .
 
 # Instances -------------------------------------------------------------------
 
+ex:property1 a rdf:Property .
+ex:property2 a rdf:Property .
+
 ex:ValidResource1
-	sh:nodeShape ex:MyShape ;
 	ex:property1 "A" ;
 	ex:property2 "A" ;
 .
 
 ex:ValidResource2
-	sh:nodeShape ex:MyShape ;
 	ex:property1 "A" ;
 	ex:property1 "B" ;
 	ex:property2 "A" ;
 	ex:property2 "B" ;
 .
 
 ex:InvalidResource1
-	sh:nodeShape ex:MyShape ;
 	ex:property1 "A" ;
 	ex:property2 "B" ;
 .
 
 ex:InvalidResource2
-	sh:nodeShape ex:MyShape ;
 	ex:property1 "A" ;
 .
 
 ex:InvalidResource3
-	sh:nodeShape ex:MyShape ;
 	ex:property2 "A" ;
 .
 
 ex:InvalidResource4
-	sh:nodeShape ex:MyShape ;
 	ex:property1 "A" ;
 	ex:property1 "B" ;
 	ex:property2 "A" ;

diff --git a/data-shapes-test-suite/tests/features/core/lessThan-001.ttl b/data-shapes-test-suite/tests/features/core/lessThan-001.ttl
@@ -21,15 +21,17 @@ ex:MyShape
 	sh:scopeNode ex:InvalidResource1 ;
 	sh:scopeNode ex:InvalidResource2 ;
 	sh:scopeNode ex:InvalidResource3 ;
-	sh:constraint [
-		a sh:LessThanConstraint ;
-		sh:predicate1 ex:property1 ;
-		sh:predicate2 ex:property2 ;
+	sh:property [
+		sh:predicate ex:property1 ;
+		sh:lessThan ex:property2 ;
 	] 
 .
 
 # Instances -------------------------------------------------------------------
 
+ex:property1 a rdf:Property .
+ex:property2 a rdf:Property .
+
 ex:ValidResource1
 	ex:property1 4 ;
 	ex:property2 6 ;

diff --git a/data-shapes-test-suite/tests/features/core/lessThanOrEqual-001.ttl b/data-shapes-test-suite/tests/features/core/lessThanOrEqual-001.ttl
@@ -21,15 +21,17 @@ ex:MyShape
 	sh:scopeNode ex:ValidResource3 ;
 	sh:scopeNode ex:InvalidResource1 ;
 	sh:scopeNode ex:InvalidResource2 ;
-	sh:constraint [
-		a sh:LessThanOrEqualConstraint ;
-		sh:predicate1 ex:property1 ;
-		sh:predicate2 ex:property2 ;
-	] 
+	sh:property [
+		sh:predicate ex:property1 ;
+		sh:lessThanOrEquals ex:property2 ;
+	]
 .
 
 # Instances -------------------------------------------------------------------
 
+ex:property1 a rdf:Property .
+ex:property2 a rdf:Property .
+
 ex:ValidResource1
 	ex:property1 4 ;
 	ex:property2 6 ;

diff --git a/data-shapes-test-suite/tests/features/core/manifest.ttl b/data-shapes-test-suite/tests/features/core/manifest.ttl
@@ -283,7 +283,7 @@
 		sh:severity sh:Violation ;
   		sh:focusNode ex:InvalidResource1 ;
   		sh:subject ex:InvalidResource1 ;
-  		sh:predicate ex:property2 ;
+  		sh:predicate ex:property1 ;
   		sh:object "B" ;
 	] ;
 	mf:result [
@@ -299,7 +299,7 @@
 		sh:severity sh:Violation ;
   		sh:focusNode ex:InvalidResource3 ;
   		sh:subject ex:InvalidResource3 ;
-  		sh:predicate ex:property2 ;
+  		sh:predicate ex:property1 ;
   		sh:object "A" ;
 	] ;
 	mf:result [

diff --git a/data-shapes-test-suite/tests/features/core/notEqual-001.ttl b/data-shapes-test-suite/tests/features/core/notEqual-001.ttl
@@ -20,15 +20,17 @@ ex:MyShape
 	sh:scopeNode ex:ValidResource2 ;
 	sh:scopeNode ex:InvalidResource1 ;
 	sh:scopeNode ex:InvalidResource2 ;
-	sh:constraint [
-		a sh:NotEqualConstraint ;
-		sh:predicate1 ex:property1 ;
-		sh:predicate2 ex:property2 ;
+	sh:property [
+		sh:predicate ex:property1 ;
+		sh:notEquals ex:property2 ;
 	] 
 .
 
 # Instances -------------------------------------------------------------------
 
+ex:property1 a rdf:Property .
+ex:property2 a rdf:Property .
+
 ex:ValidResource1
 	ex:property1 "A" ;
 	ex:property2 "B" ;