Merge pull request #605 from ucoProject/BugFix-Issue-590-2.0.0

Issue 590: Change AlternateDataStream parent class to FileSystemObject
ucoProject · Jun 17, 2024 · 6591982 · 6591982
2 parents 2661f7a + 4339521
commit 6591982
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 38 deletions.
diff --git a/ontology/uco/observable/observable.ttl b/ontology/uco/observable/observable.ttl
@@ -237,17 +237,9 @@ observable:AlternateDataStream
 		owl:Class ,
 		sh:NodeShape
 		;
-	rdfs:subClassOf observable:ObservableObject ;
+	rdfs:subClassOf observable:FileSystemObject ;
 	rdfs:label "AlternateDataStream"@en ;
 	rdfs:comment "An alternate data stream is data content stored within an NTFS file that is independent of the standard content stream of the file and is hidden from access by default NTFS file viewing mechanisms."@en ;
-	rdfs:seeAlso [
-		a sh:NodeShape ;
-		rdfs:comment "This anonymous shape is attached with rdfs:seeAlso in order to associate a warning-severity class constraint, that will only be necessary as an independent shape until UCO 2.0.0."@en ;
-		sh:class observable:FileSystemObject ;
-		sh:message "In UCO 2.0.0, uco-observable:AlternateDataStream will be a subclass of uco-observable:FileSystemObject.  In preparation for UCO 2.0.0, the additional type uco-observable:FileSystemObject should be assigned to this node."@en ;
-		sh:severity sh:Warning ;
-		sh:targetClass observable:AlternateDataStream ;
-	] ;
 	sh:targetClass observable:AlternateDataStream ;
 	.
 

diff --git a/tests/examples/alternate_data_stream_PASS.json b/tests/examples/alternate_data_stream_PASS.json
@@ -1,21 +1,16 @@
 {
     "@context": {
         "kb": "http://example.org/kb/",
-        "observable": "https://ontology.unifiedcyberontology.org/uco/observable/",
-        "rdfs": "http://www.w3.org/2000/01/rdf-schema#"
+        "observable": "https://ontology.unifiedcyberontology.org/uco/observable/"
     },
     "@graph": [
         {
             "@id": "kb:AlternateDataStream-07b3c41a-080c-4916-8375-c18148763e13",
-            "@type": "observable:AlternateDataStream",
-            "rdfs:comment": "This node should trigger a sh:Warning from not being a observable:FileSystemObject"
+            "@type": "observable:AlternateDataStream"
         },
         {
             "@id": "kb:AlternateDataStream-b2d4968b-4490-4b44-a56b-832058834454",
-            "@type": [
-                "observable:AlternateDataStream",
-                "observable:FileSystemObject"
-            ]
+            "@type": "observable:AlternateDataStream"
         }
     ]
 }
diff --git a/tests/examples/alternate_data_stream_PASS_validation.ttl b/tests/examples/alternate_data_stream_PASS_validation.ttl
@@ -1,4 +1,3 @@
-@prefix observable: <https://ontology.unifiedcyberontology.org/uco/observable/> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@@ -8,21 +7,5 @@
 []
 	a sh:ValidationReport ;
 	sh:conforms "true"^^xsd:boolean ;
-	sh:result [
-		a sh:ValidationResult ;
-		sh:focusNode <http://example.org/kb/AlternateDataStream-07b3c41a-080c-4916-8375-c18148763e13> ;
-		sh:resultMessage "In UCO 2.0.0, uco-observable:AlternateDataStream will be a subclass of uco-observable:FileSystemObject.  In preparation for UCO 2.0.0, the additional type uco-observable:FileSystemObject should be assigned to this node."@en ;
-		sh:resultSeverity sh:Warning ;
-		sh:sourceConstraintComponent sh:ClassConstraintComponent ;
-		sh:sourceShape [
-			a sh:NodeShape ;
-			rdfs:comment "This anonymous shape is attached with rdfs:seeAlso in order to associate a warning-severity class constraint, that will only be necessary as an independent shape until UCO 2.0.0."@en ;
-			sh:class observable:FileSystemObject ;
-			sh:message "In UCO 2.0.0, uco-observable:AlternateDataStream will be a subclass of uco-observable:FileSystemObject.  In preparation for UCO 2.0.0, the additional type uco-observable:FileSystemObject should be assigned to this node."@en ;
-			sh:severity sh:Warning ;
-			sh:targetClass observable:AlternateDataStream ;
-		] ;
-		sh:value <http://example.org/kb/AlternateDataStream-07b3c41a-080c-4916-8375-c18148763e13> ;
-	] ;
 	.
 
diff --git a/tests/examples/test_validation.py b/tests/examples/test_validation.py
@@ -180,10 +180,7 @@ def test_action_result_PASS_validation() -> None:
 def test_alternate_data_stream_PASS_validation() -> None:
     confirm_validation_results(
       "alternate_data_stream_PASS_validation.ttl",
-      True,
-      expected_focus_node_severities={
-        ("http://example.org/kb/AlternateDataStream-07b3c41a-080c-4916-8375-c18148763e13", str(NS_SH.Warning)),
-      }
+      True
     )
 
 def test_configuration_setting_PASS_validation() -> None: