8000 849-replace-underscore-with-dash-package-manager · spdx/tools-python@c821316 · GitHub
[go: up one dir, main page]
Skip to content

Commit c821316

Browse files
mneumeimneumei
committed
849-replace-underscore-with-dash-package-manager
Signed-off-by: Neumeier Michael <Michael.Neumeier@de.bosch.com>
1 parent 8dc336f commit c821316

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

‎src/spdx_tools/spdx/jsonschema/external_package_ref_converter.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
from beartype.typing import Any, Type
55

66
from spdx_tools.spdx.jsonschema.converter import TypedConverter
7-
from spdx_tools.spdx.jsonschema.external_package_ref_properties import ExternalPackageRefProperty
7+
from spdx_tools.spdx.jsonschema.external_package_ref_properties import (
8+
ExternalPackageRefProperty,
9+
)
810
from spdx_tools.spdx.jsonschema.json_property import JsonProperty
911
from spdx_tools.spdx.model import Document, ExternalPackageRef
1012

@@ -19,7 +21,7 @@ def _get_property_value(
1921
if external_ref_property == ExternalPackageRefProperty.COMMENT:
2022
return external_ref.comment
2123
elif external_ref_property == ExternalPackageRefProperty.REFERENCE_CATEGORY:
22-
return external_ref.category.name
24+
return external_ref.category.name.replace("_", "-") # bugfix to match the spdx spec
2325
elif external_ref_property == ExternalPackageRefProperty.REFERENCE_LOCATOR:
2426
return external_ref.locator
2527
elif external_ref_property == ExternalPackageRefProperty.REFERENCE_TYPE:

‎tests/spdx/jsonschema/test_external_package_ref_converter.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
# SPDX-License-Identifier: Apache-2.0
44
import pytest
55

6-
from spdx_tools.spdx.jsonschema.external_package_ref_converter import ExternalPackageRefConverter
7-
from spdx_tools.spdx.jsonschema.external_package_ref_properties import ExternalPackageRefProperty
6+
from spdx_tools.spdx.jsonschema.external_package_ref_converter import (
7+
ExternalPackageRefConverter,
8+
)
9+
from spdx_tools.spdx.jsonschema.external_package_ref_properties import (
10+
ExternalPackageRefProperty,
11+
)
812
from spdx_tools.spdx.model import ExternalPackageRef, ExternalPackageRefCategory
913

1014

@@ -23,7 +27,9 @@ def converter() -> ExternalPackageRefConverter:
2327
],
2428
)
2529
def test_json_property_names(
26-
converter: ExternalPackageRefConverter, external_package_ref_property: ExternalPackageRefProperty, expected: str
30+
converter: ExternalPackageRefConverter,
31+
external_package_ref_property: ExternalPackageRefProperty,
32+
expected: str,
2733
):
2834
assert converter.json_property_name(external_package_ref_property) == expected
2935

@@ -43,7 +49,7 @@ def test_successful_conversion(converter: ExternalPackageRefConverter):
4349

4450
assert converted_dict == {
4551
converter.json_property_name(ExternalPackageRefProperty.COMMENT): "comment",
46-
converter.json_property_name(ExternalPackageRefProperty.REFERENCE_CATEGORY): "PACKAGE_MANAGER",
52+
converter.json_property_name(ExternalPackageRefProperty.REFERENCE_CATEGORY): "PACKAGE-MANAGER",
4753
converter.json_property_name(ExternalPackageRefProperty.REFERENCE_LOCATOR): "locator",
4854
converter.json_property_name(ExternalPackageRefProperty.REFERENCE_TYPE): "type",
4955
}

‎tests/spdx/writer/json/expected_results/expected.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"externalRefs": [
8989
{
9090
"comment": "externalPackageRefComment",
91-
"referenceCategory": "PACKAGE_MANAGER",
91+
"referenceCategory": "PACKAGE-MANAGER",
9292
"referenceLocator": "org.apache.tomcat:tomcat:9.0.0.M4",
9393
"referenceType": "maven-central"
9494
375F }

0 commit comments

Comments
 (0)
0