Regen test expectations and update clues detection

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

Author: AyanSinhaMahapatra

src/licensedcode/detection.py

@@ -1556,7 +1556,9 @@ def analyze_detection(license_matches, package_license=False):
     ):
         return DetectionCategory.FALSE_POSITVE.value
 
-    elif has_correct_license_clue_matches(license_matches=license_matches):
+    elif not package_license and has_correct_license_clue_matches(
+        license_matches=license_matches
+    ):
         return DetectionCategory.LICENSE_CLUES.value
 
     # Case where all matches have `matcher` as `1-hash` or `4-spdx-id`

tests/licensedcode/data/datadriven/external/glc/MIT-NoAd.t1.yml

@@ -1,5 +1,5 @@
 license_expressions:
-  - x11-fsf
+  - x11-xconsortium
 notes: |
   License test derived from a file of the BSD-licensed repository at:
   https://raw.githubusercontent.com/google/licensecheck/v0.3.1/testdata/MIT-NoAd.t1

tests/packagedcode/data/debian/basic-rootfs-expected.json

@@ -97,7 +97,7 @@
           "identifier": "bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98"
         },
         {
-          "license_expression": "x11-fsf",
+          "license_expression": "x11-xconsortium",
           "matches": [
             {
               "score": 100.0,
@@ -106,14 +106,14 @@
               "matched_length": 199,
               "match_coverage": 100.0,
               "matcher": "2-aho",
-              "license_expression": "x11-fsf",
-              "rule_identifier": "x11-fsf_7.RULE",
+              "license_expression": "x11-xconsortium",
+              "rule_identifier": "x11-xconsortium_41.RULE",
               "rule_relevance": 100,
-              "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-fsf_7.RULE",
+              "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
               "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
             }
           ],
-          "identifier": "x11_fsf-c2b8535e-1b81-42d8-945b-b026f349228d"
+          "identifier": "x11_xconsortium-4a366de0-e107-017e-0783-8145953fe45e"
         }
       ],
       "other_license_expression": null,
@@ -440,7 +440,7 @@
               "identifier": "bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98"
             },
             {
-              "license_expression": "x11-fsf",
+              "license_expression": "x11-xconsortium",
               "matches": [
                 {
                   "score": 100.0,
@@ -449,14 +449,14 @@
                   "matched_length": 199,
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
-                  "license_expression": "x11-fsf",
-                  "rule_identifier": "x11-fsf_7.RULE",
+                  "license_expression": "x11-xconsortium",
+                  "rule_identifier": "x11-xconsortium_41.RULE",
                   "rule_relevance": 100,
-                  "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-fsf_7.RULE",
+                  "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
                   "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
                 }
               ],
-              "identifier": "x11_fsf-c2b8535e-1b81-42d8-945b-b026f349228d"
+              "identifier": "x11_xconsortium-4a366de0-e107-017e-0783-8145953fe45e"
             }
           ],
           "other_license_expression": null,

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

@@ -1,7 +1,7 @@
 declared_license:
-declared_license_expression: x11-fsf AND x11-xconsortium AND bsd-new AND x11-fsf
+declared_license_expression: x11-fsf AND x11-xconsortium AND bsd-new AND x11-xconsortium
 declared_license_expression_spdx: X11-distribute-modifications-variant AND X11 AND BSD-3-Clause
-  AND X11-distribute-modifications-variant
+  AND X11
 other_license_expression:
 other_license_expression_spdx:
 license_detections:
@@ -114,18 +114,18 @@ license_detections:
           OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
           SUCH DAMAGE.
     identifier: bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98
-  - license_expression: x11-fsf
+  - license_expression: x11-xconsortium
     matches:
       - score: '100.0'
         start_line: 105
         end_line: 127
         matched_length: '199'
         match_coverage: '100.0'
         matcher: 2-aho
-        license_expression: x11-fsf
-        rule_identifier: x11-fsf_7.RULE
+        license_expression: x11-xconsortium
+        rule_identifier: x11-xconsortium_41.RULE
         rule_relevance: 100
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-fsf_7.RULE
+        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE
         matched_text: |
           Permission is hereby granted, free of charge, to any person obtaining a
           copy of this software and associated documentation files (the
@@ -150,7 +150,7 @@ license_detections:
           holders shall not be used in advertising or otherwise to promote the
           sale, use or other dealings in this Software without prior written
           authorization.
-    identifier: x11_fsf-c2b8535e-1b81-42d8-945b-b026f349228d
+    identifier: x11_xconsortium-4a366de0-e107-017e-0783-8145953fe45e
 other_license_detections: []
 copyright: |
   Copyright (c) 1998-2018 Free Software Foundation, Inc.

tests/packagedcode/data/debian/debian-container-layer.tar.xz.get-installed-expected.json

@@ -96,7 +96,7 @@
         "identifier": "bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98"
       },
       {
-        "license_expression": "x11-fsf",
+        "license_expression": "x11-xconsortium",
         "matches": [
           {
             "score": 100.0,
@@ -105,14 +105,14 @@
             "matched_length": 199,
             "match_coverage": 100.0,
             "matcher": "2-aho",
-            "license_expression": "x11-fsf",
-            "rule_identifier": "x11-fsf_7.RULE",
+            "license_expression": "x11-xconsortium",
+            "rule_identifier": "x11-xconsortium_41.RULE",
             "rule_relevance": 100,
-            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-fsf_7.RULE",
+            "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
             "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
           }
         ],
-        "identifier": "x11_fsf-c2b8535e-1b81-42d8-945b-b026f349228d"
+        "identifier": "x11_xconsortium-4a366de0-e107-017e-0783-8145953fe45e"
       }
     ],
     "other_license_expression": null,
@@ -268,7 +268,7 @@
                 "identifier": "bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98"
               },
               {
-                "license_expression": "x11-fsf",
+                "license_expression": "x11-xconsortium",
                 "matches": [
                   {
                     "score": 100.0,
@@ -277,14 +277,14 @@
                     "matched_length": 199,
                     "match_coverage": 100.0,
                     "matcher": "2-aho",
-                    "license_expression": "x11-fsf",
-                    "rule_identifier": "x11-fsf_7.RULE",
+                    "license_expression": "x11-xconsortium",
+                    "rule_identifier": "x11-xconsortium_41.RULE",
                     "rule_relevance": 100,
-                    "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-fsf_7.RULE",
+                    "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
                     "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
                   }
                 ],
-                "identifier": "x11_fsf-c2b8535e-1b81-42d8-945b-b026f349228d"
+                "identifier": "x11_xconsortium-4a366de0-e107-017e-0783-8145953fe45e"
               }
             ],
             "other_license_expression": null,

tests/packagedcode/data/debian/debian-container-layer.tar.xz.scan-expected.json

@@ -97,7 +97,7 @@
           "identifier": "bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98"
         },
         {
-          "license_expression": "x11-fsf",
+          "license_expression": "x11-xconsortium",
           "matches": [
             {
               "score": 100.0,
@@ -106,14 +106,14 @@
               "matched_length": 199,
               "match_coverage": 100.0,
               "matcher": "2-aho",
-              "license_expression": "x11-fsf",
-              "rule_identifier": "x11-fsf_7.RULE",
+              "license_expression": "x11-xconsortium",
+              "rule_identifier": "x11-xconsortium_41.RULE",
               "rule_relevance": 100,
-              "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-fsf_7.RULE",
+              "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
               "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
             }
           ],
-          "identifier": "x11_fsf-c2b8535e-1b81-42d8-945b-b026f349228d"
+          "identifier": "x11_xconsortium-4a366de0-e107-017e-0783-8145953fe45e"
         }
       ],
       "other_license_expression": null,
@@ -454,7 +454,7 @@
               "identifier": "bsd_new-ccc98c3a-92d4-e7a3-e0ba-798328cb6b98"
             },
             {
-              "license_expression": "x11-fsf",
+              "license_expression": "x11-xconsortium",
               "matches": [
                 {
                   "score": 100.0,
@@ -463,14 +463,14 @@
                   "matched_length": 199,
                   "match_coverage": 100.0,
                   "matcher": "2-aho",
-                  "license_expression": "x11-fsf",
-                  "rule_identifier": "x11-fsf_7.RULE",
+                  "license_expression": "x11-xconsortium",
+                  "rule_identifier": "x11-xconsortium_41.RULE",
                   "rule_relevance": 100,
-                  "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-fsf_7.RULE",
+                  "rule_url": "https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/x11-xconsortium_41.RULE",
                   "matched_text": "Permission is hereby granted, free of charge, to any person obtaining a\ncopy of this software and associated documentation files (the\n\"Software\"), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be included\nin all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\nOR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n\nExcept as contained in this notice, the name(s) of the above copyright\nholders shall not be used in advertising or otherwise to promote the\nsale, use or other dealings in this Software without prior written\nauthorization."
                 }
               ],
-              "identifier": "x11_fsf-c2b8535e-1b81-42d8-945b-b026f349228d"
+              "identifier": "x11_xconsortium-4a366de0-e107-017e-0783-8145953fe45e"
             }
           ],
           "other_license_expression": null,