Skip to content

Commit ec9650d

Browse files
committed
feat: improve tests
* Shorten the assertion function * Use it also for SPDX files
1 parent 0b005c2 commit ec9650d

File tree

1 file changed

+16
-27
lines changed

1 file changed

+16
-27
lines changed

tests/test_cli.py

+16-27
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ def test_successful_conversion_of_spdx_file(tmp_path: Path, options: str) -> Non
5555
# we need to exclude the "metadata" section from the comparison
5656
opossum_dict.pop("metadata")
5757
expected_opossum_dict.pop("metadata")
58-
assert opossum_dict == expected_opossum_dict
58+
assert_expected_opossum_equals_generated_opossum(
59+
expected_opossum_dict, opossum_dict
60+
)
5961

6062

6163
def test_successful_conversion_of_opossum_file(tmp_path: Path) -> None:
@@ -99,32 +101,19 @@ def read_json_from_file(filename: str) -> Any:
99101
def assert_expected_opossum_equals_generated_opossum(
100102
expected_opossum_dict: Any, opossum_dict: Any
101103
) -> None:
102-
assert opossum_dict["metadata"] == expected_opossum_dict["metadata"]
103-
assert opossum_dict["resources"] == expected_opossum_dict["resources"]
104-
assert (
105-
opossum_dict["externalAttributions"]
106-
== expected_opossum_dict["externalAttributions"]
107-
)
108-
assert (
109-
opossum_dict["resourcesToAttributions"]
110-
== expected_opossum_dict["resourcesToAttributions"]
111-
)
112-
assert opossum_dict["frequentLicenses"] == expected_opossum_dict["frequentLicenses"]
113-
assert (
114-
opossum_dict["attributionBreakpoints"]
115-
== expected_opossum_dict["attributionBreakpoints"]
116-
)
117-
assert (
118-
opossum_dict["filesWithChildren"] == expected_opossum_dict["filesWithChildren"]
119-
)
120-
assert (
121-
opossum_dict["baseUrlsForSources"]
122-
== expected_opossum_dict["baseUrlsForSources"]
123-
)
124-
assert (
125-
opossum_dict["externalAttributionSources"]
126-
== expected_opossum_dict["externalAttributionSources"]
127-
)
104+
opossum_top_level = [
105+
"resources",
106+
"metadata",
107+
"externalAttributions",
108+
"resourcesToAttributions",
109+
"frequentLicenses",
110+
"attributionBreakpoints",
111+
"filesWithChildren",
112+
"baseUrlsForSources",
113+
"externalAttributionSources",
114+
]
115+
for field in opossum_top_level:
116+
assert opossum_dict.get(field, None) == expected_opossum_dict.get(field, None)
128117

129118

130119
def test_cli_no_output_file_provided() -> None:

0 commit comments

Comments
 (0)