Regenerate Make-managed files

ajnelson-nist · ajnelson-nist · commit 6f9458f41114 · 2021-11-10T17:26:40.000-05:00
References:
* [UCO OC-65] (CP-13) UCO needs subclasses of ObservableObject

Signed-off-by: Alex Nelson &lt;alexander.nelson@nist.gov&gt;
diff --git a/tests/case_utils/case_file/kb.json b/tests/case_utils/case_file/kb.json
@@ -10,7 +10,7 @@
     "@graph": [
         {
             "@id": "kb:file-69751792-9d04-5f5f-8791-99ca3729cd3c",
-            "@type": "uco-observable:ObservableObject",
+            "@type": "uco-observable:File",
             "uco-core:hasFacet": {
                 "@type": "uco-observable:FileFacet",
                 "uco-observable:fileName": "sample.txt",
@@ -26,7 +26,7 @@
         },
         {
             "@id": "kb:file-9477a6eb-3a94-590b-b51e-6ce6892f0941",
-            "@type": "uco-observable:ObservableObject",
+            "@type": "uco-observable:File",
             "uco-core:hasFacet": [
                 {
                     "@type": "uco-observable:ContentDataFacet",
diff --git a/tests/case_utils/case_file/kb.ttl b/tests/case_utils/case_file/kb.ttl
@@ -9,7 +9,7 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 kb:file-69751792-9d04-5f5f-8791-99ca3729cd3c
-	a uco-observable:ObservableObject ;
+	a uco-observable:File ;
 	uco-core:hasFacet [
 		a uco-observable:FileFacet ;
 		uco-observable:fileName "sample.txt" ;
@@ -19,7 +19,7 @@ kb:file-69751792-9d04-5f5f-8791-99ca3729cd3c
 	.
 
 kb:file-9477a6eb-3a94-590b-b51e-6ce6892f0941
-	a uco-observable:ObservableObject ;
+	a uco-observable:File ;
 	uco-core:hasFacet
 		[
 			a uco-observable:ContentDataFacet ;
diff --git a/tests/case_utils/case_file/sample.txt-disable_hashes.ttl b/tests/case_utils/case_file/sample.txt-disable_hashes.ttl
@@ -7,7 +7,7 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 kb:file-69751792-9d04-5f5f-8791-99ca3729cd3c
-	a uco-observable:ObservableObject ;
+	a uco-observable:File ;
 	uco-core:hasFacet [
 		a uco-observable:FileFacet ;
 		uco-observable:fileName "sample.txt" ;
diff --git a/tests/case_utils/case_file/sample.txt-nocompact.json b/tests/case_utils/case_file/sample.txt-nocompact.json
@@ -13,18 +13,18 @@
   "@graph": [
     {
       "@id": "http://example.org/kb/file-4216a9f3-45fc-55aa-8e48-a9f828173625",
-      "@type": "https://unifiedcyberontology.org/ontology/uco/observable#ObservableObject",
+      "@type": "https://unifiedcyberontology.org/ontology/uco/observable#File",
       "https://unifiedcyberontology.org/ontology/uco/core#hasFacet": [
         {
-          "@id": "_:Ncbd74ec540fa42b09802cdf033ec0e86"
+          "@id": "_:N44ce7f76801a429d9aabefe1046da060"
         },
         {
-          "@id": "_:N1b091168b6e746ca8ffef67ba546f52c"
+          "@id": "_:Ndd6e8785860848aeb6823b493c6420a7"
         }
       ]
     },
     {
-      "@id": "_:Ncbd74ec540fa42b09802cdf033ec0e86",
+      "@id": "_:N44ce7f76801a429d9aabefe1046da060",
       "@type": "https://unifiedcyberontology.org/ontology/uco/observable#FileFacet",
       "https://unifiedcyberontology.org/ontology/uco/observable#fileName": "sample.txt",
       "https://unifiedcyberontology.org/ontology/uco/observable#modifiedTime": {
@@ -34,26 +34,26 @@
       "https://unifiedcyberontology.org/ontology/uco/observable#sizeInBytes": 4
     },
     {
-      "@id": "_:N1b091168b6e746ca8ffef67ba546f52c",
+      "@id": "_:Ndd6e8785860848aeb6823b493c6420a7",
       "@type": "https://unifiedcyberontology.org/ontology/uco/observable#ContentDataFacet",
       "https://unifiedcyberontology.org/ontology/uco/observable#hash": [
         {
-          "@id": "_:Nf0f6ff73c49045ffa53e2fc83249d20b"
+          "@id": "_:N334acc4a58624aa29968e0d155bd34c7"
         },
         {
-          "@id": "_:Na2470e1f29914026a1690b0e9386cc1f"
+          "@id": "_:Na1176e4f42e442b2bd4167202aa93383"
         },
         {
-          "@id": "_:Nd8473ff30e87456d8dcd034729ba27ed"
+          "@id": "_:N400f582d54af4f8190253677f57de728"
         },
         {
-          "@id": "_:Ncaa10f1e5cf84d8286f1d1c536b9fa06"
+          "@id": "_:Nef2949777f2b4b34a46a7d99ea01f44e"
         }
       ],
       "https://unifiedcyberontology.org/ontology/uco/observable#sizeInBytes": 4
     },
     {
-      "@id": "_:Nf0f6ff73c49045ffa53e2fc83249d20b",
+      "@id": "_:N334acc4a58624aa29968e0d155bd34c7",
       "@type": "https://unifiedcyberontology.org/ontology/uco/types#Hash",
       "https://unifiedcyberontology.org/ontology/uco/types#hashMethod": {
         "@type": "https://unifiedcyberontology.org/ontology/uco/vocabulary#HashNameVocab",
@@ -65,7 +65,7 @@
       }
     },
     {
-      "@id": "_:Na2470e1f29914026a1690b0e9386cc1f",
+      "@id": "_:Na1176e4f42e442b2bd4167202aa93383",
       "@type": "https://unifiedcyberontology.org/ontology/uco/types#Hash",
       "https://unifiedcyberontology.org/ontology/uco/types#hashMethod": {
         "@type": "https://unifiedcyberontology.org/ontology/uco/vocabulary#HashNameVocab",
@@ -77,7 +77,7 @@
       }
     },
     {
-      "@id": "_:Nd8473ff30e87456d8dcd034729ba27ed",
+      "@id": "_:N400f582d54af4f8190253677f57de728",
       "@type": "https://unifiedcyberontology.org/ontology/uco/types#Hash",
       "https://unifiedcyberontology.org/ontology/uco/types#hashMethod": {
         "@type": "https://unifiedcyberontology.org/ontology/uco/vocabulary#HashNameVocab",
@@ -89,7 +89,7 @@
       }
     },
     {
-      "@id": "_:Ncaa10f1e5cf84d8286f1d1c536b9fa06",
+      "@id": "_:Nef2949777f2b4b34a46a7d99ea01f44e",
       "@type": "https://unifiedcyberontology.org/ontology/uco/types#Hash",
       "https://unifiedcyberontology.org/ontology/uco/types#hashMethod": {
         "@type": "https://unifiedcyberontology.org/ontology/uco/vocabulary#HashNameVocab",
diff --git a/tests/case_utils/case_file/sample.txt.json b/tests/case_utils/case_file/sample.txt.json
@@ -13,18 +13,18 @@
     "@graph": [
         {
             "@id": "kb:file-a44b2ee3-968f-5528-883a-fa65ac45ce2c",
-            "@type": "uco-observable:ObservableObject",
+            "@type": "uco-observable:File",
             "uco-core:hasFacet": [
                 {
-                    "@id": "_:N4acc005af38245cb843d4a7009cce7df"
+                    "@id": "_:N2767c0726ce542be9a1ad27b1f7ae944"
                 },
                 {
-                    "@id": "_:Nc02deac289534fbf93c061d03bbb589d"
+                    "@id": "_:N78869d50bb384b24b8fd147d9bfe7e51"
                 }
             ]
         },
         {
-            "@id": "_:N4acc005af38245cb843d4a7009cce7df",
+            "@id": "_:N2767c0726ce542be9a1ad27b1f7ae944",
             "@type": "uco-observable:FileFacet",
             "uco-observable:fileName": "sample.txt",
             "uco-observable:modifiedTime": {
@@ -34,26 +34,26 @@
             "uco-observable:sizeInBytes": 4
         },
         {
-            "@id": "_:Nc02deac289534fbf93c061d03bbb589d",
+            "@id": "_:N78869d50bb384b24b8fd147d9bfe7e51",
             "@type": "uco-observable:ContentDataFacet",
             "uco-observable:hash": [
                 {
-                    "@id": "_:Nbbf71d61d9fa4615bc074268fd60b4b5"
+                    "@id": "_:N6407c0f0a27545e0a15a7e147e862003"
                 },
                 {
-                    "@id": "_:N6741cf44d9da464191c6a0014dbb602b"
+                    "@id": "_:Na90e92d493a84c78802a307bbbdaafda"
                 },
                 {
-                    "@id": "_:N3b6cc89816394294bc260958408d74de"
+                    "@id": "_:Nfe3e54d32dcc4ef79934ca120dc3d59e"
                 },
                 {
-                    "@id": "_:Nfc008212dd584b16a8d4d50df33f0a47"
+                    "@id": "_:N80c90d89e47b4f30b585752201376e22"
                 }
             ],
             "uco-observable:sizeInBytes": 4
         },
         {
-            "@id": "_:Nbbf71d61d9fa4615bc074268fd60b4b5",
+            "@id": "_:N6407c0f0a27545e0a15a7e147e862003",
             "@type": "uco-types:Hash",
             "uco-types:hashMethod": {
                 "@type": "uco-vocabulary:HashNameVocab",
@@ -65,7 +65,7 @@
             }
         },
         {
-            "@id": "_:N6741cf44d9da464191c6a0014dbb602b",
+            "@id": "_:Na90e92d493a84c78802a307bbbdaafda",
             "@type": "uco-types:Hash",
             "uco-types:hashMethod": {
                 "@type": "uco-vocabulary:HashNameVocab",
@@ -77,7 +77,7 @@
             }
         },
         {
-            "@id": "_:N3b6cc89816394294bc260958408d74de",
+            "@id": "_:Nfe3e54d32dcc4ef79934ca120dc3d59e",
             "@type": "uco-types:Hash",
             "uco-types:hashMethod": {
                 "@type": "uco-vocabulary:HashNameVocab",
@@ -89,7 +89,7 @@
             }
         },
         {
-            "@id": "_:Nfc008212dd584b16a8d4d50df33f0a47",
+            "@id": "_:N80c90d89e47b4f30b585752201376e22",
             "@type": "uco-types:Hash",
             "uco-types:hashMethod": {
                 "@type": "uco-vocabulary:HashNameVocab",
diff --git a/tests/case_utils/case_file/sample.txt.ttl b/tests/case_utils/case_file/sample.txt.ttl
@@ -9,7 +9,7 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 kb:file-9477a6eb-3a94-590b-b51e-6ce6892f0941
-	a uco-observable:ObservableObject ;
+	a uco-observable:File ;
 	uco-core:hasFacet
 		[
 			a uco-observable:ContentDataFacet ;

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`"@graph": [`
`11`	`11`	`{`
`12`	`12`	`"@id": "kb:file-69751792-9d04-5f5f-8791-99ca3729cd3c",`
`13`		`- "@type": "uco-observable:ObservableObject",`
	`13`	`+ "@type": "uco-observable:File",`
`14`	`14`	`"uco-core:hasFacet": {`
`15`	`15`	`"@type": "uco-observable:FileFacet",`
`16`	`16`	`"uco-observable:fileName": "sample.txt",`
`@@ -26,7 +26,7 @@`
`26`	`26`	`},`
`27`	`27`	`{`
`28`	`28`	`"@id": "kb:file-9477a6eb-3a94-590b-b51e-6ce6892f0941",`
`29`		`- "@type": "uco-observable:ObservableObject",`
	`29`	`+ "@type": "uco-observable:File",`
`30`	`30`	`"uco-core:hasFacet": [`
`31`	`31`	`{`
`32`	`32`	`"@type": "uco-observable:ContentDataFacet",`
Original file line number	Diff line number	Diff line change
`@@ -13,18 +13,18 @@`
`13`	`13`	`"@graph": [`
`14`	`14`	`{`
`15`	`15`	`"@id": "http://example.org/kb/file-4216a9f3-45fc-55aa-8e48-a9f828173625",`
`16`		`- "@type": "https://unifiedcyberontology.org/ontology/uco/observable#ObservableObject",`
	`16`	`+ "@type": "https://unifiedcyberontology.org/ontology/uco/observable#File",`
`17`	`17`	`"https://unifiedcyberontology.org/ontology/uco/core#hasFacet": [`
`18`	`18`	`{`
`19`		`- "@id": "_:Ncbd74ec540fa42b09802cdf033ec0e86"`
	`19`	`+ "@id": "_:N44ce7f76801a429d9aabefe1046da060"`
`20`	`20`	`},`
`21`	`21`	`{`
`22`		`- "@id": "_:N1b091168b6e746ca8ffef67ba546f52c"`
	`22`	`+ "@id": "_:Ndd6e8785860848aeb6823b493c6420a7"`
`23`	`23`	`}`
`24`	`24`	`]`
`25`	`25`	`},`
`26`	`26`	`{`
`27`		`- "@id": "_:Ncbd74ec540fa42b09802cdf033ec0e86",`
	`27`	`+ "@id": "_:N44ce7f76801a429d9aabefe1046da060",`
`28`	`28`	`"@type": "https://unifiedcyberontology.org/ontology/uco/observable#FileFacet",`
`29`	`29`	`"https://unifiedcyberontology.org/ontology/uco/observable#fileName": "sample.txt",`
`30`	`30`	`"https://unifiedcyberontology.org/ontology/uco/observable#modifiedTime": {`
`@@ -34,26 +34,26 @@`
`34`	`34`	`"https://unifiedcyberontology.org/ontology/uco/observable#sizeInBytes": 4`
`35`	`35`	`},`
`36`	`36`	`{`
`37`		`- "@id": "_:N1b091168b6e746ca8ffef67ba546f52c",`
	`37`	`+ "@id": "_:Ndd6e8785860848aeb6823b493c6420a7",`
`38`	`38`	`"@type": "https://unifiedcyberontology.org/ontology/uco/observable#ContentDataFacet",`
`39`	`39`	`"https://unifiedcyberontology.org/ontology/uco/observable#hash": [`
`40`	`40`	`{`
`41`		`- "@id": "_:Nf0f6ff73c49045ffa53e2fc83249d20b"`
	`41`	`+ "@id": "_:N334acc4a58624aa29968e0d155bd34c7"`
`42`	`42`	`},`
`43`	`43`	`{`
`44`		`- "@id": "_:Na2470e1f29914026a1690b0e9386cc1f"`
	`44`	`+ "@id": "_:Na1176e4f42e442b2bd4167202aa93383"`
`45`	`45`	`},`
`46`	`46`	`{`
`47`		`- "@id": "_:Nd8473ff30e87456d8dcd034729ba27ed"`
	`47`	`+ "@id": "_:N400f582d54af4f8190253677f57de728"`
`48`	`48`	`},`
`49`	`49`	`{`
`50`		`- "@id": "_:Ncaa10f1e5cf84d8286f1d1c536b9fa06"`
	`50`	`+ "@id": "_:Nef2949777f2b4b34a46a7d99ea01f44e"`
`51`	`51`	`}`
`52`	`52`	`],`
`53`	`53`	`"https://unifiedcyberontology.org/ontology/uco/observable#sizeInBytes": 4`
`54`	`54`	`},`
`55`	`55`	`{`
`56`		`- "@id": "_:Nf0f6ff73c49045ffa53e2fc83249d20b",`
	`56`	`+ "@id": "_:N334acc4a58624aa29968e0d155bd34c7",`
`57`	`57`	`"@type": "https://unifiedcyberontology.org/ontology/uco/types#Hash",`
`58`	`58`	`"https://unifiedcyberontology.org/ontology/uco/types#hashMethod": {`
`59`	`59`	`"@type": "https://unifiedcyberontology.org/ontology/uco/vocabulary#HashNameVocab",`
`@@ -65,7 +65,7 @@`
`65`	`65`	`}`
`66`	`66`	`},`
`67`	`67`	`{`
`68`		`- "@id": "_:Na2470e1f29914026a1690b0e9386cc1f",`
	`68`	`+ "@id": "_:Na1176e4f42e442b2bd4167202aa93383",`
`69`	`69`	`"@type": "https://unifiedcyberontology.org/ontology/uco/types#Hash",`
`70`	`70`	`"https://unifiedcyberontology.org/ontology/uco/types#hashMethod": {`
`71`	`71`	`"@type": "https://unifiedcyberontology.org/ontology/uco/vocabulary#HashNameVocab",`
`@@ -77,7 +77,7 @@`
`77`	`77`	`}`
`78`	`78`	`},`
`79`	`79`	`{`
`80`		`- "@id": "_:Nd8473ff30e87456d8dcd034729ba27ed",`
	`80`	`+ "@id": "_:N400f582d54af4f8190253677f57de728",`
`81`	`81`	`"@type": "https://unifiedcyberontology.org/ontology/uco/types#Hash",`
`82`	`82`	`"https://unifiedcyberontology.org/ontology/uco/types#hashMethod": {`
`83`	`83`	`"@type": "https://unifiedcyberontology.org/ontology/uco/vocabulary#HashNameVocab",`
`@@ -89,7 +89,7 @@`
`89`	`89`	`}`
`90`	`90`	`},`
`91`	`91`	`{`
`92`		`- "@id": "_:Ncaa10f1e5cf84d8286f1d1c536b9fa06",`
	`92`	`+ "@id": "_:Nef2949777f2b4b34a46a7d99ea01f44e",`
`93`	`93`	`"@type": "https://unifiedcyberontology.org/ontology/uco/types#Hash",`
`94`	`94`	`"https://unifiedcyberontology.org/ontology/uco/types#hashMethod": {`
`95`	`95`	`"@type": "https://unifiedcyberontology.org/ontology/uco/vocabulary#HashNameVocab",`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .`
`10`	`10`
`11`	`11`	`kb:file-9477a6eb-3a94-590b-b51e-6ce6892f0941`
`12`		`- a uco-observable:ObservableObject ;`
	`12`	`+ a uco-observable:File ;`
`13`	`13`	`uco-core:hasFacet`
`14`	`14`	`[`
`15`	`15`	`a uco-observable:ContentDataFacet ;`