Fix Issue 492

mr-zepol · mr-zepol · commit f4cc7f46a45e · 2024-12-09T19:01:55.000-05:00
diff --git a/src/test/java/org/cyclonedx/BomJsonGeneratorTest.java b/src/test/java/org/cyclonedx/BomJsonGeneratorTest.java
@@ -547,7 +547,7 @@ public void testIssue408Regression_xmlToJson_externalReferenceBom() throws Excep
 
     @Test
     public void testIssue562() throws Exception {
-        Version version = Version.VERSION_15;
+        Version version = Version.VERSION_16;
         Bom bom = createCommonJsonBom("/regression/issue562.json");
 
 
@@ -558,7 +558,18 @@ public void testIssue562() throws Exception {
         assertTrue(parser.isValid(loadedFile, version));
     }
 
+    @Test
+    public void testIssue492() throws Exception {
+        Version version = Version.VERSION_14;
+        Bom bom = createCommonJsonBom("/regression/issue492.json");
+
 
+        BomJsonGenerator generator = BomGeneratorFactory.createJson(version, bom);
+        File loadedFile = writeToFile(generator.toJsonString());
+
+        JsonParser parser = new JsonParser();
+        assertTrue(parser.isValid(loadedFile, version));
+    }
 
     private void assertExternalReferenceInfo(Bom bom) {
         assertEquals(3, bom.getExternalReferences().size());
diff --git a/src/test/java/org/cyclonedx/BomXmlGeneratorTest.java b/src/test/java/org/cyclonedx/BomXmlGeneratorTest.java
@@ -730,6 +730,19 @@ public void testIssue562() throws Exception {
         assertTrue(parser.isValid(loadedFile, version));
     }
 
+    @Test
+    public void testIssue492() throws Exception {
+        Version version = Version.VERSION_15;
+        Bom bom = createCommonBomXml("/regression/issue492.xml");
+
+        BomXmlGenerator generator = BomGeneratorFactory.createXml(version, bom);
+
+        File loadedFile = writeToFile(generator.toXmlString());
+
+        XmlParser parser = new XmlParser();
+        assertTrue(parser.isValid(loadedFile, version));
+    }
+
     private void addExtensibleTypes(Bom bom) {
         ExtensibleType t1 = new ExtensibleType("abc", "test", "test");
         ExtensibleType t2 = new ExtensibleType("abc", "test", "test1");
diff --git a/src/test/java/org/cyclonedx/parsers/JsonParserTest.java b/src/test/java/org/cyclonedx/parsers/JsonParserTest.java
@@ -575,4 +575,10 @@ public void testIssue562Regression() throws Exception {
         assertEquals(2, bom.getMetadata().getToolChoice().getComponents().size());
         assertEquals(2, bom.getMetadata().getAuthors().size());
     }
+
+    @Test
+    public void testIssue492Regression() throws Exception {
+        final Bom bom = getJsonBom("regression/issue492.json");
+        assertEquals(2, bom.getMetadata().getTools().size());
+    }
 }
diff --git a/src/test/java/org/cyclonedx/parsers/XmlParserTest.java b/src/test/java/org/cyclonedx/parsers/XmlParserTest.java
@@ -720,4 +720,10 @@ public void testIssue562Regression() throws Exception {
         assertEquals(2, bom.getMetadata().getToolChoice().getComponents().size());
         assertEquals(2, bom.getMetadata().getAuthors().size());
     }
+
+    @Test
+    public void testIssue492Regression() throws Exception {
+        final Bom bom = getXmlBom("regression/issue492.xml");
+        assertEquals(2, bom.getMetadata().getTools().size());
+    }
 }
diff --git a/src/test/resources/regression/issue492.json b/src/test/resources/regression/issue492.json
@@ -0,0 +1,17 @@
+{
+  "bomFormat":"CycloneDX",
+  "specVersion":"1.4",
+  "serialNumber":"urn:uuid:0c81ff2e-d64e-4897-bfa4-2f0f7d8ab767",
+  "version" : 1,
+  "metadata" : {
+    "timestamp":"2024-12-09T21:56:45Z",
+    "tools": [
+      {
+        "name": "tool-a"
+      },
+      {
+        "name": "tool-b"
+      }
+    ]
+  }
+}
diff --git a/src/test/resources/regression/issue492.xml b/src/test/resources/regression/issue492.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<bom xmlns="http://cyclonedx.org/schema/bom/1.4" serialNumber="urn:uuid:0c81ff2e-d64e-4897-bfa4-2f0f7d8ab767" version="1">
+  <metadata>
+    <timestamp>2024-12-09T21:56:45Z</timestamp>
+    <tools>
+      <tool>
+        <vendor>corp A</vendor>
+        <name>tool A</name>
+        <version>1-A</version>
+      </tool>
+      <tool>
+        <vendor>corp B</vendor>
+        <name>tool B</name>
+        <version>1-B</version>
+      </tool>
+    </tools>
+  </metadata>
+</bom>

Original file line number	Diff line number	Diff line change
`@@ -575,4 +575,10 @@ public void testIssue562Regression() throws Exception {`
`575`	`575`	`assertEquals(2, bom.getMetadata().getToolChoice().getComponents().size());`
`576`	`576`	`assertEquals(2, bom.getMetadata().getAuthors().size());`
`577`	`577`	`}`
	`578`	`+`
	`579`	`+ @Test`
	`580`	`+ public void testIssue492Regression() throws Exception {`
	`581`	`+ final Bom bom = getJsonBom("regression/issue492.json");`
	`582`	`+ assertEquals(2, bom.getMetadata().getTools().size());`
	`583`	`+ }`
`578`	`584`	`}`
Original file line number	Diff line number	Diff line change
`@@ -720,4 +720,10 @@ public void testIssue562Regression() throws Exception {`
`720`	`720`	`assertEquals(2, bom.getMetadata().getToolChoice().getComponents().size());`
`721`	`721`	`assertEquals(2, bom.getMetadata().getAuthors().size());`
`722`	`722`	`}`
	`723`	`+`
	`724`	`+ @Test`
	`725`	`+ public void testIssue492Regression() throws Exception {`
	`726`	`+ final Bom bom = getXmlBom("regression/issue492.xml");`
	`727`	`+ assertEquals(2, bom.getMetadata().getTools().size());`
	`728`	`+ }`
`723`	`729`	`}`