Bump CASE pointer to 1.4.0 release; update inherited tests; remove Vocabulary datatyping

A follow-on patch will regenerate Make-managed files.

Signed-off-by: Alex Nelson <[email protected]>

Author: ajnelson-nist

case_utils/case_file/__init__.py

@@ -38,7 +38,6 @@
     NS_UCO_CORE,
     NS_UCO_OBSERVABLE,
     NS_UCO_TYPES,
-    NS_UCO_VOCABULARY,
     NS_XSD,
 )
 
@@ -228,14 +227,9 @@ def create_file_node(
 
             l_hash_method: rdflib.Literal
             if key in ("sha3_256", "sha3_512"):
-                l_hash_method = rdflib.Literal(
-                    key.replace("_", "-").upper(),
-                    datatype=NS_UCO_VOCABULARY.HashNameVocab,
-                )
+                l_hash_method = rdflib.Literal(key.replace("_", "-").upper())
             else:
-                l_hash_method = rdflib.Literal(
-                    key.upper(), datatype=NS_UCO_VOCABULARY.HashNameVocab
-                )
+                l_hash_method = rdflib.Literal(key.upper())
 
             hash_value: str = getattr(successful_hashdict, key)
             l_hash_value = rdflib.Literal(hash_value.upper(), datatype=NS_XSD.hexBinary)
@@ -300,7 +294,6 @@ def main() -> None:
     graph.namespace_manager.bind("uco-core", NS_UCO_CORE)
     graph.namespace_manager.bind("uco-observable", NS_UCO_OBSERVABLE)
     graph.namespace_manager.bind("uco-types", NS_UCO_TYPES)
-    graph.namespace_manager.bind("uco-vocabulary", NS_UCO_VOCABULARY)
     graph.namespace_manager.bind("xsd", NS_XSD)
 
     output_format = None

case_utils/inherent_uuid.py

@@ -66,16 +66,16 @@
 
 from rdflib import Literal, Namespace, URIRef
 
-from case_utils.namespace import NS_UCO_CORE, NS_UCO_VOCABULARY, NS_XSD
-
-L_MD5 = Literal("MD5", datatype=NS_UCO_VOCABULARY.HashNameVocab)
-L_SHA1 = Literal("SHA1", datatype=NS_UCO_VOCABULARY.HashNameVocab)
-L_SHA256 = Literal("SHA256", datatype=NS_UCO_VOCABULARY.HashNameVocab)
-L_SHA3_256 = Literal("SHA3-256", datatype=NS_UCO_VOCABULARY.HashNameVocab)
-L_SHA3_512 = Literal("SHA3-512", datatype=NS_UCO_VOCABULARY.HashNameVocab)
-L_SHA384 = Literal("SHA384", datatype=NS_UCO_VOCABULARY.HashNameVocab)
-L_SHA512 = Literal("SHA512", datatype=NS_UCO_VOCABULARY.HashNameVocab)
-L_SSDEEP = Literal("SSDEEP", datatype=NS_UCO_VOCABULARY.HashNameVocab)
+from case_utils.namespace import NS_UCO_CORE, NS_XSD
+
+L_MD5 = Literal("MD5")
+L_SHA1 = Literal("SHA1")
+L_SHA256 = Literal("SHA256")
+L_SHA3_256 = Literal("SHA3-256")
+L_SHA3_512 = Literal("SHA3-512")
+L_SHA384 = Literal("SHA384")
+L_SHA512 = Literal("SHA512")
+L_SSDEEP = Literal("SSDEEP")
 
 # Key: hashMethod literal.
 # Value: Tuple.

case_utils/ontology/version_info.py

@@ -27,7 +27,7 @@
 __all__ = ["CURRENT_CASE_VERSION", "built_version_choices_list"]
 
 # Tested with CI to match versionInfo of <https://ontology.caseontology.org/case/case>.
-CURRENT_CASE_VERSION: str = "1.3.0"
+CURRENT_CASE_VERSION: str = "1.4.0"
 
 # Tested with CI to match set of ontology files available.
 built_version_choices_list = [
@@ -39,6 +39,7 @@
     "case-1.0.0",
     "case-1.1.0",
     "case-1.2.0",
+    "case-1.3.0",
     "case-" + CURRENT_CASE_VERSION,
 ]
 

dependencies/CASE

@@ -30,12 +30,16 @@ validation_ttls := \
   action_inheritance_PASS_validation.ttl \
   action_inheritance_XFAIL_validation.ttl \
   action_result_PASS_validation.ttl \
+  alternate_data_stream_PASS_validation.ttl \
   co_PASS_validation.ttl \
   co_XFAIL_validation.ttl \
   configuration_setting_PASS_validation.ttl \
   configuration_setting_XFAIL_validation.ttl \
   database_records_PASS_validation.ttl \
   database_records_XFAIL_validation.ttl \
+  dictionary_PASS_validation.ttl \
+  dictionary_XFAIL_validation.ttl \
+  disjointedness_PASS_validation.ttl \
   event_XFAIL_validation.ttl \
   file_url_PASS_validation.ttl \
   has_facet_inverse_functional_PASS_validation.ttl \
@@ -46,7 +50,10 @@ validation_ttls := \
   location_XFAIL_validation.ttl \
   message_thread_PASS_validation.ttl \
   message_thread_XFAIL_validation.ttl \
+  object_status_PASS_validation.ttl \
+  object_status_XFAIL_validation.ttl \
   observable_creation_time_PASS_validation.ttl \
+  operating_system_PASS_validation.ttl \
   owl_axiom_PASS_validation.ttl \
   owl_axiom_XFAIL_validation.ttl \
   owl_properties_PASS_validation.ttl \