wip

Signed-off-by: Jan Kowalleck <[email protected]>

Author: jkowalleck

tests/_data/models.py

@@ -1327,7 +1327,6 @@ def get_bom_with_definitions_and_detailed_standards() -> Bom:
                 version='1.2.3',
                 description='Some description',
                 owner='Some Owner',
-                external_references=[get_external_reference_1()],
                 requirements=[
                     req1 := Requirement(
                         bom_ref='req-1',
@@ -1336,7 +1335,11 @@ def get_bom_with_definitions_and_detailed_standards() -> Bom:
                         text='some requirement text',
                         descriptions=['Requirement 1 described here', 'and here'],
                         open_cre=[CreId('CRE:1-2')],
-                        properties=[Property(name='key1', value='val1')]
+                        properties=[
+                            Property(name='key1', value='val1a'),
+                            Property(name='key1', value='val1b'),
+                        ],
+                        external_references=[get_external_reference_2()],
                     ),
                     req2 := Requirement(
                         bom_ref='req-2',
@@ -1345,34 +1348,34 @@ def get_bom_with_definitions_and_detailed_standards() -> Bom:
                         text='some requirement text',
                         descriptions=['Requirement 2 described here'],
                         open_cre=[CreId('CRE:1-2'), CreId('CRE:3-4')],
+                        parent=req1.bom_ref,
                         properties=[Property(name='key2', value='val2')],
-                        parent=req1.bom_ref
                     ),
                 ],
                 levels=[
                     Level(
                         bom_ref='lvl-1',
                         identifier='LVL-1',
                         title='Level 1',
-                        description='Level 1 description'
+                        description='Level 1 description',
                         # no requirements!
                     ),
                     Level(
                         bom_ref='lvl-2',
                         identifier='LVL-2',
                         title='Level 2',
                         description='Level 2 description',
-                        requirements=[req1.bom_ref, req2.bom_ref]
-                    )
-                ]
+                        requirements=[req1.bom_ref, req2.bom_ref],
+                    ),
+                ],
+                external_references=[get_external_reference_1()],
             ),
             Standard(
                 bom_ref='other-standard',
                 name='Other Standard',
                 version='1.0.0',
                 description='Other description',
                 owner='Other Owner',
-                external_references=[get_external_reference_2()],
                 requirements=[
                     req3 := Requirement(
                         bom_ref='req-3',
@@ -1382,7 +1385,7 @@ def get_bom_with_definitions_and_detailed_standards() -> Bom:
                         descriptions=['Requirement 3 described here', 'and here'],
                         open_cre=[CreId('CRE:5-6'), CreId('CRE:7-8')],
                         properties=[Property(name='key3', value='val3')]
-                    )
+                    ),
                 ],
                 levels=[
                     Level(
@@ -1391,8 +1394,9 @@ def get_bom_with_definitions_and_detailed_standards() -> Bom:
                         title='Level 3',
                         description='Level 3 description',
                         requirements=[req3.bom_ref]
-                    )
-                ]
+                    ),
+                ],
+                external_references=[get_external_reference_2()],
             )
         ]))
 

tests/_data/snapshots/get_bom_with_definitions_and_detailed_standards-1.6.json.bin

@@ -90,14 +90,24 @@
               "Requirement 1 described here",
               "and here"
             ],
+            "externalReferences": [
+              {
+                "type": "website",
+                "url": "https://cyclonedx.org"
+              }
+            ],
             "identifier": "REQ-1",
             "openCre": [
               "CRE:1-2"
             ],
             "properties": [
               {
                 "name": "key1",
-                "value": "val1"
+                "value": "val1a"
+              },
+              {
+                "name": "key1",
+                "value": "val1b"
               }
             ],
             "text": "some requirement text",

tests/_data/snapshots/get_bom_with_definitions_and_detailed_standards-1.6.xml.bin

@@ -62,8 +62,14 @@
             </descriptions>
             <openCre>CRE:1-2</openCre>
             <properties>
-              <property name="key1">val1</property>
+              <property name="key1">val1a</property>
+              <property name="key1">val1b</property>
             </properties>
+            <externalReferences>
+              <reference type="website">
+                <url>https://cyclonedx.org</url>
+              </reference>
+            </externalReferences>
           </requirement>
           <requirement bom-ref="req-2">
             <identifier>REQ-2</identifier>