Improve license test results

Adjust with latest license code detection for required phrases

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

tests/formattedcode/data/common/manifests-expected.jsonlines

@@ -20,11 +20,11 @@
           "system_environment": {
             "operating_system": "linux",
             "cpu_architecture": "64",
-            "platform": "Linux-5.15.0-116-generic-x86_64-with-glibc2.35",
-            "platform_version": "#126-Ubuntu SMP Mon Jul 1 10:14:24 UTC 2024",
-            "python_version": "3.10.12 (main, Mar 22 2024, 16:50:05) [GCC 11.4.0]"
+            "platform": "Linux-6.8.0-45-generic-x86_64-with-glibc2.35",
+            "platform_version": "#45~22.04.1-Ubuntu SMP PREEMPT_DYNAMIC Wed Sep 11 15:25:05 UTC 2",
+            "python_version": "3.11.8 (main, Feb 12 2024, 14:25:06) [GCC 11.4.0]"
           },
-          "spdx_license_list_version": "3.24",
+          "spdx_license_list_version": "3.25",
           "files_count": 4
         }
       }
@@ -819,15 +819,15 @@
         "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8",
         "license_expression": "apache-2.0",
         "license_expression_spdx": "Apache-2.0",
-        "detection_count": 3,
+        "detection_count": 2,
         "reference_matches": [
           {
             "license_expression": "apache-2.0",
             "license_expression_spdx": "Apache-2.0",
             "from_file": "manifests/npm-license-mapping/package.json",
-            "start_line": 20,
-            "end_line": 20,
-            "matcher": "2-aho",
+            "start_line": 1,
+            "end_line": 1,
+            "matcher": "1-hash",
             "score": 100.0,
             "matched_length": 3,
             "match_coverage": 100.0,
@@ -837,6 +837,28 @@
           }
         ]
       },
+      {
+        "identifier": "apache_2_0-0d7a2023-aae9-2989-7f00-27b713b809bb",
+        "license_expression": "apache-2.0",
+        "license_expression_spdx": "Apache-2.0",
+        "detection_count": 1,
+        "reference_matches": [
+          {
+            "license_expression": "apache-2.0",
+            "license_expression_spdx": "Apache-2.0",
+            "from_file": "manifests/npm-license-mapping/package.json",
+            "start_line": 18,
+            "end_line": 20,
+            "matcher": "2-aho",
+            "score": 100.0,
+            "matched_length": 5,
+            "match_coverage": 100.0,
+            "rule_relevance": 100,
+            "rule_identifier": "apache-2.0_required_phrase_7.RULE",
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_required_phrase_7.RULE"
+          }
+        ]
+      },
       {
         "identifier": "apache_2_0-ec759ae0-ea5a-f138-793e-388520e080c0",
         "license_expression": "apache-2.0",
@@ -1614,22 +1636,22 @@
                 "license_expression": "apache-2.0",
                 "spdx_license_expression": "Apache-2.0",
                 "from_file": "manifests/npm-license-mapping/package.json",
-                "start_line": 20,
+                "start_line": 18,
                 "end_line": 20,
                 "matcher": "2-aho",
                 "score": 100.0,
-                "matched_length": 3,
+                "matched_length": 5,
                 "match_coverage": 100.0,
                 "rule_relevance": 100,
-                "rule_identifier": "spdx_license_id_apache-2.0_for_apache-2.0.RULE",
-                "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_apache-2.0_for_apache-2.0.RULE"
+                "rule_identifier": "apache-2.0_required_phrase_7.RULE",
+                "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_required_phrase_7.RULE"
               }
             ],
-            "identifier": "apache_2_0-d66ab77d-a5cc-7104-e702-dc7df61fe9e8"
+            "identifier": "apache_2_0-0d7a2023-aae9-2989-7f00-27b713b809bb"
           }
         ],
         "license_clues": [],
-        "percentage_of_license_text": 5.51,
+        "percentage_of_license_text": 7.09,
         "copyrights": [],
         "holders": [],
         "authors": [

tests/packagedcode/data/alpine/apkbuild-problems/alpine14/main/sqsh/APKBUILD-expected.json

@@ -36,16 +36,16 @@
           "start_line": 1,
           "end_line": 1,
           "matcher": "1-hash",
-          "score": 50.0,
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "rule_relevance": 50,
+          "rule_relevance": 100,
           "rule_identifier": "spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE",
           "matched_text": "gpl-1.0-or-later"
         }
       ],
-      "identifier": "gpl_1_0_plus-757c6eaa-30b2-56ce-77bb-b6bd8dc83d88"
+      "identifier": "gpl_1_0_plus-15a72215-873f-562d-09b8-391aba044287"
     }
   ],
   "other_license_expression": null,

tests/packagedcode/data/alpine/apkbuild/alpine14/testing/pnmixer/APKBUILD-expected.json

@@ -36,16 +36,16 @@
           "start_line": 1,
           "end_line": 1,
           "matcher": "1-hash",
-          "score": 50.0,
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "rule_relevance": 50,
+          "rule_relevance": 100,
           "rule_identifier": "spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE",
           "matched_text": "gpl-1.0-or-later"
         }
       ],
-      "identifier": "gpl_1_0_plus-757c6eaa-30b2-56ce-77bb-b6bd8dc83d88"
+      "identifier": "gpl_1_0_plus-15a72215-873f-562d-09b8-391aba044287"
     }
   ],
   "other_license_expression": null,

tests/packagedcode/data/alpine/apkbuild/alpine14/testing/ubuntu-archive-keyring/APKBUILD-expected.json

@@ -36,16 +36,16 @@
           "start_line": 1,
           "end_line": 1,
           "matcher": "1-hash",
-          "score": 50.0,
+          "score": 100.0,
           "matched_length": 5,
           "match_coverage": 100.0,
-          "rule_relevance": 50,
+          "rule_relevance": 100,
           "rule_identifier": "spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE",
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/spdx_license_id_gpl-1.0-or-later_for_gpl-1.0-plus.RULE",
           "matched_text": "gpl-1.0-or-later"
         }
       ],
-      "identifier": "gpl_1_0_plus-757c6eaa-30b2-56ce-77bb-b6bd8dc83d88"
+      "identifier": "gpl_1_0_plus-15a72215-873f-562d-09b8-391aba044287"
     }
   ],
   "other_license_expression": null,

tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/a/apache2/stable_copyright-detailed.expected.yml

@@ -406,10 +406,10 @@ other_license_detections:
         start_line: 306
         end_line: 309
         matcher: 2-aho
-        score: '100.0'
+        score: '99.0'
         matched_length: 47
         match_coverage: '100.0'
-        rule_relevance: 100
+        rule_relevance: 99
         rule_identifier: apache-2.0_1021.RULE
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1021.RULE
         matched_text: |
@@ -449,7 +449,7 @@ other_license_detections:
           sources, credits must appear in the documentation.
 
           4. This notice may not be removed or altered.
-    identifier: apache_2_0_and_hs_regexp-418b8fd9-1905-1ad7-6930-311a90aaf0a7
+    identifier: apache_2_0_and_hs_regexp-b58332f1-4f96-ae87-9f3d-691331c863c9
   - license_expression: bsd-unchanged
     license_expression_spdx: LicenseRef-scancode-bsd-unchanged
     matches: