adjusted unit tests to account for inclusion of Component in Bom Metadata in Dependency Graphy

madpah · madpah · commit c605f2be9009 · 2022-04-12T20:25:59.000+01:00
Signed-off-by: Paul Horton &lt;paul.horton@owasp.org&gt;
diff --git a/cyclonedx/output/xml.py b/cyclonedx/output/xml.py
@@ -109,7 +109,7 @@ def generate(self, force_regeneration: bool = False) -> None:
                     element=self._root_bom_element
                 )
 
-        if self.bom_supports_dependencies() and self.get_bom().components:
+        if self.bom_supports_dependencies() and (self.get_bom().metadata.component or self.get_bom().components):
             dependencies_element = ElementTree.SubElement(self._root_bom_element, 'dependencies')
             if self.get_bom().metadata.component:
                 ElementTree.SubElement(dependencies_element, 'dependency', {
diff --git a/tests/fixtures/json/1.2/bom_services_complex.json b/tests/fixtures/json/1.2/bom_services_complex.json
@@ -79,5 +79,11 @@
       "bom-ref": "be2c6502-7e9a-47db-9a66-e34f729810a3",
       "name": "my-second-service"
     }
+  ],
+  "dependencies": [
+    {
+      "ref": "17e3b199-dc0b-42ef-bfdd-1fa81a1e3eda",
+      "dependsOn": []
+    }
   ]
 }
diff --git a/tests/fixtures/json/1.2/bom_services_nested.json b/tests/fixtures/json/1.2/bom_services_nested.json
@@ -139,5 +139,11 @@
     }
   ],
   "specVersion": "1.2",
-  "version": 1
+  "version": 1,
+  "dependencies": [
+    {
+      "ref": "cd3e9c95-9d41-49e7-9924-8cf0465ae789",
+      "dependsOn": []
+    }
+  ]
 }
diff --git a/tests/fixtures/json/1.2/bom_services_simple.json b/tests/fixtures/json/1.2/bom_services_simple.json
@@ -29,5 +29,11 @@
       "bom-ref": "17e3b199-dc0b-42ef-bfdd-1fa81a1e3eda",
       "name": "my-second-service"
     }
+  ],
+  "dependencies": [
+    {
+      "ref": "0b049d09-64c0-4490-a0f5-c84d9aacf857",
+      "dependsOn": []
+    }
   ]
 }
diff --git a/tests/fixtures/json/1.2/bom_with_full_metadata.json b/tests/fixtures/json/1.2/bom_with_full_metadata.json
@@ -60,5 +60,11 @@
         }
       ]
     }
-  }
+  },
+  "dependencies": [
+    {
+      "ref": "0b049d09-64c0-4490-a0f5-c84d9aacf857",
+      "dependsOn": []
+    }
+  ]
 }
diff --git a/tests/fixtures/json/1.3/bom_services_complex.json b/tests/fixtures/json/1.3/bom_services_complex.json
@@ -89,5 +89,11 @@
       "bom-ref": "be2c6502-7e9a-47db-9a66-e34f729810a3",
       "name": "my-second-service"
     }
+  ],
+  "dependencies": [
+    {
+      "ref": "17e3b199-dc0b-42ef-bfdd-1fa81a1e3eda",
+      "dependsOn": []
+    }
   ]
 }
diff --git a/tests/fixtures/json/1.3/bom_services_nested.json b/tests/fixtures/json/1.3/bom_services_nested.json
@@ -149,5 +149,11 @@
     }
   ],
   "specVersion": "1.3",
-  "version": 1
+  "version": 1,
+  "dependencies": [
+    {
+      "ref": "cd3e9c95-9d41-49e7-9924-8cf0465ae789",
+      "dependsOn": []
+    }
+  ]
 }
diff --git a/tests/fixtures/json/1.3/bom_services_simple.json b/tests/fixtures/json/1.3/bom_services_simple.json
@@ -29,5 +29,11 @@
       "bom-ref": "17e3b199-dc0b-42ef-bfdd-1fa81a1e3eda",
       "name": "my-second-service"
     }
+  ],
+  "dependencies": [
+    {
+      "ref": "0b049d09-64c0-4490-a0f5-c84d9aacf857",
+      "dependsOn": []
+    }
   ]
 }
diff --git a/tests/fixtures/json/1.3/bom_with_full_metadata.json b/tests/fixtures/json/1.3/bom_with_full_metadata.json
@@ -83,5 +83,11 @@
         "value": "val2"
       }
     ]
-  }
+  },
+  "dependencies": [
+    {
+      "ref": "17e3b199-dc0b-42ef-bfdd-1fa81a1e3eda",
+      "dependsOn": []
+    }
+  ]
 }
diff --git a/tests/fixtures/json/1.4/bom_services_complex.json b/tests/fixtures/json/1.4/bom_services_complex.json
@@ -182,5 +182,11 @@
       "bom-ref": "be2c6502-7e9a-47db-9a66-e34f729810a3",
       "name": "my-second-service"
     }
+  ],
+  "dependencies": [
+    {
+      "ref": "17e3b199-dc0b-42ef-bfdd-1fa81a1e3eda",
+      "dependsOn": []
+    }
   ]
 }
diff --git a/tests/fixtures/json/1.4/bom_services_nested.json b/tests/fixtures/json/1.4/bom_services_nested.json
@@ -242,5 +242,11 @@
     }
   ],
   "specVersion": "1.4",
-  "version": 1
+  "version": 1,
+  "dependencies": [
+    {
+      "ref": "cd3e9c95-9d41-49e7-9924-8cf0465ae789",
+      "dependsOn": []
+    }
+  ]
 }
diff --git a/tests/fixtures/json/1.4/bom_services_simple.json b/tests/fixtures/json/1.4/bom_services_simple.json
@@ -63,5 +63,11 @@
       "bom-ref": "17e3b199-dc0b-42ef-bfdd-1fa81a1e3eda",
       "name": "my-second-service"
     }
+  ],
+  "dependencies": [
+    {
+      "ref": "0b049d09-64c0-4490-a0f5-c84d9aacf857",
+      "dependsOn": []
+    }
   ]
 }
diff --git a/tests/fixtures/json/1.4/bom_with_full_metadata.json b/tests/fixtures/json/1.4/bom_with_full_metadata.json
@@ -117,5 +117,11 @@
         "value": "val2"
       }
     ]
-  }
+  },
+  "dependencies": [
+    {
+      "ref": "be2c6502-7e9a-47db-9a66-e34f729810a3",
+      "dependsOn": []
+    }
+  ]
 }
diff --git a/tests/fixtures/xml/1.2/bom_services_complex.xml b/tests/fixtures/xml/1.2/bom_services_complex.xml
@@ -57,4 +57,7 @@
             <name>my-second-service</name>
         </service>
     </services>
+    <dependencies>
+        <dependency ref="17e3b199-dc0b-42ef-bfdd-1fa81a1e3eda" />
+    </dependencies>
 </bom>
diff --git a/tests/fixtures/xml/1.2/bom_services_nested.xml b/tests/fixtures/xml/1.2/bom_services_nested.xml
@@ -105,4 +105,7 @@
             </services>
         </service>
     </services>
+    <dependencies>
+        <dependency ref="cd3e9c95-9d41-49e7-9924-8cf0465ae789"/>
+    </dependencies>
 </bom>
diff --git a/tests/fixtures/xml/1.2/bom_services_simple.xml b/tests/fixtures/xml/1.2/bom_services_simple.xml
@@ -23,4 +23,7 @@
             <name>my-second-service</name>
         </service>
     </services>
+    <dependencies>
+        <dependency ref="0b049d09-64c0-4490-a0f5-c84d9aacf857"/>
+    </dependencies>
 </bom>
diff --git a/tests/fixtures/xml/1.2/bom_with_full_metadata.xml b/tests/fixtures/xml/1.2/bom_with_full_metadata.xml
@@ -48,4 +48,7 @@
         </supplier>
     </metadata>
     <components/>
+    <dependencies>
+        <dependency ref="cd3e9c95-9d41-49e7-9924-8cf0465ae789"/>
+    </dependencies>
 </bom>
diff --git a/tests/fixtures/xml/1.3/bom_services_complex.xml b/tests/fixtures/xml/1.3/bom_services_complex.xml
@@ -64,4 +64,7 @@
             <name>my-second-service</name>
         </service>
     </services>
+    <dependencies>
+        <dependency ref="17e3b199-dc0b-42ef-bfdd-1fa81a1e3eda" />
+    </dependencies>
 </bom>
diff --git a/tests/fixtures/xml/1.3/bom_services_nested.xml b/tests/fixtures/xml/1.3/bom_services_nested.xml
@@ -112,4 +112,7 @@
             </services>
         </service>
     </services>
+    <dependencies>
+        <dependency ref="cd3e9c95-9d41-49e7-9924-8cf0465ae789"/>
+    </dependencies>
 </bom>
diff --git a/tests/fixtures/xml/1.3/bom_services_simple.xml b/tests/fixtures/xml/1.3/bom_services_simple.xml
@@ -23,4 +23,7 @@
             <name>my-second-service</name>
         </service>
     </services>
+    <dependencies>
+        <dependency ref="0b049d09-64c0-4490-a0f5-c84d9aacf857"/>
+    </dependencies>
 </bom>
diff --git a/tests/fixtures/xml/1.3/bom_with_full_metadata.xml b/tests/fixtures/xml/1.3/bom_with_full_metadata.xml
@@ -59,4 +59,7 @@
         </properties>
     </metadata>
     <components/>
+    <dependencies>
+        <dependency ref="bb5911d6-1a1d-41c9-b6e0-46e848d16655" />
+    </dependencies>
 </bom>
diff --git a/tests/fixtures/xml/1.4/bom_services_complex.xml b/tests/fixtures/xml/1.4/bom_services_complex.xml
@@ -134,4 +134,7 @@
             <name>my-second-service</name>
         </service>
     </services>
+    <dependencies>
+        <dependency ref="17e3b199-dc0b-42ef-bfdd-1fa81a1e3eda"/>
+    </dependencies>
 </bom>
diff --git a/tests/fixtures/xml/1.4/bom_services_nested.xml b/tests/fixtures/xml/1.4/bom_services_nested.xml
@@ -182,4 +182,7 @@
             </services>
         </service>
     </services>
+    <dependencies>
+        <dependency ref="cd3e9c95-9d41-49e7-9924-8cf0465ae789"/>
+    </dependencies>
 </bom>
diff --git a/tests/fixtures/xml/1.4/bom_services_simple.xml b/tests/fixtures/xml/1.4/bom_services_simple.xml
@@ -49,4 +49,7 @@
             <name>my-second-service</name>
         </service>
     </services>
+    <dependencies>
+        <dependency ref="0b049d09-64c0-4490-a0f5-c84d9aacf857" />
+    </dependencies>
 </bom>
diff --git a/tests/fixtures/xml/1.4/bom_with_full_metadata.xml b/tests/fixtures/xml/1.4/bom_with_full_metadata.xml
@@ -85,4 +85,7 @@
         </properties>
     </metadata>
     <components/>
+    <dependencies>
+        <dependency ref="df70b5f1-8f53-47a4-be48-669ae78795e6" />
+    </dependencies>
 </bom>

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ def generate(self, force_regeneration: bool = False) -> None:`
`109`	`109`	`element=self._root_bom_element`
`110`	`110`	`)`
`111`	`111`
`112`		`- if self.bom_supports_dependencies() and self.get_bom().components:`
	`112`	`+ if self.bom_supports_dependencies() and (self.get_bom().metadata.component or self.get_bom().components):`
`113`	`113`	`dependencies_element = ElementTree.SubElement(self._root_bom_element, 'dependencies')`
`114`	`114`	`if self.get_bom().metadata.component:`
`115`	`115`	`ElementTree.SubElement(dependencies_element, 'dependency', {`
Original file line number	Diff line number	Diff line change
`@@ -79,5 +79,11 @@`
`79`	`79`	`"bom-ref": "be2c6502-7e9a-47db-9a66-e34f729810a3",`
`80`	`80`	`"name": "my-second-service"`
`81`	`81`	`}`
	`82`	`+ ],`
	`83`	`+ "dependencies": [`
	`84`	`+ {`
	`85`	`+ "ref": "17e3b199-dc0b-42ef-bfdd-1fa81a1e3eda",`
	`86`	`+ "dependsOn": []`
	`87`	`+ }`
`82`	`88`	`]`
`83`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -139,5 +139,11 @@`
`139`	`139`	`}`
`140`	`140`	`],`
`141`	`141`	`"specVersion": "1.2",`
`142`		`- "version": 1`
	`142`	`+ "version": 1,`
	`143`	`+ "dependencies": [`
	`144`	`+ {`
	`145`	`+ "ref": "cd3e9c95-9d41-49e7-9924-8cf0465ae789",`
	`146`	`+ "dependsOn": []`
	`147`	`+ }`
	`148`	`+ ]`
`143`	`149`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,11 @@`
`29`	`29`	`"bom-ref": "17e3b199-dc0b-42ef-bfdd-1fa81a1e3eda",`
`30`	`30`	`"name": "my-second-service"`
`31`	`31`	`}`
	`32`	`+ ],`
	`33`	`+ "dependencies": [`
	`34`	`+ {`
	`35`	`+ "ref": "0b049d09-64c0-4490-a0f5-c84d9aacf857",`
	`36`	`+ "dependsOn": []`
	`37`	`+ }`
`32`	`38`	`]`
`33`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,5 +60,11 @@`
`60`	`60`	`}`
`61`	`61`	`]`
`62`	`62`	`}`
`63`		`- }`
	`63`	`+ },`
	`64`	`+ "dependencies": [`
	`65`	`+ {`
	`66`	`+ "ref": "0b049d09-64c0-4490-a0f5-c84d9aacf857",`
	`67`	`+ "dependsOn": []`
	`68`	`+ }`
	`69`	`+ ]`
`64`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,5 +89,11 @@`
`89`	`89`	`"bom-ref": "be2c6502-7e9a-47db-9a66-e34f729810a3",`
`90`	`90`	`"name": "my-second-service"`
`91`	`91`	`}`
	`92`	`+ ],`
	`93`	`+ "dependencies": [`
	`94`	`+ {`
	`95`	`+ "ref": "17e3b199-dc0b-42ef-bfdd-1fa81a1e3eda",`
	`96`	`+ "dependsOn": []`
	`97`	`+ }`
`92`	`98`	`]`
`93`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,5 +149,11 @@`
`149`	`149`	`}`
`150`	`150`	`],`
`151`	`151`	`"specVersion": "1.3",`
`152`		`- "version": 1`
	`152`	`+ "version": 1,`
	`153`	`+ "dependencies": [`
	`154`	`+ {`
	`155`	`+ "ref": "cd3e9c95-9d41-49e7-9924-8cf0465ae789",`
	`156`	`+ "dependsOn": []`
	`157`	`+ }`
	`158`	`+ ]`
`153`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,5 +83,11 @@`
`83`	`83`	`"value": "val2"`
`84`	`84`	`}`
`85`	`85`	`]`
`86`		`- }`
	`86`	`+ },`
	`87`	`+ "dependencies": [`
	`88`	`+ {`
	`89`	`+ "ref": "17e3b199-dc0b-42ef-bfdd-1fa81a1e3eda",`
	`90`	`+ "dependsOn": []`
	`91`	`+ }`
	`92`	`+ ]`
`87`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,5 +182,11 @@`
`182`	`182`	`"bom-ref": "be2c6502-7e9a-47db-9a66-e34f729810a3",`
`183`	`183`	`"name": "my-second-service"`
`184`	`184`	`}`
	`185`	`+ ],`
	`186`	`+ "dependencies": [`
	`187`	`+ {`
	`188`	`+ "ref": "17e3b199-dc0b-42ef-bfdd-1fa81a1e3eda",`
	`189`	`+ "dependsOn": []`
	`190`	`+ }`
`185`	`191`	`]`
`186`	`192`	`}`