Merge branch '530_load_json_issue' into develop

Author: chinyeungli

CHANGELOG.rst

@@ -1,6 +1,11 @@
 ==============================
 Changelog
 
+xxxx-xx-xx
+    Release x.x.x
+
+    * Fixd error in load_json in util.py
+
 2023-07-14
     Release 9.0.0
 

src/attributecode/util.py

@@ -277,9 +277,8 @@ def load_json(location):
 
     # FIXME: this is too clever and complex... IMHO we should not try to guess the format.
     # instead a command line option should be provided explictly to say what is the format
-    if isinstance(results, list):
-        results = sorted(results)
-    else:
+    if not isinstance(results, list):
+        # FIXME: I think we can remove the support of aboutcode_manager
         if u'aboutcode_manager_notice' in results:
             results = results['components']
         elif u'scancode_notice' in results:

tests/test_util.py

@@ -375,6 +375,21 @@ def test_load_json(self):
         result = util.load_json(test_file)
         assert expected == result
 
+    def test_load_json_multi_entries(self):
+        test_file = get_test_loc('test_util/json/multi_entries.json')
+        expected = [dict([
+            ('about_file_path', '/load/this.ABOUT'),
+            ('about_resource', '.'),
+            ('name', 'AboutCode'),
+            ('version', '0.11.0')]),
+            dict([
+                ('about_file_path', '/load/that.ABOUT'),
+                ('about_resource', '.'),
+                ('name', 'that')])
+        ]
+        result = util.load_json(test_file)
+        assert expected == result
+
     def test_load_json2(self):
         test_file = get_test_loc('test_util/json/expected_need_mapping.json')
         expected = [dict(dict([

tests/testdata/test_util/json/multi_entries.json

@@ -0,0 +1,13 @@
+[
+  {
+    "about_file_path": "/load/this.ABOUT",
+    "about_resource": ".",
+    "name": "AboutCode",
+    "version": "0.11.0"
+  },
+  {
+    "about_file_path": "/load/that.ABOUT",
+    "about_resource": ".",
+    "name": "that"
+  }
+]