Update test results

Signed-off-by: Philippe Ombredanne <[email protected]>
aboutcode-org · Oct 8, 2024 · 3ad7302 · 3ad7302
1 parent 28e2ef4
commit 3ad7302
Show file tree

Hide file tree

Showing 6 changed files with 120 additions and 43 deletions.
diff --git a/...edcode/data/licenses_reference_reporting/license-reference-works-with-clues.expected.json b/...edcode/data/licenses_reference_reporting/license-reference-works-with-clues.expected.json
@@ -1210,7 +1210,7 @@
       "is_license_tag": false,
       "is_license_intro": false,
       "is_license_clue": false,
-      "is_required_phrase": false,
+      "is_required_phrase": true,
       "skip_for_required_phrase_generation": false,
       "is_continuous": false,
       "is_builtin": true,
@@ -1284,7 +1284,7 @@
       "ignorable_authors": [],
       "ignorable_urls": [],
       "ignorable_emails": [],
-      "text": "released under the GPL"
+      "text": "released {{under the GPL}}"
     },
     {
       "license_expression": "unknown-license-reference",
@@ -1441,7 +1441,7 @@
       "ignorable_authors": [],
       "ignorable_urls": [],
       "ignorable_emails": [],
-      "text": "GPL-compatible"
+      "text": "GPL-compatible\n"
     },
     {
       "license_expression": "python-cwi",

diff --git a/...nsedcode/data/licenses_reference_reporting/scan-matched-text-with-reference.expected.json b/...nsedcode/data/licenses_reference_reporting/scan-matched-text-with-reference.expected.json
@@ -390,7 +390,7 @@
         "http://www.apache.org/licenses/LICENSE-2.0"
       ],
       "ignorable_emails": [],
-      "text": "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the Apache License, Version 2.0 (the \"License\"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License."
+      "text": "{{Licensed to the Apache Software Foundation}} (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the {{Apache License, Version 2.0}} (the \"License\"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License."
     },
     {
       "license_expression": "artistic-2.0",

diff --git a/tests/licensedcode/data/licenses_reference_reporting/scan-with-reference.expected.json b/tests/licensedcode/data/licenses_reference_reporting/scan-with-reference.expected.json
@@ -380,7 +380,7 @@
         "http://www.apache.org/licenses/LICENSE-2.0"
       ],
       "ignorable_emails": [],
-      "text": "Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the Apache License, Version 2.0 (the \"License\"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License."
+      "text": "{{Licensed to the Apache Software Foundation}} (ASF) under one or more contributor license agreements.  See the NOTICE file distributed with this work for additional information regarding copyright ownership.  The ASF licenses this file to you under the {{Apache License, Version 2.0}} (the \"License\"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the specific language governing permissions and limitations under the License."
     },
     {
       "license_expression": "artistic-2.0",

diff --git a/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json b/tests/licensedcode/data/plugin_license/clues/woodstox.expected.json
@@ -161,7 +161,7 @@
         "http://www.apache.org/licenses/"
       ],
       "ignorable_emails": [],
-      "text": "Apache License\nVersion 2.0, January 2004\nhttp://www.apache.org/licenses/"
+      "text": "{{Apache License\nVersion 2.0}}, January 2004\nhttp://www.apache.org/licenses/"
     },
     {
       "license_expression": "apache-2.0",
@@ -194,7 +194,7 @@
         "http://www.apache.org/licenses/"
       ],
       "ignorable_emails": [],
-      "text": "This copy of is licensed under the\nApache (Software) License, version 2.0 (\"the License\").\nSee the License for details about distribution rights, and the\nspecific rights regarding derivate works.\n\nYou may obtain a copy of the License at:\n\nhttp://www.apache.org/licenses/\n\nA copy is also included in the downloadable source code package\ncontaining , in file \"AL2.0\", under the same directory\nas this file."
+      "text": "This copy of is licensed under {{the\nApache (Software) License, version 2.0}} (\"the License\").\nSee the License for details about distribution rights, and the\nspecific rights regarding derivate works.\n\nYou may obtain a copy of the License at:\n\nhttp://www.apache.org/licenses/\n\nA copy is also included in the downloadable source code package\ncontaining , in file \"AL2.0\", under the same directory\nas this file."
     },
     {
       "license_expression": "unknown-license-reference",

diff --git a/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json b/tests/licensedcode/data/plugin_license/scan/e2fsprogs-expected.json
@@ -21,32 +21,61 @@
           "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/gpl-2.0_and_patent-disclaimer_3.RULE"
         }
       ]
+    },
+    {
+      "identifier": "lgpl_2_0_plus-ad844342-08bd-13b3-957e-f7440d82d6ed",
+      "license_expression": "lgpl-2.0-plus",
+      "license_expression_spdx": "LGPL-2.0-or-later",
+      "detection_count": 1,
+      "reference_matches": [
+        {
+          "license_expression": "lgpl-2.0-plus",
+          "license_expression_spdx": "LGPL-2.0-or-later",
+          "from_file": "e2fsprogs/e2fsprogs-copyright",
+          "start_line": 19,
+          "end_line": 19,
+          "matcher": "2-aho",
+          "score": 99.0,
+          "matched_length": 2,
+          "match_coverage": 100.0,
+          "rule_relevance": 99,
+          "rule_identifier": "lgpl_33.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_33.RULE"
+        }
+      ]
     }
   ],
   "files": [
     {
       "path": "e2fsprogs-copyright",
       "type": "file",
-      "detected_license_expression": null,
-      "detected_license_expression_spdx": null,
-      "license_detections": [],
-      "license_clues": [
+      "detected_license_expression": "lgpl-2.0-plus",
+      "detected_license_expression_spdx": "LGPL-2.0-or-later",
+      "license_detections": [
         {
           "license_expression": "lgpl-2.0-plus",
-          "spdx_license_expression": "LGPL-2.0-or-later",
-          "from_file": "e2fsprogs/e2fsprogs-copyright",
-          "start_line": 19,
-          "end_line": 20,
-          "matcher": "3-seq",
-          "score": 14.39,
-          "matched_length": 20,
-          "match_coverage": 14.39,
-          "rule_relevance": 100,
-          "rule_identifier": "lgpl-2.0-plus_65.RULE",
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.0-plus_65.RULE"
+          "license_expression_spdx": "LGPL-2.0-or-later",
+          "matches": [
+            {
+              "license_expression": "lgpl-2.0-plus",
+              "spdx_license_expression": "LGPL-2.0-or-later",
+              "from_file": "e2fsprogs/e2fsprogs-copyright",
+              "start_line": 19,
+              "end_line": 19,
+              "matcher": "2-aho",
+              "score": 99.0,
+              "matched_length": 2,
+              "match_coverage": 100.0,
+              "rule_relevance": 99,
+              "rule_identifier": "lgpl_33.RULE",
+              "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl_33.RULE"
+            }
+          ],
+          "identifier": "lgpl_2_0_plus-ad844342-08bd-13b3-957e-f7440d82d6ed"
         }
       ],
-      "percentage_of_license_text": 22.73,
+      "license_clues": [],
+      "percentage_of_license_text": 2.27,
       "scan_errors": []
     },
     {

diff --git a/...ta/plugin_license/unknown_intro/scan-unknown-intro-eclipse-foundation-tycho.expected.json b/...ta/plugin_license/unknown_intro/scan-unknown-intro-eclipse-foundation-tycho.expected.json
@@ -26,7 +26,7 @@
       ]
     },
     {
-      "identifier": "apache_2_0-14c27abb-363c-4c38-b5c4-095fce7dd164",
+      "identifier": "apache_2_0-a6e2f0c7-bc81-4ff9-2c82-cf3897de2210",
       "license_expression": "apache-2.0",
       "license_expression_spdx": "Apache-2.0",
       "detection_count": 2,
@@ -37,16 +37,32 @@
           "license_expression_spdx": "Apache-2.0",
           "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_1.html",
           "start_line": 34,
+          "end_line": 34,
+          "matcher": "2-aho",
+          "score": 90.0,
+          "matched_length": 6,
+          "match_coverage": 100.0,
+          "rule_relevance": 90,
+          "rule_identifier": "apache-2.0_required_phrase_29.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_required_phrase_29.RULE",
+          "matched_text": "<p>The plug-in includes SureFire JUnit Runner ${surefire-version} developed by the Apache Software Foundation.  Therefore:</p>",
+          "matched_text_diagnostics": "developed by the Apache Software Foundation."
+        },
+        {
+          "license_expression": "apache-2.0",
+          "license_expression_spdx": "Apache-2.0",
+          "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_1.html",
+          "start_line": 37,
           "end_line": 37,
           "matcher": "2-aho",
           "score": 95.0,
-          "matched_length": 25,
+          "matched_length": 14,
           "match_coverage": 100.0,
           "rule_relevance": 95,
-          "rule_identifier": "apache-2.0_1203.RULE",
-          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1203.RULE",
-          "matched_text": "<p>The plug-in includes SureFire JUnit Runner ${surefire-version} developed by the Apache Software Foundation.  Therefore:</p>\n\n<blockquote>\nThis product includes software developed by the Apache Software Foundation (<a href=\"http://www.apache.org/\">http://www.apache.org/</a>).",
-          "matched_text_diagnostics": "developed by the Apache Software Foundation.  Therefore:</p>\n\n<blockquote>\nThis product includes software developed by the Apache Software Foundation (<a href=\"http://www.apache.org/\">http://www.apache.org/</"
+          "rule_identifier": "apache_no-version_1.RULE",
+          "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache_no-version_1.RULE",
+          "matched_text": "This product includes software developed by the Apache Software Foundation (<a href=\"http://www.apache.org/\">http://www.apache.org/</a>).",
+          "matched_text_diagnostics": "This product includes software developed by the Apache Software Foundation (<a href=\"http://www.apache.org/\">"
         }
       ]
     },
@@ -307,20 +323,36 @@
               "spdx_license_expression": "Apache-2.0",
               "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_1.html",
               "start_line": 34,
+              "end_line": 34,
+              "matcher": "2-aho",
+              "score": 90.0,
+              "matched_length": 6,
+              "match_coverage": 100.0,
+              "rule_relevance": 90,
+              "rule_identifier": "apache-2.0_required_phrase_29.RULE",
+              "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_required_phrase_29.RULE",
+              "matched_text": "<p>The plug-in includes SureFire JUnit Runner ${surefire-version} developed by the Apache Software Foundation.  Therefore:</p>",
+              "matched_text_diagnostics": "developed by the Apache Software Foundation."
+            },
+            {
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_1.html",
+              "start_line": 37,
               "end_line": 37,
               "matcher": "2-aho",
               "score": 95.0,
-              "matched_length": 25,
+              "matched_length": 14,
               "match_coverage": 100.0,
               "rule_relevance": 95,
-              "rule_identifier": "apache-2.0_1203.RULE",
-              "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1203.RULE",
-              "matched_text": "<p>The plug-in includes SureFire JUnit Runner ${surefire-version} developed by the Apache Software Foundation.  Therefore:</p>\n\n<blockquote>\nThis product includes software developed by the Apache Software Foundation (<a href=\"http://www.apache.org/\">http://www.apache.org/</a>).",
-              "matched_text_diagnostics": "developed by the Apache Software Foundation.  Therefore:</p>\n\n<blockquote>\nThis product includes software developed by the Apache Software Foundation (<a href=\"http://www.apache.org/\">http://www.apache.org/</"
+              "rule_identifier": "apache_no-version_1.RULE",
+              "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache_no-version_1.RULE",
+              "matched_text": "This product includes software developed by the Apache Software Foundation (<a href=\"http://www.apache.org/\">http://www.apache.org/</a>).",
+              "matched_text_diagnostics": "This product includes software developed by the Apache Software Foundation (<a href=\"http://www.apache.org/\">"
             }
           ],
           "detection_log": [],
-          "identifier": "apache_2_0-14c27abb-363c-4c38-b5c4-095fce7dd164"
+          "identifier": "apache_2_0-a6e2f0c7-bc81-4ff9-2c82-cf3897de2210"
         },
         {
           "license_expression": "apache-2.0",
@@ -348,7 +380,7 @@
         }
       ],
       "license_clues": [],
-      "percentage_of_license_text": 61.74,
+      "percentage_of_license_text": 60.56,
       "scan_errors": []
     },
     {
@@ -390,20 +422,36 @@
               "spdx_license_expression": "Apache-2.0",
               "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_2.html",
               "start_line": 34,
+              "end_line": 34,
+              "matcher": "2-aho",
+              "score": 90.0,
+              "matched_length": 6,
+              "match_coverage": 100.0,
+              "rule_relevance": 90,
+              "rule_identifier": "apache-2.0_required_phrase_29.RULE",
+              "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_required_phrase_29.RULE",
+              "matched_text": "<p>The plug-in includes Surefire Shared Java 5 Provider Base ${surefire-version} developed by the Apache Software Foundation.  Therefore:</p>",
+              "matched_text_diagnostics": "developed by the Apache Software Foundation."
+            },
+            {
+              "license_expression": "apache-2.0",
+              "spdx_license_expression": "Apache-2.0",
+              "from_file": "scan-unknown-intro-eclipse-foundation-tycho/about_2.html",
+              "start_line": 37,
               "end_line": 37,
               "matcher": "2-aho",
               "score": 95.0,
-              "matched_length": 25,
+              "matched_length": 14,
               "match_coverage": 100.0,
               "rule_relevance": 95,
-              "rule_identifier": "apache-2.0_1203.RULE",
-              "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_1203.RULE",
-              "matched_text": "<p>The plug-in includes Surefire Shared Java 5 Provider Base ${surefire-version} developed by the Apache Software Foundation.  Therefore:</p>\n\n<blockquote>\nThis product includes software developed by the Apache Software Foundation (<a href=\"http://www.apache.org/\">http://www.apache.org/</a>).",
-              "matched_text_diagnostics": "developed by the Apache Software Foundation.  Therefore:</p>\n\n<blockquote>\nThis product includes software developed by the Apache Software Foundation (<a href=\"http://www.apache.org/\">http://www.apache.org/</"
+              "rule_identifier": "apache_no-version_1.RULE",
+              "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache_no-version_1.RULE",
+              "matched_text": "This product includes software developed by the Apache Software Foundation (<a href=\"http://www.apache.org/\">http://www.apache.org/</a>).",
+              "matched_text_diagnostics": "This product includes software developed by the Apache Software Foundation (<a href=\"http://www.apache.org/\">"
             }
           ],
           "detection_log": [],
-          "identifier": "apache_2_0-14c27abb-363c-4c38-b5c4-095fce7dd164"
+          "identifier": "apache_2_0-a6e2f0c7-bc81-4ff9-2c82-cf3897de2210"
         },
         {
           "license_expression": "apache-2.0",
@@ -527,7 +575,7 @@
         }
       ],
       "license_clues": [],
-      "percentage_of_license_text": 52.59,
+      "percentage_of_license_text": 52.03,
       "scan_errors": []
     },
     {