Merge pull request #5 from casework/AC-183

ajnelson-nist · web-flow · commit b7ea257d92de · 2021-06-08T21:17:09.000-04:00
Ac 183
diff --git a/Makefile b/Makefile
@@ -48,6 +48,12 @@ clean:
 	@$(MAKE) \
 	  --directory tests \
 	  clean
+	@rm -f \
+	  .git_submodule_init.done.log
+	@#Remove flag files that are normally set after deeper submodules and rdf-toolkit are downloaded.
+	@rm -f \
+	  dependencies/CASE-Examples-QC/.git_submodule_init.done.log \
+	  dependencies/CASE-Examples-QC/.lib.done.log
 
 distclean: \
   clean
diff --git a/README.md b/README.md
@@ -58,8 +58,8 @@ This project follows [SEMVER 2.0.0](https://semver.org/) where versions are decl
 
 This repository supports the ontology versions that are linked as submodules in the [CASE Examples QC](https://github.com/ajnelson-nist/CASE-Examples-QC) repository.  Currently, the ontology versions are:
 
-* CASE - 0.3.0
-* UCO - 0.5.0
+* CASE - 0.4.0
+* UCO - 0.6.0
 
 
 ## Repository locations
diff --git a/case_utils/case_file/__init__.py b/case_utils/case_file/__init__.py
@@ -87,7 +87,7 @@ def create_file_node(graph, filepath, node_iri=None, node_prefix=DEFAULT_PREFIX,
     graph.add((
       n_file_facet,
       NS_UCO_OBSERVABLE.sizeInBytes,
-      rdflib.Literal(file_stat.st_size, datatype=NS_XSD.long)
+      rdflib.Literal(int(file_stat.st_size))
     ))
     graph.add((
       n_file,
@@ -174,7 +174,7 @@ def create_file_node(graph, filepath, node_iri=None, node_prefix=DEFAULT_PREFIX,
         graph.add((
           n_contentdata_facet,
           NS_UCO_OBSERVABLE.sizeInBytes,
-          rdflib.Literal(successful_hashdict["filesize"], datatype=NS_XSD.long)
+          rdflib.Literal(successful_hashdict["filesize"])
         ))
 
         # Add confirmed hashes into graph.
diff --git a/dependencies/CASE-Examples-QC b/dependencies/CASE-Examples-QC
@@ -1 +1 @@
-Subproject commit 574a6a14920f43c7a7b06db1cfca5c96b37cf1b7
+Subproject commit 7a678bc0bb99b9a722b6e5ba4b05ec4cd7525bd3
diff --git a/tests/case_file/Makefile b/tests/case_file/Makefile
@@ -19,9 +19,7 @@ tests_srcdir := $(top_srcdir)/tests
 
 qc_srcdir := $(top_srcdir)/dependencies/CASE-Examples-QC
 
-case_srcdir := $(qc_srcdir)/dependencies/CASE-Examples/dependencies/CASE
-
-RDF_TOOLKIT_JAR := $(case_srcdir)/lib/rdf-toolkit.jar
+RDF_TOOLKIT_JAR := $(qc_srcdir)/dependencies/CASE-Examples/dependencies/CASE-0.3.0/CASE/lib/rdf-toolkit.jar
 
 COMM ?= $(shell which gcomm 2>/dev/null || which comm)
 ifeq ($(COMM),)
diff --git a/tests/case_file/kb.json b/tests/case_file/kb.json
@@ -19,7 +19,7 @@
                     "@value": "2010-01-02T03:04:56+00:00"
                 },
                 "uco-observable:sizeInBytes": {
-                    "@type": "xsd:long",
+                    "@type": "xsd:integer",
                     "@value": "4"
                 }
             }
@@ -77,7 +77,7 @@
                         }
                     ],
                     "uco-observable:sizeInBytes": {
-                        "@type": "xsd:long",
+                        "@type": "xsd:integer",
                         "@value": "4"
                     }
                 },
@@ -89,7 +89,7 @@
                         "@value": "2010-01-02T03:04:56+00:00"
                     },
                     "uco-observable:sizeInBytes": {
-                        "@type": "xsd:long",
+                        "@type": "xsd:integer",
                         "@value": "4"
                     }
                 }
diff --git a/tests/case_file/kb.ttl b/tests/case_file/kb.ttl
@@ -14,7 +14,7 @@ kb:file-16d49634-ba5d-5f46-ab4e-7a577a4e096d
 		a uco-observable:FileFacet ;
 		uco-observable:fileName "sample.txt" ;
 		uco-observable:modifiedTime "2010-01-02T03:04:56+00:00"^^xsd:dateTime ;
-		uco-observable:sizeInBytes "4"^^xsd:long ;
+		uco-observable:sizeInBytes "4"^^xsd:integer ;
 	] ;
 	.
 
@@ -45,13 +45,13 @@ kb:file-57400969-69d0-5d5d-95c4-9dd7de330d3d
 					uco-types:hashValue "ee26b0dd4af7e749aa1a8ee3c10ae9923f618980772e473f8819a5d4940e0db27ac185f8a0e1d5f84f88bc887fd67b143732c304cc5fa9ad8e6f57f50028a8ff"^^xsd:hexBinary ;
 				]
 				;
-			uco-observable:sizeInBytes "4"^^xsd:long ;
+			uco-observable:sizeInBytes "4"^^xsd:integer ;
 		] ,
 		[
 			a uco-observable:FileFacet ;
 			uco-observable:fileName "sample.txt" ;
 			uco-observable:modifiedTime "2010-01-02T03:04:56+00:00"^^xsd:dateTime ;
-			uco-observable:sizeInBytes "4"^^xsd:long ;
+			uco-observable:sizeInBytes "4"^^xsd:integer ;
 		]
 		;
 	.
diff --git a/tests/case_file/sample.txt-disable_hashes.ttl b/tests/case_file/sample.txt-disable_hashes.ttl
@@ -12,7 +12,7 @@ kb:file-16d49634-ba5d-5f46-ab4e-7a577a4e096d
 		a uco-observable:FileFacet ;
 		uco-observable:fileName "sample.txt" ;
 		uco-observable:modifiedTime "2010-01-02T03:04:56+00:00"^^xsd:dateTime ;
-		uco-observable:sizeInBytes "4"^^xsd:long ;
+		uco-observable:sizeInBytes "4"^^xsd:integer ;
 	] ;
 	.
 
diff --git a/tests/case_file/sample.txt-nocompact.json b/tests/case_file/sample.txt-nocompact.json
@@ -40,10 +40,7 @@
           "@id": "_:Na99d1f2a83814ac491c9b02662ea8587"
         }
       ],
-      "https://unifiedcyberontology.org/ontology/uco/observable#sizeInBytes": {
-        "@type": "http://www.w3.org/2001/XMLSchema#long",
-        "@value": "4"
-      }
+      "https://unifiedcyberontology.org/ontology/uco/observable#sizeInBytes": 4
     },
     {
       "@id": "_:Nad6171b4933a4a84b83faa5d48fd4ddb",
@@ -101,10 +98,7 @@
         "@type": "http://www.w3.org/2001/XMLSchema#dateTime",
         "@value": "2010-01-02T03:04:56+00:00"
       },
-      "https://unifiedcyberontology.org/ontology/uco/observable#sizeInBytes": {
-        "@type": "http://www.w3.org/2001/XMLSchema#long",
-        "@value": "4"
-      }
+      "https://unifiedcyberontology.org/ontology/uco/observable#sizeInBytes": 4
     }
   ]
-}
+}
diff --git a/tests/case_file/sample.txt.json b/tests/case_file/sample.txt.json
@@ -40,10 +40,7 @@
                     "@id": "_:N77e79676ee5449ea9f6db813fb9dc095"
                 }
             ],
-            "uco-observable:sizeInBytes": {
-                "@type": "xsd:long",
-                "@value": "4"
-            }
+            "uco-observable:sizeInBytes": 4
         },
         {
             "@id": "_:N839986b2d63a4963beafbb65016449da",
@@ -101,10 +98,7 @@
                 "@type": "xsd:dateTime",
                 "@value": "2010-01-02T03:04:56+00:00"
             },
-            "uco-observable:sizeInBytes": {
-                "@type": "xsd:long",
-                "@value": "4"
-            }
+            "uco-observable:sizeInBytes": 4
         }
     ]
-}
+}
diff --git a/tests/case_file/sample.txt.ttl b/tests/case_file/sample.txt.ttl
@@ -35,13 +35,13 @@ kb:file-57400969-69d0-5d5d-95c4-9dd7de330d3d
 					uco-types:hashValue "ee26b0dd4af7e749aa1a8ee3c10ae9923f618980772e473f8819a5d4940e0db27ac185f8a0e1d5f84f88bc887fd67b143732c304cc5fa9ad8e6f57f50028a8ff"^^xsd:hexBinary ;
 				]
 				;
-			uco-observable:sizeInBytes "4"^^xsd:long ;
+			uco-observable:sizeInBytes "4"^^xsd:integer ;
 		] ,
 		[
 			a uco-observable:FileFacet ;
 			uco-observable:fileName "sample.txt" ;
 			uco-observable:modifiedTime "2010-01-02T03:04:56+00:00"^^xsd:dateTime ;
-			uco-observable:sizeInBytes "4"^^xsd:long ;
+			uco-observable:sizeInBytes "4"^^xsd:integer ;
 		]
 		;
 	.

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`"@value": "2010-01-02T03:04:56+00:00"`
`20`	`20`	`},`
`21`	`21`	`"uco-observable:sizeInBytes": {`
`22`		`- "@type": "xsd:long",`
	`22`	`+ "@type": "xsd:integer",`
`23`	`23`	`"@value": "4"`
`24`	`24`	`}`
`25`	`25`	`}`
`@@ -77,7 +77,7 @@`
`77`	`77`	`}`
`78`	`78`	`],`
`79`	`79`	`"uco-observable:sizeInBytes": {`
`80`		`- "@type": "xsd:long",`
	`80`	`+ "@type": "xsd:integer",`
`81`	`81`	`"@value": "4"`
`82`	`82`	`}`
`83`	`83`	`},`
`@@ -89,7 +89,7 @@`
`89`	`89`	`"@value": "2010-01-02T03:04:56+00:00"`
`90`	`90`	`},`
`91`	`91`	`"uco-observable:sizeInBytes": {`
`92`		`- "@type": "xsd:long",`
	`92`	`+ "@type": "xsd:integer",`
`93`	`93`	`"@value": "4"`
`94`	`94`	`}`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ kb:file-16d49634-ba5d-5f46-ab4e-7a577a4e096d`
`14`	`14`	`a uco-observable:FileFacet ;`
`15`	`15`	`uco-observable:fileName "sample.txt" ;`
`16`	`16`	`uco-observable:modifiedTime "2010-01-02T03:04:56+00:00"^^xsd:dateTime ;`
`17`		`- uco-observable:sizeInBytes "4"^^xsd:long ;`
	`17`	`+ uco-observable:sizeInBytes "4"^^xsd:integer ;`
`18`	`18`	`] ;`
`19`	`19`	`.`
`20`	`20`
`@@ -45,13 +45,13 @@ kb:file-57400969-69d0-5d5d-95c4-9dd7de330d3d`
`45`	`45`	`uco-types:hashValue "ee26b0dd4af7e749aa1a8ee3c10ae9923f618980772e473f8819a5d4940e0db27ac185f8a0e1d5f84f88bc887fd67b143732c304cc5fa9ad8e6f57f50028a8ff"^^xsd:hexBinary ;`
`46`	`46`	`]`
`47`	`47`	`;`
`48`		`- uco-observable:sizeInBytes "4"^^xsd:long ;`
	`48`	`+ uco-observable:sizeInBytes "4"^^xsd:integer ;`
`49`	`49`	`] ,`
`50`	`50`	`[`
`51`	`51`	`a uco-observable:FileFacet ;`
`52`	`52`	`uco-observable:fileName "sample.txt" ;`
`53`	`53`	`uco-observable:modifiedTime "2010-01-02T03:04:56+00:00"^^xsd:dateTime ;`
`54`		`- uco-observable:sizeInBytes "4"^^xsd:long ;`
	`54`	`+ uco-observable:sizeInBytes "4"^^xsd:integer ;`
`55`	`55`	`]`
`56`	`56`	`;`
`57`	`57`	`.`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ kb:file-16d49634-ba5d-5f46-ab4e-7a577a4e096d`
`12`	`12`	`a uco-observable:FileFacet ;`
`13`	`13`	`uco-observable:fileName "sample.txt" ;`
`14`	`14`	`uco-observable:modifiedTime "2010-01-02T03:04:56+00:00"^^xsd:dateTime ;`
`15`		`- uco-observable:sizeInBytes "4"^^xsd:long ;`
	`15`	`+ uco-observable:sizeInBytes "4"^^xsd:integer ;`
`16`	`16`	`] ;`
`17`	`17`	`.`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,7 @@`
`40`	`40`	`"@id": "_:Na99d1f2a83814ac491c9b02662ea8587"`
`41`	`41`	`}`
`42`	`42`	`],`
`43`		`- "https://unifiedcyberontology.org/ontology/uco/observable#sizeInBytes": {`
`44`		`- "@type": "http://www.w3.org/2001/XMLSchema#long",`
`45`		`- "@value": "4"`
`46`		`- }`
	`43`	`+ "https://unifiedcyberontology.org/ontology/uco/observable#sizeInBytes": 4`
`47`	`44`	`},`
`48`	`45`	`{`
`49`	`46`	`"@id": "_:Nad6171b4933a4a84b83faa5d48fd4ddb",`
`@@ -101,10 +98,7 @@`
`101`	`98`	`"@type": "http://www.w3.org/2001/XMLSchema#dateTime",`
`102`	`99`	`"@value": "2010-01-02T03:04:56+00:00"`
`103`	`100`	`},`
`104`		`- "https://unifiedcyberontology.org/ontology/uco/observable#sizeInBytes": {`
`105`		`- "@type": "http://www.w3.org/2001/XMLSchema#long",`
`106`		`- "@value": "4"`
`107`		`- }`
	`101`	`+ "https://unifiedcyberontology.org/ontology/uco/observable#sizeInBytes": 4`
`108`	`102`	`}`
`109`	`103`	`]`
`110`		`-}`
	`104`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -35,13 +35,13 @@ kb:file-57400969-69d0-5d5d-95c4-9dd7de330d3d`
`35`	`35`	`uco-types:hashValue "ee26b0dd4af7e749aa1a8ee3c10ae9923f618980772e473f8819a5d4940e0db27ac185f8a0e1d5f84f88bc887fd67b143732c304cc5fa9ad8e6f57f50028a8ff"^^xsd:hexBinary ;`
`36`	`36`	`]`
`37`	`37`	`;`
`38`		`- uco-observable:sizeInBytes "4"^^xsd:long ;`
	`38`	`+ uco-observable:sizeInBytes "4"^^xsd:integer ;`
`39`	`39`	`] ,`
`40`	`40`	`[`
`41`	`41`	`a uco-observable:FileFacet ;`
`42`	`42`	`uco-observable:fileName "sample.txt" ;`
`43`	`43`	`uco-observable:modifiedTime "2010-01-02T03:04:56+00:00"^^xsd:dateTime ;`
`44`		`- uco-observable:sizeInBytes "4"^^xsd:long ;`
	`44`	`+ uco-observable:sizeInBytes "4"^^xsd:integer ;`
`45`	`45`	`]`
`46`	`46`	`;`
`47`	`47`	`.`