test: verify removal of None or empty collections #1888

Signed-off-by: Alexander Gschrei <alexander.gschrei@fau.de>

Author: agschrei

src/formattedcode/output_cyclonedx.py

@@ -487,7 +487,9 @@ def truncate_none_or_empty_values(obj) -> dict:
     predicate = lambda el: not (el is None or
                                 (isinstance(el, list) or isinstance(el, dict))
                                 and len(el) == 0)
-    obj_dict = {k: v for k, v in vars(obj).items() if predicate(v)}
+    if hasattr(obj, '__dict__'):
+        obj = vars(obj)
+    obj_dict = {k: v for k, v in obj.items() if predicate(v)}
     return obj_dict
 
 

tests/formattedcode/test_output_cyclonedx.py

@@ -95,6 +95,29 @@ def test_can_get_hashes_from_package():
         assert hash_entry.content is not None
 
 
+def test_get_tool_header():
+    test_version = "0"
+    expected = {
+        "name": "scancode-toolkit",
+        "vendor": "nexB Inc.",
+        "version": test_version
+    }
+    actual = get_tool_header(test_version)
+    assert actual == expected
+
+
+def test_truncate_none_or_empty_values():
+    original = {
+        "a": None,
+        "b": [],
+        "c": "c",
+        "d": {}
+    }
+    expected = {"c": "c"}
+    actual = truncate_none_or_empty_values(original)
+    assert actual == expected
+
+
 def test_cyclonedx_json():
     test_dir = test_env.get_test_loc('cyclonedx/simple')
     result_file = test_env.get_temp_file('cyclonedx')