Merge pull request #263 from ge-high-assurance/ontology-review/testing

Incorporate ontology review for TESTING
ge-high-assurance · Jan 5, 2021 · 2e079bb · 2e079bb
2 parents a636f70 + 1c25a1b
commit 2e079bb
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/RACK-Ontology/OwlModels/TESTING.owl b/RACK-Ontology/OwlModels/TESTING.owl
@@ -44,6 +44,15 @@
     <rdfs:subClassOf rdf:resource="PROV-S#THING"/>
   </owl:Class>
   <owl:Class rdf:ID="TEST_RESULT">
+    <rdfs:subClassOf>
+      <owl:Restriction>
+        <owl:cardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+        >1</owl:cardinality>
+        <owl:onProperty>
+          <owl:ObjectProperty rdf:ID="result"/>
+        </owl:onProperty>
+      </owl:Restriction>
+    </rdfs:subClassOf>
     <rdfs:comment xml:lang="en">Result corresponding to one execution of one TEST</rdfs:comment>
     <rdfs:subClassOf rdf:resource="PROV-S#ENTITY"/>
   </owl:Class>
@@ -58,7 +67,7 @@
     <rdfs:domain rdf:resource="#TEST_DEVELOPMENT"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:ID="verifies">
-    <rdfs:subPropertyOf rdf:resource="PROV-S#wasDerivedFrom"/>
+    <rdfs:subPropertyOf rdf:resource="PROV-S#wasImpactedBy"/>
     <rdfs:comment xml:lang="en">Parent ENTITY(s) (e.g. REQUIREMENT) that this requirement is derived from</rdfs:comment>
     <rdfs:range rdf:resource="PROV-S#ENTITY"/>
     <rdfs:domain rdf:resource="#TEST"/>
@@ -75,9 +84,9 @@
     <rdfs:domain rdf:resource="#TEST"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:ID="confirms">
-    <rdfs:subPropertyOf rdf:resource="PROV-S#wasDerivedFrom"/>
+    <rdfs:subPropertyOf rdf:resource="PROV-S#wasImpactedBy"/>
     <rdfs:comment xml:lang="en">Parent test(s) of this test result</rdfs:comment>
-    <rdfs:range rdf:resource="PROV-S#ENTITY"/>
+    <rdfs:range rdf:resource="#TEST"/>
     <rdfs:domain rdf:resource="#TEST_RESULT"/>
   </owl:ObjectProperty>
   <owl:ObjectProperty rdf:ID="executedBy">
@@ -86,7 +95,7 @@
     <rdfs:range rdf:resource="PROV-S#ACTIVITY"/>
     <rdfs:domain rdf:resource="#TEST_RESULT"/>
   </owl:ObjectProperty>
-  <owl:ObjectProperty rdf:ID="result">
+  <owl:ObjectProperty rdf:about="#result">
     <rdfs:comment xml:lang="en">Pass/Failed/Indeterminate status resulting from a TEST_EXECUTION</rdfs:comment>
     <rdfs:range rdf:resource="#TEST_STATUS"/>
     <rdfs:domain rdf:resource="#TEST_RESULT"/>

diff --git a/RACK-Ontology/ontology/TESTING.sadl b/RACK-Ontology/ontology/TESTING.sadl
@@ -10,6 +10,12 @@
  * of the Defense Advanced Research Projects Agency (DARPA).
  */
 
+ /************** edit history *****************
+  *
+  * dwa - 11 Nov 2020 - removed incorrect usages of relationships
+  *
+  *********************************************/
+
 uri "http://arcos.rack/TESTING" alias tst.
 import "http://arcos.rack/PROV-S".
 
@@ -18,7 +24,7 @@ TEST
 	is a type of ENTITY.
 
 	verifies (note "Parent ENTITY(s) (e.g. REQUIREMENT) that this requirement is derived from") describes TEST with values of type ENTITY.
-	verifies is a type of wasDerivedFrom.
+	verifies is a type of wasImpactedBy.
 
 	producedBy (note "TEST_DEVELOPMENT activity(s) this test belongs to") describes TEST with values of type ACTIVITY.
 	producedBy is a type of wasGeneratedBy.
@@ -34,10 +40,10 @@ TEST_RESULT
 	(note "Result corresponding to one execution of one TEST")
 	is a type of ENTITY.
 
-	result (note "Pass/Failed/Indeterminate status resulting from a TEST_EXECUTION") describes TEST_RESULT with values of type TEST_STATUS.
+	result (note "Pass/Failed/Indeterminate status resulting from a TEST_EXECUTION") describes TEST_RESULT with a single value of type TEST_STATUS.
 
-	confirms (note "Parent test(s) of this test result") describes TEST_RESULT with values of type ENTITY.
-	confirms is a type of wasDerivedFrom.
+	confirms (note "Parent test(s) of this test result") describes TEST_RESULT with values of type TEST.
+	confirms is a type of wasImpactedBy.
 
 	executedBy (note "ACTIVITY(s) that created this test result") describes TEST_RESULT with values of type ACTIVITY.
 	executedBy is a type of wasGeneratedBy.