diff --git a/tests/base.py b/tests/base.py index 1c150f13..35fcc3d6 100644 --- a/tests/base.py +++ b/tests/base.py @@ -96,22 +96,10 @@ def assertEqualJsonBom(self, a: str, b: str) -> None: # Unify timestamps to ensure they will compare now = datetime.now(tz=timezone.utc) - if 'metadata' in ab.keys(): ab['metadata']['timestamp'] = now.isoformat() - if 'tools' in ab['metadata'].keys(): - for tool in ab['metadata']['tools']: - if tool['name'] == cyclonedx_lib_name: - tool['version'] = cyclonedx_lib_version - del tool - if 'metadata' in bb.keys(): bb['metadata']['timestamp'] = now.isoformat() - if 'tools' in bb['metadata'].keys(): - for tool in bb['metadata']['tools']: - if tool['name'] == cyclonedx_lib_name: - tool['version'] = cyclonedx_lib_version - del tool self.assertEqualJson(json.dumps(ab), json.dumps(bb)) @@ -156,19 +144,10 @@ def assertEqualXmlBom(self, a: str, b: str, namespace: str) -> None: metadata_ts_a = ba.find('./{{{}}}metadata/{{{}}}timestamp'.format(namespace, namespace)) if metadata_ts_a is not None: metadata_ts_a.text = now.isoformat() - metadata_ts_b = bb.find('./{{{}}}metadata/{{{}}}timestamp'.format(namespace, namespace)) if metadata_ts_b is not None: metadata_ts_b.text = now.isoformat() - # Align 'this' Tool Version - this_tool = ba.find('.//*/{{{}}}tool[{{{}}}version="VERSION"]'.format(namespace, namespace)) - if this_tool is not None: - this_tool.find('./{{{}}}version'.format(namespace)).text = cyclonedx_lib_version - this_tool = bb.find('.//*/{{{}}}tool[{{{}}}version="VERSION"]'.format(namespace, namespace)) - if this_tool is not None: - this_tool.find('./{{{}}}version'.format(namespace)).text = cyclonedx_lib_version - self.assertEqualXml( xml.etree.ElementTree.tostring(ba, 'unicode'), xml.etree.ElementTree.tostring(bb, 'unicode') diff --git a/tests/fixtures/json/1.2/bom_dependencies.json b/tests/fixtures/json/1.2/bom_dependencies.json index 8d9173d8..3e7b3a12 100644 --- a/tests/fixtures/json/1.2/bom_dependencies.json +++ b/tests/fixtures/json/1.2/bom_dependencies.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ] }, diff --git a/tests/fixtures/json/1.2/bom_dependencies_component.json b/tests/fixtures/json/1.2/bom_dependencies_component.json index 5d5dc78a..81361c74 100644 --- a/tests/fixtures/json/1.2/bom_dependencies_component.json +++ b/tests/fixtures/json/1.2/bom_dependencies_component.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ], "component": { diff --git a/tests/fixtures/json/1.2/bom_external_references.json b/tests/fixtures/json/1.2/bom_external_references.json index 6ec6c5bd..3ee319e1 100644 --- a/tests/fixtures/json/1.2/bom_external_references.json +++ b/tests/fixtures/json/1.2/bom_external_references.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ] }, diff --git a/tests/fixtures/json/1.2/bom_issue_275_components.json b/tests/fixtures/json/1.2/bom_issue_275_components.json index 794c9aa6..199a7bcc 100644 --- a/tests/fixtures/json/1.2/bom_issue_275_components.json +++ b/tests/fixtures/json/1.2/bom_issue_275_components.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ], "component": { diff --git a/tests/fixtures/json/1.2/bom_issue_328_components.json b/tests/fixtures/json/1.2/bom_issue_328_components.json index b6c83fbd..1ad1cce2 100644 --- a/tests/fixtures/json/1.2/bom_issue_328_components.json +++ b/tests/fixtures/json/1.2/bom_issue_328_components.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ], "component": { diff --git a/tests/fixtures/json/1.2/bom_services_complex.json b/tests/fixtures/json/1.2/bom_services_complex.json index 2e308b4d..4b587509 100644 --- a/tests/fixtures/json/1.2/bom_services_complex.json +++ b/tests/fixtures/json/1.2/bom_services_complex.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ], "component": { diff --git a/tests/fixtures/json/1.2/bom_services_nested.json b/tests/fixtures/json/1.2/bom_services_nested.json index 6d7fe725..373cd148 100644 --- a/tests/fixtures/json/1.2/bom_services_nested.json +++ b/tests/fixtures/json/1.2/bom_services_nested.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ], "component": { diff --git a/tests/fixtures/json/1.2/bom_services_simple.json b/tests/fixtures/json/1.2/bom_services_simple.json index 9d5e94cc..47c727ec 100644 --- a/tests/fixtures/json/1.2/bom_services_simple.json +++ b/tests/fixtures/json/1.2/bom_services_simple.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ], "component": { diff --git a/tests/fixtures/json/1.2/bom_setuptools.json b/tests/fixtures/json/1.2/bom_setuptools.json index 56acb685..4115b7c8 100644 --- a/tests/fixtures/json/1.2/bom_setuptools.json +++ b/tests/fixtures/json/1.2/bom_setuptools.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ] }, diff --git a/tests/fixtures/json/1.2/bom_setuptools_complete.json b/tests/fixtures/json/1.2/bom_setuptools_complete.json index ab8f837b..9319bc44 100644 --- a/tests/fixtures/json/1.2/bom_setuptools_complete.json +++ b/tests/fixtures/json/1.2/bom_setuptools_complete.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ] }, diff --git a/tests/fixtures/json/1.2/bom_setuptools_with_cpe.json b/tests/fixtures/json/1.2/bom_setuptools_with_cpe.json index 91b513b6..d7957112 100644 --- a/tests/fixtures/json/1.2/bom_setuptools_with_cpe.json +++ b/tests/fixtures/json/1.2/bom_setuptools_with_cpe.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ] }, diff --git a/tests/fixtures/json/1.2/bom_toml_1.json b/tests/fixtures/json/1.2/bom_toml_1.json index af6f6c75..f5ea324c 100644 --- a/tests/fixtures/json/1.2/bom_toml_1.json +++ b/tests/fixtures/json/1.2/bom_toml_1.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ] }, diff --git a/tests/fixtures/json/1.2/bom_with_full_metadata.json b/tests/fixtures/json/1.2/bom_with_full_metadata.json index 97e02879..40c1943c 100644 --- a/tests/fixtures/json/1.2/bom_with_full_metadata.json +++ b/tests/fixtures/json/1.2/bom_with_full_metadata.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ], "authors": [ diff --git a/tests/fixtures/json/1.3/bom_dependencies.json b/tests/fixtures/json/1.3/bom_dependencies.json index f78bf7a8..9e51f5b1 100644 --- a/tests/fixtures/json/1.3/bom_dependencies.json +++ b/tests/fixtures/json/1.3/bom_dependencies.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ] }, diff --git a/tests/fixtures/json/1.3/bom_dependencies_component.json b/tests/fixtures/json/1.3/bom_dependencies_component.json index 4197f2ef..98244502 100644 --- a/tests/fixtures/json/1.3/bom_dependencies_component.json +++ b/tests/fixtures/json/1.3/bom_dependencies_component.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ], "component": { diff --git a/tests/fixtures/json/1.3/bom_external_references.json b/tests/fixtures/json/1.3/bom_external_references.json index c4b6ee16..3bd5b63a 100644 --- a/tests/fixtures/json/1.3/bom_external_references.json +++ b/tests/fixtures/json/1.3/bom_external_references.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ] }, diff --git a/tests/fixtures/json/1.3/bom_issue_275_components.json b/tests/fixtures/json/1.3/bom_issue_275_components.json index ba48e62a..17b4a3c0 100644 --- a/tests/fixtures/json/1.3/bom_issue_275_components.json +++ b/tests/fixtures/json/1.3/bom_issue_275_components.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ], "component": { diff --git a/tests/fixtures/json/1.3/bom_issue_328_components.json b/tests/fixtures/json/1.3/bom_issue_328_components.json index 2e832bf9..7d515941 100644 --- a/tests/fixtures/json/1.3/bom_issue_328_components.json +++ b/tests/fixtures/json/1.3/bom_issue_328_components.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ], "component": { diff --git a/tests/fixtures/json/1.3/bom_services_complex.json b/tests/fixtures/json/1.3/bom_services_complex.json index ed1c7cdf..15088185 100644 --- a/tests/fixtures/json/1.3/bom_services_complex.json +++ b/tests/fixtures/json/1.3/bom_services_complex.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ], "component": { diff --git a/tests/fixtures/json/1.3/bom_services_nested.json b/tests/fixtures/json/1.3/bom_services_nested.json index 22a35898..ba5ae49d 100644 --- a/tests/fixtures/json/1.3/bom_services_nested.json +++ b/tests/fixtures/json/1.3/bom_services_nested.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ], "component": { diff --git a/tests/fixtures/json/1.3/bom_services_simple.json b/tests/fixtures/json/1.3/bom_services_simple.json index ac67ac73..1832c30a 100644 --- a/tests/fixtures/json/1.3/bom_services_simple.json +++ b/tests/fixtures/json/1.3/bom_services_simple.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ], "component": { diff --git a/tests/fixtures/json/1.3/bom_setuptools.json b/tests/fixtures/json/1.3/bom_setuptools.json index c2f71704..6e618f73 100644 --- a/tests/fixtures/json/1.3/bom_setuptools.json +++ b/tests/fixtures/json/1.3/bom_setuptools.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ] }, diff --git a/tests/fixtures/json/1.3/bom_setuptools_complete.json b/tests/fixtures/json/1.3/bom_setuptools_complete.json index 1c80dd61..a2e0ff95 100644 --- a/tests/fixtures/json/1.3/bom_setuptools_complete.json +++ b/tests/fixtures/json/1.3/bom_setuptools_complete.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ] }, diff --git a/tests/fixtures/json/1.3/bom_setuptools_no_version.json b/tests/fixtures/json/1.3/bom_setuptools_no_version.json index 82cd556b..6d58ff3a 100644 --- a/tests/fixtures/json/1.3/bom_setuptools_no_version.json +++ b/tests/fixtures/json/1.3/bom_setuptools_no_version.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ] }, diff --git a/tests/fixtures/json/1.3/bom_setuptools_with_cpe.json b/tests/fixtures/json/1.3/bom_setuptools_with_cpe.json index ab89845b..a36c2660 100644 --- a/tests/fixtures/json/1.3/bom_setuptools_with_cpe.json +++ b/tests/fixtures/json/1.3/bom_setuptools_with_cpe.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ] }, diff --git a/tests/fixtures/json/1.3/bom_toml_1.json b/tests/fixtures/json/1.3/bom_toml_1.json index 5854cd52..9082d213 100644 --- a/tests/fixtures/json/1.3/bom_toml_1.json +++ b/tests/fixtures/json/1.3/bom_toml_1.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ] }, diff --git a/tests/fixtures/json/1.3/bom_with_full_metadata.json b/tests/fixtures/json/1.3/bom_with_full_metadata.json index 35317257..2cd19999 100644 --- a/tests/fixtures/json/1.3/bom_with_full_metadata.json +++ b/tests/fixtures/json/1.3/bom_with_full_metadata.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2" + "version": "TESTING" } ], "authors": [ diff --git a/tests/fixtures/json/1.4/bom_dependencies.json b/tests/fixtures/json/1.4/bom_dependencies.json index 2e3ddbf1..d87f3f8d 100644 --- a/tests/fixtures/json/1.4/bom_dependencies.json +++ b/tests/fixtures/json/1.4/bom_dependencies.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2", + "version": "TESTING", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-python-lib/actions", diff --git a/tests/fixtures/json/1.4/bom_dependencies_component.json b/tests/fixtures/json/1.4/bom_dependencies_component.json index ef9851d6..00391098 100644 --- a/tests/fixtures/json/1.4/bom_dependencies_component.json +++ b/tests/fixtures/json/1.4/bom_dependencies_component.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2", + "version": "TESTING", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-python-lib/actions", diff --git a/tests/fixtures/json/1.4/bom_external_references.json b/tests/fixtures/json/1.4/bom_external_references.json index 86c182d8..a8d27b08 100644 --- a/tests/fixtures/json/1.4/bom_external_references.json +++ b/tests/fixtures/json/1.4/bom_external_references.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2", + "version": "TESTING", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-python-lib/actions", diff --git a/tests/fixtures/json/1.4/bom_issue_275_components.json b/tests/fixtures/json/1.4/bom_issue_275_components.json index 1fe6fff2..f59a3e76 100644 --- a/tests/fixtures/json/1.4/bom_issue_275_components.json +++ b/tests/fixtures/json/1.4/bom_issue_275_components.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2", + "version": "TESTING", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-python-lib/actions", diff --git a/tests/fixtures/json/1.4/bom_issue_328_components.json b/tests/fixtures/json/1.4/bom_issue_328_components.json index ce136e9f..27872223 100644 --- a/tests/fixtures/json/1.4/bom_issue_328_components.json +++ b/tests/fixtures/json/1.4/bom_issue_328_components.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2", + "version": "TESTING", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-python-lib/actions", diff --git a/tests/fixtures/json/1.4/bom_services_complex.json b/tests/fixtures/json/1.4/bom_services_complex.json index 25111e97..7db75c3f 100644 --- a/tests/fixtures/json/1.4/bom_services_complex.json +++ b/tests/fixtures/json/1.4/bom_services_complex.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2", + "version": "TESTING", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-python-lib/actions", diff --git a/tests/fixtures/json/1.4/bom_services_nested.json b/tests/fixtures/json/1.4/bom_services_nested.json index 238fbca5..dad44b78 100644 --- a/tests/fixtures/json/1.4/bom_services_nested.json +++ b/tests/fixtures/json/1.4/bom_services_nested.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2", + "version": "TESTING", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-python-lib/actions", diff --git a/tests/fixtures/json/1.4/bom_services_simple.json b/tests/fixtures/json/1.4/bom_services_simple.json index 11be242c..bc78605d 100644 --- a/tests/fixtures/json/1.4/bom_services_simple.json +++ b/tests/fixtures/json/1.4/bom_services_simple.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2", + "version": "TESTING", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-python-lib/actions", diff --git a/tests/fixtures/json/1.4/bom_setuptools.json b/tests/fixtures/json/1.4/bom_setuptools.json index 029386e0..750da385 100644 --- a/tests/fixtures/json/1.4/bom_setuptools.json +++ b/tests/fixtures/json/1.4/bom_setuptools.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2", + "version": "TESTING", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-python-lib/actions", diff --git a/tests/fixtures/json/1.4/bom_setuptools_complete.json b/tests/fixtures/json/1.4/bom_setuptools_complete.json index 4b5eb9b5..be0d4769 100644 --- a/tests/fixtures/json/1.4/bom_setuptools_complete.json +++ b/tests/fixtures/json/1.4/bom_setuptools_complete.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2", + "version": "TESTING", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-python-lib/actions", diff --git a/tests/fixtures/json/1.4/bom_setuptools_no_version.json b/tests/fixtures/json/1.4/bom_setuptools_no_version.json index 0e69af97..b82e1c4c 100644 --- a/tests/fixtures/json/1.4/bom_setuptools_no_version.json +++ b/tests/fixtures/json/1.4/bom_setuptools_no_version.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2", + "version": "TESTING", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-python-lib/actions", diff --git a/tests/fixtures/json/1.4/bom_setuptools_with_cpe.json b/tests/fixtures/json/1.4/bom_setuptools_with_cpe.json index 2e521072..756388ba 100644 --- a/tests/fixtures/json/1.4/bom_setuptools_with_cpe.json +++ b/tests/fixtures/json/1.4/bom_setuptools_with_cpe.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2", + "version": "TESTING", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-python-lib/actions", diff --git a/tests/fixtures/json/1.4/bom_setuptools_with_release_notes.json b/tests/fixtures/json/1.4/bom_setuptools_with_release_notes.json index 6144aac0..103ac99b 100644 --- a/tests/fixtures/json/1.4/bom_setuptools_with_release_notes.json +++ b/tests/fixtures/json/1.4/bom_setuptools_with_release_notes.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2", + "version": "TESTING", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-python-lib/actions", diff --git a/tests/fixtures/json/1.4/bom_setuptools_with_vulnerabilities.json b/tests/fixtures/json/1.4/bom_setuptools_with_vulnerabilities.json index 59d0464d..2fed6ab3 100644 --- a/tests/fixtures/json/1.4/bom_setuptools_with_vulnerabilities.json +++ b/tests/fixtures/json/1.4/bom_setuptools_with_vulnerabilities.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2", + "version": "TESTING", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-python-lib/actions", diff --git a/tests/fixtures/json/1.4/bom_toml_1.json b/tests/fixtures/json/1.4/bom_toml_1.json index 1b503b78..985e07d8 100644 --- a/tests/fixtures/json/1.4/bom_toml_1.json +++ b/tests/fixtures/json/1.4/bom_toml_1.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2", + "version": "TESTING", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-python-lib/actions", diff --git a/tests/fixtures/json/1.4/bom_with_full_metadata.json b/tests/fixtures/json/1.4/bom_with_full_metadata.json index c3c5782b..f96488cd 100644 --- a/tests/fixtures/json/1.4/bom_with_full_metadata.json +++ b/tests/fixtures/json/1.4/bom_with_full_metadata.json @@ -10,7 +10,7 @@ { "vendor": "CycloneDX", "name": "cyclonedx-python-lib", - "version": "3.1.2", + "version": "TESTING", "externalReferences": [ { "url": "https://github.com/CycloneDX/cyclonedx-python-lib/actions", diff --git a/tests/fixtures/xml/1.2/bom_dependencies.xml b/tests/fixtures/xml/1.2/bom_dependencies.xml index 5e310ded..3b6a85a7 100644 --- a/tests/fixtures/xml/1.2/bom_dependencies.xml +++ b/tests/fixtures/xml/1.2/bom_dependencies.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.2/bom_dependencies_component.xml b/tests/fixtures/xml/1.2/bom_dependencies_component.xml index a041a08b..6291cdaf 100644 --- a/tests/fixtures/xml/1.2/bom_dependencies_component.xml +++ b/tests/fixtures/xml/1.2/bom_dependencies_component.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.2/bom_external_references.xml b/tests/fixtures/xml/1.2/bom_external_references.xml index 1ba5eba6..f3551b6f 100644 --- a/tests/fixtures/xml/1.2/bom_external_references.xml +++ b/tests/fixtures/xml/1.2/bom_external_references.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.2/bom_issue_275_components.xml b/tests/fixtures/xml/1.2/bom_issue_275_components.xml index f2a6bed1..a38c0e38 100644 --- a/tests/fixtures/xml/1.2/bom_issue_275_components.xml +++ b/tests/fixtures/xml/1.2/bom_issue_275_components.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.2/bom_issue_328_components.xml b/tests/fixtures/xml/1.2/bom_issue_328_components.xml index 8770fbf9..b5093aae 100644 --- a/tests/fixtures/xml/1.2/bom_issue_328_components.xml +++ b/tests/fixtures/xml/1.2/bom_issue_328_components.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.2/bom_services_complex.xml b/tests/fixtures/xml/1.2/bom_services_complex.xml index 49b7c948..d8833739 100644 --- a/tests/fixtures/xml/1.2/bom_services_complex.xml +++ b/tests/fixtures/xml/1.2/bom_services_complex.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.2/bom_services_nested.xml b/tests/fixtures/xml/1.2/bom_services_nested.xml index 196b3111..9a559f1c 100644 --- a/tests/fixtures/xml/1.2/bom_services_nested.xml +++ b/tests/fixtures/xml/1.2/bom_services_nested.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.2/bom_services_simple.xml b/tests/fixtures/xml/1.2/bom_services_simple.xml index 1a30df7c..13a5766f 100644 --- a/tests/fixtures/xml/1.2/bom_services_simple.xml +++ b/tests/fixtures/xml/1.2/bom_services_simple.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.2/bom_setuptools.xml b/tests/fixtures/xml/1.2/bom_setuptools.xml index bda7bc95..7ac55d10 100644 --- a/tests/fixtures/xml/1.2/bom_setuptools.xml +++ b/tests/fixtures/xml/1.2/bom_setuptools.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.2/bom_setuptools_complete.xml b/tests/fixtures/xml/1.2/bom_setuptools_complete.xml index 78be635b..cbeeef0c 100644 --- a/tests/fixtures/xml/1.2/bom_setuptools_complete.xml +++ b/tests/fixtures/xml/1.2/bom_setuptools_complete.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.2/bom_setuptools_no_version.xml b/tests/fixtures/xml/1.2/bom_setuptools_no_version.xml index 7efc1198..3b4b5d7c 100644 --- a/tests/fixtures/xml/1.2/bom_setuptools_no_version.xml +++ b/tests/fixtures/xml/1.2/bom_setuptools_no_version.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.2/bom_setuptools_with_cpe.xml b/tests/fixtures/xml/1.2/bom_setuptools_with_cpe.xml index da3809fc..db0d140c 100644 --- a/tests/fixtures/xml/1.2/bom_setuptools_with_cpe.xml +++ b/tests/fixtures/xml/1.2/bom_setuptools_with_cpe.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.2/bom_setuptools_with_vulnerabilities.xml b/tests/fixtures/xml/1.2/bom_setuptools_with_vulnerabilities.xml index 552346a0..39e4c53c 100644 --- a/tests/fixtures/xml/1.2/bom_setuptools_with_vulnerabilities.xml +++ b/tests/fixtures/xml/1.2/bom_setuptools_with_vulnerabilities.xml @@ -8,7 +8,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.2/bom_toml_hashes_and_references.xml b/tests/fixtures/xml/1.2/bom_toml_hashes_and_references.xml index 0a7884a0..f92fe5b7 100644 --- a/tests/fixtures/xml/1.2/bom_toml_hashes_and_references.xml +++ b/tests/fixtures/xml/1.2/bom_toml_hashes_and_references.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.2/bom_with_full_metadata.xml b/tests/fixtures/xml/1.2/bom_with_full_metadata.xml index 058c1b6d..ba2e2fb5 100644 --- a/tests/fixtures/xml/1.2/bom_with_full_metadata.xml +++ b/tests/fixtures/xml/1.2/bom_with_full_metadata.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.3/bom_dependencies.xml b/tests/fixtures/xml/1.3/bom_dependencies.xml index 8661816f..ea22a3bc 100644 --- a/tests/fixtures/xml/1.3/bom_dependencies.xml +++ b/tests/fixtures/xml/1.3/bom_dependencies.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.3/bom_dependencies_component.xml b/tests/fixtures/xml/1.3/bom_dependencies_component.xml index 321ba3e8..e131bb71 100644 --- a/tests/fixtures/xml/1.3/bom_dependencies_component.xml +++ b/tests/fixtures/xml/1.3/bom_dependencies_component.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.3/bom_external_references.xml b/tests/fixtures/xml/1.3/bom_external_references.xml index 8e562f62..93cf36ef 100644 --- a/tests/fixtures/xml/1.3/bom_external_references.xml +++ b/tests/fixtures/xml/1.3/bom_external_references.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.3/bom_issue_275_components.xml b/tests/fixtures/xml/1.3/bom_issue_275_components.xml index 11c97118..2e49462f 100644 --- a/tests/fixtures/xml/1.3/bom_issue_275_components.xml +++ b/tests/fixtures/xml/1.3/bom_issue_275_components.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.3/bom_issue_328_components.xml b/tests/fixtures/xml/1.3/bom_issue_328_components.xml index 365973c8..ad5e6258 100644 --- a/tests/fixtures/xml/1.3/bom_issue_328_components.xml +++ b/tests/fixtures/xml/1.3/bom_issue_328_components.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.3/bom_services_complex.xml b/tests/fixtures/xml/1.3/bom_services_complex.xml index 2feb17ae..fa5af8fd 100644 --- a/tests/fixtures/xml/1.3/bom_services_complex.xml +++ b/tests/fixtures/xml/1.3/bom_services_complex.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.3/bom_services_nested.xml b/tests/fixtures/xml/1.3/bom_services_nested.xml index a7db9d18..1239cd7f 100644 --- a/tests/fixtures/xml/1.3/bom_services_nested.xml +++ b/tests/fixtures/xml/1.3/bom_services_nested.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.3/bom_services_simple.xml b/tests/fixtures/xml/1.3/bom_services_simple.xml index 75c023be..f451f5b3 100644 --- a/tests/fixtures/xml/1.3/bom_services_simple.xml +++ b/tests/fixtures/xml/1.3/bom_services_simple.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.3/bom_setuptools.xml b/tests/fixtures/xml/1.3/bom_setuptools.xml index ef0a6245..8ce2b636 100644 --- a/tests/fixtures/xml/1.3/bom_setuptools.xml +++ b/tests/fixtures/xml/1.3/bom_setuptools.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.3/bom_setuptools_complete.xml b/tests/fixtures/xml/1.3/bom_setuptools_complete.xml index ddb16c5c..392e51b8 100644 --- a/tests/fixtures/xml/1.3/bom_setuptools_complete.xml +++ b/tests/fixtures/xml/1.3/bom_setuptools_complete.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.3/bom_setuptools_no_version.xml b/tests/fixtures/xml/1.3/bom_setuptools_no_version.xml index 67735771..353786fe 100644 --- a/tests/fixtures/xml/1.3/bom_setuptools_no_version.xml +++ b/tests/fixtures/xml/1.3/bom_setuptools_no_version.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.3/bom_setuptools_with_cpe.xml b/tests/fixtures/xml/1.3/bom_setuptools_with_cpe.xml index 9e0642f5..da7166ec 100644 --- a/tests/fixtures/xml/1.3/bom_setuptools_with_cpe.xml +++ b/tests/fixtures/xml/1.3/bom_setuptools_with_cpe.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.3/bom_setuptools_with_vulnerabilities.xml b/tests/fixtures/xml/1.3/bom_setuptools_with_vulnerabilities.xml index a86f5f78..6cce456e 100644 --- a/tests/fixtures/xml/1.3/bom_setuptools_with_vulnerabilities.xml +++ b/tests/fixtures/xml/1.3/bom_setuptools_with_vulnerabilities.xml @@ -8,7 +8,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.3/bom_toml_hashes_and_references.xml b/tests/fixtures/xml/1.3/bom_toml_hashes_and_references.xml index 69b77fd8..143a6145 100644 --- a/tests/fixtures/xml/1.3/bom_toml_hashes_and_references.xml +++ b/tests/fixtures/xml/1.3/bom_toml_hashes_and_references.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.3/bom_with_full_metadata.xml b/tests/fixtures/xml/1.3/bom_with_full_metadata.xml index c45ebaaa..5ba4a170 100644 --- a/tests/fixtures/xml/1.3/bom_with_full_metadata.xml +++ b/tests/fixtures/xml/1.3/bom_with_full_metadata.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING diff --git a/tests/fixtures/xml/1.4/bom_dependencies.xml b/tests/fixtures/xml/1.4/bom_dependencies.xml index 0a4735ee..ec440c4c 100644 --- a/tests/fixtures/xml/1.4/bom_dependencies.xml +++ b/tests/fixtures/xml/1.4/bom_dependencies.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING https://github.com/CycloneDX/cyclonedx-python-lib/actions diff --git a/tests/fixtures/xml/1.4/bom_dependencies_component.xml b/tests/fixtures/xml/1.4/bom_dependencies_component.xml index ef5d8c2f..c65b7a7d 100644 --- a/tests/fixtures/xml/1.4/bom_dependencies_component.xml +++ b/tests/fixtures/xml/1.4/bom_dependencies_component.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING https://github.com/CycloneDX/cyclonedx-python-lib/actions diff --git a/tests/fixtures/xml/1.4/bom_external_references.xml b/tests/fixtures/xml/1.4/bom_external_references.xml index 91402b65..71ac84b7 100644 --- a/tests/fixtures/xml/1.4/bom_external_references.xml +++ b/tests/fixtures/xml/1.4/bom_external_references.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING https://github.com/CycloneDX/cyclonedx-python-lib/actions diff --git a/tests/fixtures/xml/1.4/bom_issue_275_components.xml b/tests/fixtures/xml/1.4/bom_issue_275_components.xml index d1e0e259..68bd0708 100644 --- a/tests/fixtures/xml/1.4/bom_issue_275_components.xml +++ b/tests/fixtures/xml/1.4/bom_issue_275_components.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING https://github.com/CycloneDX/cyclonedx-python-lib/actions diff --git a/tests/fixtures/xml/1.4/bom_issue_328_components.xml b/tests/fixtures/xml/1.4/bom_issue_328_components.xml index 32468721..fed09292 100644 --- a/tests/fixtures/xml/1.4/bom_issue_328_components.xml +++ b/tests/fixtures/xml/1.4/bom_issue_328_components.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING https://github.com/CycloneDX/cyclonedx-python-lib/actions diff --git a/tests/fixtures/xml/1.4/bom_services_complex.xml b/tests/fixtures/xml/1.4/bom_services_complex.xml index 3e062ec5..3c951436 100644 --- a/tests/fixtures/xml/1.4/bom_services_complex.xml +++ b/tests/fixtures/xml/1.4/bom_services_complex.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING https://github.com/CycloneDX/cyclonedx-python-lib/actions diff --git a/tests/fixtures/xml/1.4/bom_services_nested.xml b/tests/fixtures/xml/1.4/bom_services_nested.xml index 40d5f6ed..31b1f256 100644 --- a/tests/fixtures/xml/1.4/bom_services_nested.xml +++ b/tests/fixtures/xml/1.4/bom_services_nested.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING https://github.com/CycloneDX/cyclonedx-python-lib/actions diff --git a/tests/fixtures/xml/1.4/bom_services_simple.xml b/tests/fixtures/xml/1.4/bom_services_simple.xml index c2f05961..228e1fc0 100644 --- a/tests/fixtures/xml/1.4/bom_services_simple.xml +++ b/tests/fixtures/xml/1.4/bom_services_simple.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING https://github.com/CycloneDX/cyclonedx-python-lib/actions diff --git a/tests/fixtures/xml/1.4/bom_setuptools.xml b/tests/fixtures/xml/1.4/bom_setuptools.xml index e0fa275f..6f47fbc7 100644 --- a/tests/fixtures/xml/1.4/bom_setuptools.xml +++ b/tests/fixtures/xml/1.4/bom_setuptools.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING https://github.com/CycloneDX/cyclonedx-python-lib/actions diff --git a/tests/fixtures/xml/1.4/bom_setuptools_complete.xml b/tests/fixtures/xml/1.4/bom_setuptools_complete.xml index 53da92b1..e4de56a2 100644 --- a/tests/fixtures/xml/1.4/bom_setuptools_complete.xml +++ b/tests/fixtures/xml/1.4/bom_setuptools_complete.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING https://github.com/CycloneDX/cyclonedx-python-lib/actions diff --git a/tests/fixtures/xml/1.4/bom_setuptools_no_version.xml b/tests/fixtures/xml/1.4/bom_setuptools_no_version.xml index 6bd8c28b..aefbc82b 100644 --- a/tests/fixtures/xml/1.4/bom_setuptools_no_version.xml +++ b/tests/fixtures/xml/1.4/bom_setuptools_no_version.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING https://github.com/CycloneDX/cyclonedx-python-lib/actions diff --git a/tests/fixtures/xml/1.4/bom_setuptools_with_cpe.xml b/tests/fixtures/xml/1.4/bom_setuptools_with_cpe.xml index 230b96a9..862f0a25 100644 --- a/tests/fixtures/xml/1.4/bom_setuptools_with_cpe.xml +++ b/tests/fixtures/xml/1.4/bom_setuptools_with_cpe.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING https://github.com/CycloneDX/cyclonedx-python-lib/actions diff --git a/tests/fixtures/xml/1.4/bom_setuptools_with_release_notes.xml b/tests/fixtures/xml/1.4/bom_setuptools_with_release_notes.xml index a84d1042..7ee61b6f 100644 --- a/tests/fixtures/xml/1.4/bom_setuptools_with_release_notes.xml +++ b/tests/fixtures/xml/1.4/bom_setuptools_with_release_notes.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING https://github.com/CycloneDX/cyclonedx-python-lib/actions diff --git a/tests/fixtures/xml/1.4/bom_setuptools_with_vulnerabilities.xml b/tests/fixtures/xml/1.4/bom_setuptools_with_vulnerabilities.xml index d16d9664..4569c4a0 100644 --- a/tests/fixtures/xml/1.4/bom_setuptools_with_vulnerabilities.xml +++ b/tests/fixtures/xml/1.4/bom_setuptools_with_vulnerabilities.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING https://github.com/CycloneDX/cyclonedx-python-lib/actions diff --git a/tests/fixtures/xml/1.4/bom_toml_hashes_and_references.xml b/tests/fixtures/xml/1.4/bom_toml_hashes_and_references.xml index a166460a..93bda888 100644 --- a/tests/fixtures/xml/1.4/bom_toml_hashes_and_references.xml +++ b/tests/fixtures/xml/1.4/bom_toml_hashes_and_references.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING https://github.com/CycloneDX/cyclonedx-python-lib/actions diff --git a/tests/fixtures/xml/1.4/bom_with_full_metadata.xml b/tests/fixtures/xml/1.4/bom_with_full_metadata.xml index e266d5ba..b63471b8 100644 --- a/tests/fixtures/xml/1.4/bom_with_full_metadata.xml +++ b/tests/fixtures/xml/1.4/bom_with_full_metadata.xml @@ -7,7 +7,7 @@ CycloneDX cyclonedx-python-lib - 3.1.2 + TESTING https://github.com/CycloneDX/cyclonedx-python-lib/actions diff --git a/tests/test_output_json.py b/tests/test_output_json.py index 397910f3..1118d7c3 100644 --- a/tests/test_output_json.py +++ b/tests/test_output_json.py @@ -53,6 +53,7 @@ ) +@patch('cyclonedx.model.ThisTool._version', 'TESTING') class TestOutputJson(BaseJsonTestCase): def test_bom_external_references_v1_4(self) -> None: diff --git a/tests/test_output_xml.py b/tests/test_output_xml.py index 4caa51c6..bbc02e43 100644 --- a/tests/test_output_xml.py +++ b/tests/test_output_xml.py @@ -54,6 +54,7 @@ ) +@patch('cyclonedx.model.ThisTool._version', 'TESTING') class TestOutputXml(BaseXmlTestCase): def test_bom_external_references_v1_4(self) -> None: