Update test expectations for detection logs

Update test expectations after making detection logs only present in
--license-text-diagnostics.

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>

Author: AyanSinhaMahapatra

src/formattedcode/output_csv.py

@@ -146,7 +146,7 @@ def collect_keys(mapping, key_group):
 
         for detection in scanned_file.get('license_detections', []):
             license_expression = detection["license_expression"]
-            detection_log = detection["detection_log"]
+            detection_log = detection.get("detection_log", []) or []
             detection_log = '\n'.join(detection_log)
             license_matches = detection["matches"]
             for match in license_matches:

src/packagedcode/plugin_package.py

@@ -240,7 +240,8 @@ def add_license_from_file(resource, codebase, no_licenses):
         if not license_detections_pkg:
             pkg["license_detections"] = license_detections_file.copy()
             for detection in pkg["license_detections"]:
-                detection["detection_log"].append(DetectionRule.PACKAGE_ADD_FROM_FILE.value)
+                if "detection_log" in detection:
+                    detection["detection_log"].append(DetectionRule.PACKAGE_ADD_FROM_FILE.value)
 
             license_expression = get_license_expression_from_detection_mappings(
                 detections=license_detections_file,

tests/cluecode/data/plugin_filter_clues/filtered-expected.json

@@ -17,8 +17,7 @@
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-1.1_63.RULE"
         }
-      ],
-      "detection_log": []
+      ]
     }
   ],
   "license_references": [
@@ -150,8 +149,7 @@
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-1.1_63.RULE"
             }
-          ],
-          "detection_log": []
+          ]
         }
       ],
       "license_clues": [],

tests/cluecode/data/plugin_filter_clues/filtered-expected2.json

@@ -17,8 +17,7 @@
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pygres-2.2_2.RULE"
         }
-      ],
-      "detection_log": []
+      ]
     }
   ],
   "license_references": [
@@ -134,8 +133,7 @@
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/pygres-2.2_2.RULE"
             }
-          ],
-          "detection_log": []
+          ]
         }
       ],
       "license_clues": [],

tests/cluecode/data/plugin_filter_clues/filtered-expected3.json

@@ -17,8 +17,7 @@
           "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/pcre.LICENSE"
         }
-      ],
-      "detection_log": []
+      ]
     }
   ],
   "license_references": [
@@ -148,8 +147,7 @@
               "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/pcre.LICENSE"
             }
-          ],
-          "detection_log": []
+          ]
         }
       ],
       "license_clues": [],

tests/formattedcode/data/csv/livescan/expected.csv

@@ -9,11 +9,11 @@ json2csv.rb,,,,,,,,,,,,,,,,,,,,,,,,,,,,,8,8,,,,,,,,,,,http://www.apache.org/lice
 license,file,license,license,,679,2022-04-20,75c5490a718ddd45e40e0cc7ce0c756abc373123,b965a762efb9421cf1bf4405f336e278,a34098a43e5677495f59dff825a3f9bc0f2b0261d75feb2356919f4c3ce049ab,text/plain,ASCII text,,False,True,False,False,False,False,gpl-2.0-plus,GPL-2.0-or-later,100.0,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 license,,,,,,,,,,,,,,,,,,,,,,,,,,gpl-2.0-plus,,100.00,1,12,113,100.00,1-hash,gpl-2.0-plus,gpl-2.0-plus_420.RULE,100.00,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0-plus_420.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 package.json,file,package.json,package,.json,2200,2022-04-20,918376afce796ef90eeda1d6695f2289c90491ac,1f66239a9b850c5e60a9382dbe2162d2,29f6068a1b6c7d06f115a5edc4ed8558edde42c6bbf0145ed77cf1108a0dd529,application/json,JSON data,,False,True,False,False,False,False,mit,MIT,45.72,0,0,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-package.json,,,,,,,,,,,,,,,,,,,,,,,,,,mit,from-package-file,100.00,24,24,3,100.00,2-aho,mit,mit_27.RULE,100.00,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-package.json,,,,,,,,,,,,,,,,,,,,,,,,,,mit,from-package-file,84.68,24,24,136,85.53,3-seq,mit,mit_823.RULE,99.00,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_823.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+package.json,,,,,,,,,,,,,,,,,,,,,,,,,,mit,,100.00,24,24,3,100.00,2-aho,mit,mit_27.RULE,100.00,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+package.json,,,,,,,,,,,,,,,,,,,,,,,,,,mit,,84.68,24,24,136,85.53,3-seq,mit,mit_823.RULE,99.00,https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_823.RULE,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,24,,,,,,,,Copyright (c) 2012 LearnBoost <[email protected]>,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,24,24,,,,,,,,,LearnBoost,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,12,12,,,,,,,,,,[email protected],,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,16,16,,,,,,,,,,,https://github.com/visionmedia/node-cookie-signature.git,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,27,27,,,,,,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,npm,,cookie-signature,v 1.0.3,,,JavaScript,Sign and unsign cookies,,,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,git+https://github.com/visionmedia/node-cookie-signature.git,,mit,MIT,"[{'license_expression': 'mit', 'matches': [{'score': 100.0, 'start_line': 24, 'end_line': 24, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '2-aho', 'license_expression': 'mit', 'rule_identifier': 'mit_27.RULE', 'rule_relevance': 100, 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE'}, {'score': 84.68, 'start_line': 24, 'end_line': 24, 'matched_length': 136, 'match_coverage': 85.53, 'matcher': '3-seq', 'license_expression': 'mit', 'rule_identifier': 'mit_823.RULE', 'rule_relevance': 99, 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_823.RULE'}], 'detection_log': ['from-package-file']}]",,,,,,,,https://www.npmjs.com/package/cookie-signature,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,https://registry.npmjs.org/cookie-signature/1.0.3,npm_package_json,pkg:npm/[email protected]
+package.json,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,npm,,cookie-signature,v 1.0.3,,,JavaScript,Sign and unsign cookies,,,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,,,,,,https://github.com/visionmedia/node-cookie-signature/issues,,git+https://github.com/visionmedia/node-cookie-signature.git,,mit,MIT,"[{'license_expression': 'mit', 'matches': [{'score': 100.0, 'start_line': 24, 'end_line': 24, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '2-aho', 'license_expression': 'mit', 'rule_identifier': 'mit_27.RULE', 'rule_relevance': 100, 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_27.RULE'}, {'score': 84.68, 'start_line': 24, 'end_line': 24, 'matched_length': 136, 'match_coverage': 85.53, 'matcher': '3-seq', 'license_expression': 'mit', 'rule_identifier': 'mit_823.RULE', 'rule_relevance': 99, 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/mit_823.RULE'}]}]",,,,,,,,https://www.npmjs.com/package/cookie-signature,https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz,https://registry.npmjs.org/cookie-signature/1.0.3,npm_package_json,pkg:npm/[email protected]

tests/formattedcode/data/csv/packages/expected-no-root.csv

@@ -1,3 +1,3 @@
 path,type,scan_errors,package__type,package__namespace,package__name,package__version,package__qualifiers,package__subpath,package__primary_language,package__description,package__release_date,package__homepage_url,package__download_url,package__size,package__sha1,package__md5,package__sha256,package__sha512,package__bug_tracking_url,package__code_view_url,package__vcs_url,package__copyright,package__declared_license_expression,package__declared_license_expression_spdx,package__license_detections,package__other_license_expression,package__other_license_expression_spdx,package__other_license_detections,package__extracted_license_statement,package__notice_text,package__file_references,package__extra_data,package__repository_homepage_url,package__repository_download_url,package__api_data_url,package__datasource_id,package__purl
 package.json,file,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-package.json,,,npm,,npm,v 2.13.5,,,JavaScript,a package manager for JavaScript,,https://docs.npmjs.com/,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,,a124386bce4a90506f28ad4b1d1a804a17baaf32,,,,http://github.com/npm/npm/issues,,git+https://github.com/npm/npm.git@fc7bbf03e39cc48a8924b90696d28345a6a90f3c,,artistic-2.0,Artistic-2.0,"[{'license_expression': 'artistic-2.0', 'matches': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'matched_text': 'Artistic-2.0'}], 'detection_log': []}]",,,,['Artistic-2.0'],,,,https://www.npmjs.com/package/npm,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,https://registry.npmjs.org/npm/2.13.5,npm_package_json,pkg:npm/[email protected]
+package.json,,,npm,,npm,v 2.13.5,,,JavaScript,a package manager for JavaScript,,https://docs.npmjs.com/,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,,a124386bce4a90506f28ad4b1d1a804a17baaf32,,,,http://github.com/npm/npm/issues,,git+https://github.com/npm/npm.git@fc7bbf03e39cc48a8924b90696d28345a6a90f3c,,artistic-2.0,Artistic-2.0,"[{'license_expression': 'artistic-2.0', 'matches': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'matched_text': 'Artistic-2.0'}]}]",,,,['Artistic-2.0'],,,,https://www.npmjs.com/package/npm,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,https://registry.npmjs.org/npm/2.13.5,npm_package_json,pkg:npm/[email protected]

tests/formattedcode/data/csv/packages/expected.csv

@@ -1,4 +1,4 @@
 path,type,scan_errors,package__type,package__namespace,package__name,package__version,package__qualifiers,package__subpath,package__primary_language,package__description,package__release_date,package__homepage_url,package__download_url,package__size,package__sha1,package__md5,package__sha256,package__sha512,package__bug_tracking_url,package__code_view_url,package__vcs_url,package__copyright,package__declared_license_expression,package__declared_license_expression_spdx,package__license_detections,package__other_license_expression,package__other_license_expression_spdx,package__other_license_detections,package__extracted_license_statement,package__notice_text,package__file_references,package__extra_data,package__repository_homepage_url,package__repository_download_url,package__api_data_url,package__datasource_id,package__purl
 scan/,directory,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 scan/package.json,file,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-scan/package.json,,,npm,,npm,v 2.13.5,,,JavaScript,a package manager for JavaScript,,https://docs.npmjs.com/,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,,a124386bce4a90506f28ad4b1d1a804a17baaf32,,,,http://github.com/npm/npm/issues,,git+https://github.com/npm/npm.git@fc7bbf03e39cc48a8924b90696d28345a6a90f3c,,artistic-2.0,Artistic-2.0,"[{'license_expression': 'artistic-2.0', 'matches': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'matched_text': 'Artistic-2.0'}], 'detection_log': []}]",,,,['Artistic-2.0'],,,,https://www.npmjs.com/package/npm,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,https://registry.npmjs.org/npm/2.13.5,npm_package_json,pkg:npm/[email protected]
+scan/package.json,,,npm,,npm,v 2.13.5,,,JavaScript,a package manager for JavaScript,,https://docs.npmjs.com/,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,,a124386bce4a90506f28ad4b1d1a804a17baaf32,,,,http://github.com/npm/npm/issues,,git+https://github.com/npm/npm.git@fc7bbf03e39cc48a8924b90696d28345a6a90f3c,,artistic-2.0,Artistic-2.0,"[{'license_expression': 'artistic-2.0', 'matches': [{'score': 50.0, 'start_line': 1, 'end_line': 1, 'matched_length': 3, 'match_coverage': 100.0, 'matcher': '1-hash', 'license_expression': 'artistic-2.0', 'rule_identifier': 'spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'rule_relevance': 50, 'rule_url': 'https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_artistic-2.0_for_artistic-2.0.RULE', 'matched_text': 'Artistic-2.0'}]}]",,,,['Artistic-2.0'],,,,https://www.npmjs.com/package/npm,https://registry.npmjs.org/npm/-/npm-2.13.5.tgz,https://registry.npmjs.org/npm/2.13.5,npm_package_json,pkg:npm/[email protected]

tests/licensedcode/data/additional_licenses/additional_license_combined_test.expected.json

@@ -3,10 +3,7 @@
     {
       "identifier": "example_installed_1_and_example_installed_2_and_example1_and_example2_and_apache_2_0-b3a0a512-8017-d55e-92ca-bff2e4eda61c",
       "license_expression": "example-installed-1 AND example-installed-2 AND example1 AND example2 AND apache-2.0",
-      "count": 1,
-      "detection_log": [
-        "not-combined"
-      ],
+      "detection_count": 1,
       "matches": [
         {
           "score": 100.0,
@@ -17,6 +14,7 @@
           "matcher": "2-aho",
           "license_expression": "example-installed-1",
           "rule_identifier": "example-installed-1.LICENSE",
+          "rule_relevance": 100,
           "rule_url": null
         },
         {
@@ -28,6 +26,7 @@
           "matcher": "2-aho",
           "license_expression": "example-installed-2",
           "rule_identifier": "example-installed-2.LICENSE",
+          "rule_relevance": 100,
           "rule_url": null
         },
         {
@@ -39,6 +38,7 @@
           "matcher": "2-aho",
           "license_expression": "example1",
           "rule_identifier": "example1.LICENSE",
+          "rule_relevance": 100,
           "rule_url": null
         },
         {
@@ -50,6 +50,7 @@
           "matcher": "2-aho",
           "license_expression": "example2",
           "rule_identifier": "example2.LICENSE",
+          "rule_relevance": 100,
           "rule_url": null
         },
         {
@@ -61,6 +62,7 @@
           "matcher": "2-aho",
           "license_expression": "apache-2.0",
           "rule_identifier": "apache-2.0_65.RULE",
+          "rule_relevance": 100,
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
         }
       ]
@@ -386,9 +388,6 @@
       "license_detections": [
         {
           "license_expression": "example-installed-1 AND example-installed-2 AND example1 AND example2 AND apache-2.0",
-          "detection_log": [
-            "not-combined"
-          ],
           "matches": [
             {
               "score": 100.0,
@@ -399,6 +398,7 @@
               "matcher": "2-aho",
               "license_expression": "example-installed-1",
               "rule_identifier": "example-installed-1.LICENSE",
+              "rule_relevance": 100,
               "rule_url": null
             },
             {
@@ -410,6 +410,7 @@
               "matcher": "2-aho",
               "license_expression": "example-installed-2",
               "rule_identifier": "example-installed-2.LICENSE",
+              "rule_relevance": 100,
               "rule_url": null
             },
             {
@@ -421,6 +422,7 @@
               "matcher": "2-aho",
               "license_expression": "example1",
               "rule_identifier": "example1.LICENSE",
+              "rule_relevance": 100,
               "rule_url": null
             },
             {
@@ -432,6 +434,7 @@
               "matcher": "2-aho",
               "license_expression": "example2",
               "rule_identifier": "example2.LICENSE",
+              "rule_relevance": 100,
               "rule_url": null
             },
             {
@@ -443,6 +446,7 @@
               "matcher": "2-aho",
               "license_expression": "apache-2.0",
               "rule_identifier": "apache-2.0_65.RULE",
+              "rule_relevance": 100,
               "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_65.RULE"
             }
           ]

tests/licensedcode/data/additional_licenses/additional_license_directory_test.expected.json

@@ -3,10 +3,7 @@
     {
       "identifier": "example1_and_example2-2f6955bf-3007-907c-96a9-972954a09866",
       "license_expression": "example1 AND example2",
-      "count": 1,
-      "detection_log": [
-        "not-combined"
-      ],
+      "detection_count": 1,
       "matches": [
         {
           "score": 100.0,
@@ -17,6 +14,7 @@
           "matcher": "2-aho",
           "license_expression": "example1",
           "rule_identifier": "example1.LICENSE",
+          "rule_relevance": 100,
           "rule_url": null
         },
         {
@@ -28,6 +26,7 @@
           "matcher": "2-aho",
           "license_expression": "example2",
           "rule_identifier": "example2.LICENSE",
+          "rule_relevance": 100,
           "rule_url": null
         }
       ]
@@ -164,9 +163,6 @@
       "license_detections": [
         {
           "license_expression": "example1 AND example2",
-          "detection_log": [
-            "not-combined"
-          ],
           "matches": [
             {
               "score": 100.0,
@@ -177,6 +173,7 @@
               "matcher": "2-aho",
               "license_expression": "example1",
               "rule_identifier": "example1.LICENSE",
+              "rule_relevance": 100,
               "rule_url": null
             },
             {
@@ -188,6 +185,7 @@
               "matcher": "2-aho",
               "license_expression": "example2",
               "rule_identifier": "example2.LICENSE",
+              "rule_relevance": 100,
               "rule_url": null
             }
           ]