Merge pull request #239 from jkowalleck/fix-testdata

stevespringett · web-flow · commit d37a107d7831 · 2023-06-13T17:37:56.000-05:00
fixed test data
diff --git a/tools/src/test/resources/1.2/invalid-empty-component-1.2.json b/tools/src/test/resources/1.2/invalid-empty-component-1.2.json
diff --git a/tools/src/test/resources/1.2/skip_invalid-empty-component-1.2.json b/tools/src/test/resources/1.2/skip_invalid-empty-component-1.2.json
@@ -0,0 +1,12 @@
+{
+  "bomFormat": "CycloneDX",
+  "specVersion": "1.2",
+  "serialNumber": "urn:uuid:3e671687-395b-41f5-a30f-a58921a69b79",
+  "version": 1,
+  "components": [
+    {
+      "type": "library",
+      "$comment": "expected to fail, since `name` and `version` are missing. But in fact `name` and `version` are optional as they have a default value in CDX-v1.2"
+    }
+  ]
+}
diff --git a/tools/src/test/resources/1.2/skip_invalid-missing-component-type-1.2.json b/tools/src/test/resources/1.2/skip_invalid-missing-component-type-1.2.json
@@ -6,7 +6,8 @@
   "components": [
     {
       "name": "acme-library",
-      "version": "1.0.0"
+      "version": "1.0.0",
+      "$comment": "expected to fail, since `type` is missing. But in fact `type` is optional as it has a default value in CDX-v1.2"
     }
   ]
 }
diff --git a/tools/src/test/resources/1.2/valid-bom-1.2.json b/tools/src/test/resources/1.2/valid-bom-1.2.json
@@ -129,12 +129,12 @@
         ],
         "commits": [
           {
-            "uid": "123",
-            "url": "",
+            "uid": "7638417db6d59f3c431d3e1f261cc637155684cd",
+            "url": "https://location/to/7638417db6d59f3c431d3e1f261cc637155684cd",
             "author": {
               "timestamp": "2018-11-13T20:20:39+00:00",
-              "name": "",
-              "email": ""
+              "name": "me",
+              "email": "me@acme.org"
             }
           }
         ]
diff --git a/tools/src/test/resources/1.3/valid-bom-1.3.json b/tools/src/test/resources/1.3/valid-bom-1.3.json
@@ -129,12 +129,12 @@
         ],
         "commits": [
           {
-            "uid": "123",
-            "url": "",
+            "uid": "7638417db6d59f3c431d3e1f261cc637155684cd",
+            "url": "https://location/to/7638417db6d59f3c431d3e1f261cc637155684cd",
             "author": {
               "timestamp": "2018-11-13T20:20:39+00:00",
-              "name": "",
-              "email": ""
+              "name": "me",
+              "email": "me@acme.org"
             }
           }
         ]
diff --git a/tools/src/test/resources/1.4/valid-bom-1.4.json b/tools/src/test/resources/1.4/valid-bom-1.4.json
@@ -129,12 +129,12 @@
         ],
         "commits": [
           {
-            "uid": "123",
-            "url": "",
+            "uid": "7638417db6d59f3c431d3e1f261cc637155684cd",
+            "url": "https://location/to/7638417db6d59f3c431d3e1f261cc637155684cd",
             "author": {
               "timestamp": "2018-11-13T20:20:39+00:00",
-              "name": "",
-              "email": ""
+              "name": "me",
+              "email": "me@acme.org"
             }
           }
         ]
diff --git a/tools/src/test/resources/1.4/valid-release-notes-1.4.json b/tools/src/test/resources/1.4/valid-release-notes-1.4.json
@@ -80,7 +80,7 @@
         "contact": [
           {
             "name": "Support",
-            "email": "support@partner",
+            "email": "support@partner.org",
             "phone": "800-555-1212"
           }
         ]
diff --git a/tools/src/test/resources/1.4/valid-service-1.4.json b/tools/src/test/resources/1.4/valid-service-1.4.json
@@ -38,7 +38,7 @@
         "contact": [
           {
             "name": "Support",
-            "email": "support@partner",
+            "email": "support@partner.org",
             "phone": "800-555-1212"
           }
         ]

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@`
`6`	`6`	`"components": [`
`7`	`7`	`{`
`8`	`8`	`"name": "acme-library",`
`9`		`- "version": "1.0.0"`
	`9`	`+ "version": "1.0.0",`
	`10`	+ "$comment": "expected to fail, since `type` is missing. But in fact `type` is optional as it has a default value in CDX-v1.2"
`10`	`11`	`}`
`11`	`12`	`]`
`12`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,12 +129,12 @@`
`129`	`129`	`],`
`130`	`130`	`"commits": [`
`131`	`131`	`{`
`132`		`- "uid": "123",`
`133`		`- "url": "",`
	`132`	`+ "uid": "7638417db6d59f3c431d3e1f261cc637155684cd",`
	`133`	`+ "url": "https://location/to/7638417db6d59f3c431d3e1f261cc637155684cd",`
`134`	`134`	`"author": {`
`135`	`135`	`"timestamp": "2018-11-13T20:20:39+00:00",`
`136`		`- "name": "",`
`137`		`- "email": ""`
	`136`	`+ "name": "me",`
	`137`	`+ "email": "me@acme.org"`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`	`]`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@`
`80`	`80`	`"contact": [`
`81`	`81`	`{`
`82`	`82`	`"name": "Support",`
`83`		`- "email": "support@partner",`
	`83`	`+ "email": "support@partner.org",`
`84`	`84`	`"phone": "800-555-1212"`
`85`	`85`	`}`
`86`	`86`	`]`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`"contact": [`
`39`	`39`	`{`
`40`	`40`	`"name": "Support",`
`41`		`- "email": "support@partner",`
	`41`	`+ "email": "support@partner.org",`
`42`	`42`	`"phone": "800-555-1212"`
`43`	`43`	`}`
`44`	`44`	`]`