Regen tests to fix test failures

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

src/licensedcode/data/rules/other-permissive_1066.RULE

@@ -1,6 +1,6 @@
 ---
 license_expression: other-permissive
-is_license_notice: text
+is_license_notice: yes
 ---
 
 // Permission is granted to use at your own risk and distribute this software

tests/licensedcode/data/datadriven/external/fossology-tests/GPL/gcc.c.yml

@@ -1,3 +1,3 @@
 license_expressions:
   - gpl-2.0-plus
-  - free-unknown
+  - warranty-disclaimer

tests/licensedcode/data/datadriven/external/fossology-tests/GPL/version.c.yml

@@ -1,3 +1,3 @@
 license_expressions:
   - gpl-3.0-plus
-  - free-unknown
+  - warranty-disclaimer

tests/licensedcode/data/datadriven/external/fossology-tests/See-doc/init.8.yml

@@ -1,2 +1,2 @@
 license_expressions:
-  - free-unknown
+  - warranty-disclaimer

tests/licensedcode/data/datadriven/external/fossology-tests/See-file/clip_tbl.c.yml

@@ -1,2 +1,2 @@
 license_expressions:
-  - free-unknown
+  - warranty-disclaimer

tests/licensedcode/data/datadriven/external/fossology-tests/See-file/gdcmServiceClassUser.cxx.yml

@@ -1,2 +1,2 @@
 license_expressions:
-  - free-unknown AND other-permissive
+  - bsd-new

tests/licensedcode/data/datadriven/external/fossology-tests/UnclassifiedLicense/config.isc.yml

@@ -1,2 +1,2 @@
 license_expressions:
-  - free-unknown
+  - proprietary-license

tests/licensedcode/data/datadriven/external/glc/url_liliq_p_1_1_90.txt.yml

@@ -1,5 +1,5 @@
 license_expressions:
-  - free-unknown
+  - liliq-p-1.1
 notes: |
   License test derived from a file of the BSD-licensed repository at:
   https://raw.githubusercontent.com/google/licensecheck/v0.3.1/testdata/ccurls.t1

tests/licensedcode/data/datadriven/external/glc/url_liliq_p_1_1_91.txt.yml

@@ -1,5 +1,5 @@
 license_expressions:
-  - free-unknown
+  - liliq-p-1.1
 notes: |
   License test derived from a file of the BSD-licensed repository at:
   https://raw.githubusercontent.com/google/licensecheck/v0.3.1/testdata/ccurls.t1

tests/licensedcode/data/datadriven/external/glc/url_liliq_r_1_1_92.txt.yml

@@ -1,6 +1,6 @@
 license_expressions:
   - free-unknown
-  - free-unknown
+  - liliq-r-1.1
 notes: |
   License test derived from a file of the BSD-licensed repository at:
   https://raw.githubusercontent.com/google/licensecheck/v0.3.1/testdata/ccurls.t1

tests/licensedcode/data/datadriven/external/glc/url_liliq_r_1_1_93.txt.yml

@@ -1,6 +1,6 @@
 license_expressions:
   - free-unknown
-  - free-unknown
+  - liliq-r-1.1
 notes: |
   License test derived from a file of the BSD-licensed repository at:
   https://raw.githubusercontent.com/google/licensecheck/v0.3.1/testdata/ccurls.t1

tests/licensedcode/data/datadriven/external/glc/url_liliq_rplus_1_1_94.txt.yml

@@ -1,6 +1,6 @@
 license_expressions:
   - free-unknown
-  - free-unknown
+  - liliq-rplus-1.1
 notes: |
   License test derived from a file of the BSD-licensed repository at:
   https://raw.githubusercontent.com/google/licensecheck/v0.3.1/testdata/ccurls.t1

tests/licensedcode/data/datadriven/external/glc/url_liliq_rplus_1_1_95.txt.yml

@@ -1,6 +1,6 @@
 license_expressions:
   - free-unknown
-  - free-unknown
+  - liliq-rplus-1.1
 notes: |
   License test derived from a file of the BSD-licensed repository at:
   https://raw.githubusercontent.com/google/licensecheck/v0.3.1/testdata/ccurls.t1

tests/licensedcode/data/datadriven/external/slic-tests/config.guess.yml

@@ -1,3 +1,3 @@
 license_expressions:
   - gpl-3.0-plus WITH autoconf-simple-exception
-  - free-unknown
+  - warranty-disclaimer

tests/licensedcode/data/datadriven/lic1/config.guess-gpl2.txt.yml

@@ -1,3 +1,3 @@
 license_expressions:
   - gpl-2.0-plus WITH autoconf-simple-exception-2.0
-  - free-unknown
+  - warranty-disclaimer

tests/licensedcode/data/datadriven/lic1/config.guess-gpl3.txt.yml

@@ -1,3 +1,3 @@
 license_expressions:
   - gpl-3.0-plus WITH autoconf-simple-exception
-  - free-unknown
+  - warranty-disclaimer

tests/licensedcode/data/datadriven/lic1/fsf-unlimited-no-warranty_with_line_numbers.pl.yml

@@ -1,4 +1,4 @@
 license_expressions:
   - gpl-2.0-plus
   - fsf-unlimited-no-warranty
-  - free-unknown
+  - warranty-disclaimer

tests/licensedcode/data/datadriven/lic1/gpl-2.0-autoconf.txt.yml

@@ -1,3 +1,3 @@
 license_expressions:
   - gpl-2.0-plus WITH autoconf-simple-exception-2.0
-  - free-unknown
+  - warranty-disclaimer

tests/licensedcode/data/datadriven/lic1/gpl-2.0-autoconf_1.txt.yml

@@ -1,3 +1,3 @@
 license_expressions:
   - gpl-2.0-plus WITH autoconf-simple-exception-2.0
-  - free-unknown
+  - warranty-disclaimer

tests/licensedcode/data/datadriven/lic1/gpl-2.0-autoconf_2.txt.yml

@@ -1,3 +1,3 @@
 license_expressions:
   - gpl-2.0-plus WITH autoconf-simple-exception-2.0
-  - free-unknown
+  - warranty-disclaimer

tests/licensedcode/data/datadriven/lic1/gpl-2.0-autoconf_3.txt.yml

@@ -1,3 +1,3 @@
 license_expressions:
   - gpl-2.0-plus WITH autoconf-simple-exception-2.0
-  - free-unknown
+  - warranty-disclaimer

tests/licensedcode/data/datadriven/lic1/gpl-2.0-autoconf_4.txt.yml

@@ -1,3 +1,3 @@
 license_expressions:
   - gpl-2.0-plus WITH autoconf-simple-exception-2.0
-  - free-unknown
+  - warranty-disclaimer

tests/licensedcode/data/datadriven/lic3/libgcj.so.10.0.0.strings.txt.yml

@@ -1,5 +1,5 @@
 license_expressions:
-  - free-unknown
+  - warranty-disclaimer
   - classpath-exception-2.0
   - gpl-2.0-plus WITH classpath-exception-2.0
   - gpl-2.0-plus WITH classpath-exception-2.0

tests/licensedcode/data/datadriven/lic3/man-pages-3.35-4.fc17.noarch.rpm.POSIX-COPYRIGHT.txt.yml

@@ -1,3 +1,3 @@
 license_expressions:
   - morbig-ieee-std-usage
-  - other-permissive
+  - other-copyleft

tests/licensedcode/test_detect.py

@@ -1062,7 +1062,7 @@ def test_match_has_correct_line_positions_in_automake_perl_file(self):
             # detected, match.lines(), match.qspan,
             ('gpl-2.0-plus', (12, 25), Span(48, 157)),
             ('fsf-unlimited-no-warranty', (231, 238), Span(964, 1027)),
-            ('free-unknown', (306, 307), Span(1335, 1357)),
+            ('warranty-disclaimer', (306, 307), Span(1335, 1357)),
         ]
         self.check_position('positions/automake.pl', expected)
 

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

@@ -50,9 +50,9 @@ other_license_expression: (gpl-2.0 AND gpl-2.0) AND gpl-2.0 AND (gpl-2.0 AND ope
   mit AND bsd-simplified AND bsd-simplified AND bsd-new AND bsd-new AND bsd-new AND zlib AND
   zlib AND isc AND fsf-unlimited AND fsf-free AND fsf-unlimited-no-warranty AND fsf-ap AND fsf-ap
   AND bzip2-libbzip-2010 AND public-domain AND public-domain AND public-domain AND x11-tiff
-  AND (public-domain AND public-domain) AND (apache-2.0 AND (free-unknown AND apache-2.0 WITH
-  generic-exception)) AND (free-unknown AND apache-2.0 WITH generic-exception) AND (gpl-3.0-plus
-  WITH bison-exception-2.2 AND gpl-3.0) AND gpl-3.0
+  AND (public-domain AND public-domain) AND (apache-2.0 AND apache-2.0 WITH generic-exception)
+  AND apache-2.0 WITH generic-exception AND (gpl-3.0-plus WITH bison-exception-2.2 AND gpl-3.0)
+  AND gpl-3.0
 other_license_expression_spdx: (GPL-2.0-only AND GPL-2.0-only) AND GPL-2.0-only AND (GPL-2.0-only
   AND cryptsetup-OpenSSL-exception AND GPL-2.0-only) AND GPL-2.0-only AND (GPL-2.0-or-later
   AND GPL-2.0-or-later) AND GPL-2.0-only AND (GPL-2.0-or-later AND GPL-2.0-or-later) AND GPL-2.0-only
@@ -65,9 +65,8 @@ other_license_expression_spdx: (GPL-2.0-only AND GPL-2.0-only) AND GPL-2.0-only
   AND BSD-3-Clause AND BSD-3-Clause AND Zlib AND Zlib AND ISC AND FSFULLR AND FSFUL AND FSFULLRWD
   AND FSFAP AND FSFAP AND bzip2-1.0.6 AND LicenseRef-scancode-public-domain AND LicenseRef-scancode-public-domain
   AND LicenseRef-scancode-public-domain AND libtiff AND (LicenseRef-scancode-public-domain AND
-  LicenseRef-scancode-public-domain) AND (Apache-2.0 AND (LicenseRef-scancode-free-unknown AND
-  Apache-2.0 WITH LicenseRef-scancode-generic-exception)) AND (LicenseRef-scancode-free-unknown
-  AND Apache-2.0 WITH LicenseRef-scancode-generic-exception) AND (GPL-3.0-or-later WITH Bison-exception-2.2
+  LicenseRef-scancode-public-domain) AND (Apache-2.0 AND Apache-2.0 WITH LicenseRef-scancode-generic-exception)
+  AND Apache-2.0 WITH LicenseRef-scancode-generic-exception AND (GPL-3.0-or-later WITH Bison-exception-2.2
   AND GPL-3.0-only) AND GPL-3.0-only
 license_detections: []
 other_license_detections:
@@ -634,7 +633,7 @@ other_license_detections:
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_bare_words.RULE
         matched_text: public domain.
     identifier: public_domain-12719e81-b9e7-3b20-5ec2-b0cc7eebb090
-  - license_expression: apache-2.0 AND (free-unknown AND apache-2.0 WITH generic-exception)
+  - license_expression: apache-2.0 AND apache-2.0 WITH generic-exception
     matches:
       - score: '100.0'
         start_line: 579
@@ -664,10 +663,10 @@ other_license_detections:
         matched_length: 137
         match_coverage: '100.0'
         matcher: 1-hash
-        license_expression: free-unknown AND apache-2.0 WITH generic-exception
-        rule_identifier: free-unknown_and_apache-2.0_with_generic-exception_1.RULE
+        license_expression: apache-2.0 WITH generic-exception
+        rule_identifier: apache-2.0_with_generic-exception_1.RULE
         rule_relevance: 100
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown_and_apache-2.0_with_generic-exception_1.RULE
+        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_with_generic-exception_1.RULE
         matched_text: |
           See COPYING.YARA. The GPL exception has been granted by upstream in
           https://bugzilla.clamav.net/show_bug.cgi?id=11336:
@@ -681,7 +680,7 @@ other_license_detections:
 
           On Debian systems, the full text of the Apache License, Version 2.0 can be
           found in the file `/usr/share/common-licenses/Apache-2.0'.
-    identifier: apache_2_0_and__free_unknown_and_apache_2_0_with_generic_exception-4b3213fc-c113-2772-9c82-d6f6f834cb7d
+    identifier: apache_2_0_and_apache_2_0_with_generic_exception-a8c6f17d-1661-8453-bad0-5cae80a43f41
   - license_expression: gpl-3.0-plus WITH bison-exception-2.2 AND gpl-3.0
     matches:
       - score: '100.0'
@@ -1127,18 +1126,18 @@ other_license_detections:
         rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/public-domain_58.RULE
         matched_text: FSF changes to this file are in the public domain.
     identifier: x11_xconsortium_and_public_domain-d9561273-6993-908f-b782-aed5836bd09b
-  - license_expression: free-unknown AND apache-2.0 WITH generic-exception
+  - license_expression: apache-2.0 WITH generic-exception
     matches:
       - score: '100.0'
         start_line: 591
         end_line: 602
         matched_length: 137
         match_coverage: '100.0'
         matcher: 1-hash
-        license_expression: free-unknown AND apache-2.0 WITH generic-exception
-        rule_identifier: free-unknown_and_apache-2.0_with_generic-exception_1.RULE
+        license_expression: apache-2.0 WITH generic-exception
+        rule_identifier: apache-2.0_with_generic-exception_1.RULE
         rule_relevance: 100
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/free-unknown_and_apache-2.0_with_generic-exception_1.RULE
+        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/apache-2.0_with_generic-exception_1.RULE
         matched_text: |
           See COPYING.YARA. The GPL exception has been granted by upstream in
           https://bugzilla.clamav.net/show_bug.cgi?id=11336:
@@ -1152,7 +1151,7 @@ other_license_detections:
 
           On Debian systems, the full text of the Apache License, Version 2.0 can be
           found in the file `/usr/share/common-licenses/Apache-2.0'.
-    identifier: free_unknown_and_apache_2_0_with_generic_exception-f6e83f64-9eb6-7bd3-40a7-d2f9f8c12904
+    identifier: apache_2_0_with_generic_exception-a512f441-dab3-b8eb-e03a-3851ccfd84b9
   - license_expression: gpl-3.0
     matches:
       - score: '100.0'

tests/packagedcode/data/debian/copyright/debian-slim-2021-04-07/usr/share/doc/gcc-10-base/copyright-detailed.expected.yml

@@ -1853,7 +1853,7 @@ license_detections:
           \ ARISING IN ANY WAY OUT OF THE USE OF THIS\nSOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY\
           \ OF SUCH DAMAGE."
     identifier: bsd_new-5869de9a-8140-2461-9d3a-19ac46ce9eca
-  - license_expression: unicode
+  - license_expression: unicode AND lgpl-2.1-plus
     matches:
       - score: '100.0'
         start_line: 1494
@@ -1926,21 +1926,21 @@ license_detections:
           not be used in advertising or otherwise to promote the sale, use or other
           dealings in these Data Files or Software without prior written authorization
           of the copyright holder.
-    identifier: unicode-311535c5-21c7-596c-a4ca-130e33826753
-  - license_expression: lgpl-2.1-plus
-    matches:
-      - score: '100.0'
-        start_line: 1550
-        end_line: 1562
-        matched_length: 112
-        match_coverage: '100.0'
-        matcher: 2-aho
+      - score: '81.51'
+        start_line: 1547
+        end_line: 1561
+        matched_length: 119
+        match_coverage: '81.51'
+        matcher: 3-seq
         license_expression: lgpl-2.1-plus
-        rule_identifier: lgpl-2.1-plus_284.RULE
+        rule_identifier: lgpl-2.1-plus_492.RULE
         rule_relevance: 100
-        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_284.RULE
+        rule_url: https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/rules/lgpl-2.1-plus_492.RULE
         matched_text: |
-          The GNU C Library is free software; you can redistribute it and/or
+          Free Software Foundation, Inc.
+          # This file is part of the GNU C Library.
+          #
+          # The GNU C Library is free software; you can redistribute it and/or
           # modify it under the terms of the GNU Lesser General Public
           # License as published by the Free Software Foundation; either
           # version 2.1 of the License, or (at your option) any later version.
@@ -1951,9 +1951,8 @@ license_detections:
           # Lesser General Public License for more details.
           #
           # You should have received a copy of the GNU Lesser General Public
-          # License along with the GNU C Library; if not, see
-          # <https://www.gnu.org/licenses/>.
-    identifier: lgpl_2_1_plus-0eaaa8d1-6972-a2b4-31c2-33e4dd916127
+          # License along with the GNU C Library; if not,
+    identifier: unicode_and_lgpl_2_1_plus-f2786cd7-6b2f-75b9-fd53-a3d9775ee718
 other_license_detections: []
 copyright: |
   Copyright (c) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019