Fix test expectations and address feedback

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

src/licensedcode/data/licenses/apple-academic-lisa-os-3.1.LICENSE

@@ -5,7 +5,7 @@ name: Apple Academic License Agreement Lisa OS v3.1
 category: Proprietary Free
 owner: Apple
 homepage_url: https://info.computerhistory.org/apple-lisa-code
-spdx_license_key: LicenseRef-scancode-apple-academic-lisa-OS-3.1
+spdx_license_key: LicenseRef-scancode-apple-academic-lisa-os-3.1
 text_urls:
     - https://d1yx3ys82bpsa0.cloudfront.net/source/lisa-source.zip
 other_urls:

src/licensedcode/data/licenses/bsd-advertising-acknowledgement.LICENSE

@@ -7,19 +7,8 @@ owner: David Giffin
 spdx_license_key: BSD-Advertising-Acknowledgement
 other_urls:
     - https://github.com/python-excel/xlrd/blob/master/LICENSE#L33
-ignorable_copyrights:
-    - Copyright (c) 2001 David Giffin
-ignorable_holders:
-    - David Giffin
-ignorable_authors:
-    - David Giffin <[email protected]>
-ignorable_emails:
-    - [email protected]
 ---
 
-Copyright (c) 2001 David Giffin.
-All rights reserved.
-
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:

src/licensedcode/data/licenses/kazlib.LICENSE

@@ -7,10 +7,6 @@ owner: Kaz Kylheku
 spdx_license_key: Kazlib
 other_urls:
     - http://git.savannah.gnu.org/cgit/kazlib.git/tree/except.c?id=0062df360c2d17d57f6af19b0e444c51feb99036
-ignorable_copyrights:
-    - Copyright (c) 1999 Kaz Kylheku
-ignorable_holders:
-    - Kaz Kylheku
 ---
 
 Free Software License: 

src/licensedcode/data/rules/brian-gladman-3-clause_10.RULE

@@ -2,6 +2,10 @@
 license_expression: brian-gladman-3-clause
 is_license_notice: yes
 relevance: 100
+ignorable_copyrights:
+  - Copyright (c) 2003, Dr Brian Gladman, Worcester, UK.
+ignorable_holders:
+  - Dr Brian Gladman, Worcester, UK.
 ---
 
 Copyright (c) 2003, Dr Brian Gladman, Worcester, UK.   All rights reserved.

src/licensedcode/data/rules/martin-birgmeier_1.RULE

@@ -2,6 +2,10 @@
 license_expression: martin-birgmeier
 is_license_text: yes
 relevance: 100
+ignorable_copyrights:
+  - Copyright (c) 1993 Martin Birgmeier
+ignorable_holders:
+  - Martin Birgmeier
 ---
 
 Copyright (c) 1993 Martin Birgmeier All rights reserved. 

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

@@ -1,5 +1,5 @@
 ---
-license_expression: other-permissive
+license_expression: bsd-advertising-acknowledgement
 is_license_text: yes
 notes: https://fedoraproject.org/wiki/Licensing:BSD?rd=Licensing/BSD#Advertising_Variant
 ---

src/licensedcode/data/rules/snprintf_2.RULE

@@ -2,6 +2,14 @@
 license_expression: snprintf
 is_license_text: yes
 relevance: 100
+ignorable_authors:
+  - Patrick Powell ([email protected])
+ignorable_copyrights:
+  - Copyright Patrick Powell 1995
+ignorable_emails:
+  - [email protected]
+ignorable_holders:
+  - Patrick Powell
 ---
 
 Copyright Patrick Powell 1995 

src/licensedcode/data/rules/sunpro_2.RULE

@@ -2,6 +2,10 @@
 license_expression: sunpro
 is_license_text: yes
 relevance: 100
+ignorable_copyrights:
+  - Copyright (c) 1993 by Sun Microsystems, Inc.
+ignorable_holders:
+  - Sun Microsystems, Inc.
 ---
 
 Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.

tests/licensedcode/data/datadriven/external/fossology-tests/Dual-license/aes.h.yml

@@ -1,2 +1,2 @@
 license_expressions:
-  - brian-gladman-3-clause OR gpl-1.0-plus
+  - brian-gladman-3-clause

tests/licensedcode/data/datadriven/lic4/gpl-2.0-plus_and_gpl-2.0-plus_and_gpl-3.0-plus_and_lgpl-2.1-plus_and_other.txt.yml

@@ -3,7 +3,7 @@ license_expressions:
   - lgpl-2.1-plus
   - lgpl-2.1-plus
   - lgpl-2.1-plus AND free-unknown
-  - mit-modern
+  - cornell-lossless-jpeg
   - gpl-2.0-plus
   - gpl-2.0-plus
   - lgpl-2.1 AND gpl-2.0 AND gpl-3.0

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

@@ -65,12 +65,12 @@ other_license_expression: gpl-2.0 AND gpl-2.0 AND gpl-2.0 AND fsf-free AND autoc
   AND brian-clapper AND lgpl-2.1 AND gpl-2.0 AND lgpl-2.0-plus AND mit-0 AND mit AND gpl-2.0
   AND gpl-2.0 AND gpl-2.0 AND gpl-1.0-plus
 other_license_expression_spdx: GPL-2.0-only AND GPL-2.0-only AND GPL-2.0-only AND FSFUL AND
-  LicenseRef-scancode-autoconf-simple-exception-2.0 AND GPL-2.0-or-later AND NTP AND GPL-2.0-only
-  AND GPL-2.0-only AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-only AND GPL-1.0-or-later
-  AND LicenseRef-scancode-unknown AND BSD-4-Clause-UC AND GPL-2.0-only AND LicenseRef-scancode-free-unknown
-  AND TU-Berlin-1.0 AND BSD-3-Clause AND BSD-3-Clause AND BSD-4-Clause AND GPL-2.0-or-later
-  AND LicenseRef-scancode-public-domain AND LicenseRef-scancode-unknown AND LicenseRef-scancode-public-domain
-  AND GPL-2.0-only AND GPL-2.0-or-later AND LicenseRef-scancode-public-domain AND LicenseRef-scancode-other-permissive
+  Autoconf-exception-generic AND GPL-2.0-or-later AND NTP AND GPL-2.0-only AND GPL-2.0-only
+  AND GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-only AND GPL-1.0-or-later AND LicenseRef-scancode-unknown
+  AND BSD-4-Clause-UC AND GPL-2.0-only AND LicenseRef-scancode-free-unknown AND TU-Berlin-1.0
+  AND BSD-3-Clause AND BSD-3-Clause AND BSD-4-Clause AND GPL-2.0-or-later AND LicenseRef-scancode-public-domain
+  AND LicenseRef-scancode-unknown AND LicenseRef-scancode-public-domain AND GPL-2.0-only AND
+  GPL-2.0-or-later AND LicenseRef-scancode-public-domain AND LicenseRef-scancode-other-permissive
   AND (MIT AND GPL-2.0-only) AND GPL-2.0-or-later AND GPL-2.0-or-later AND LicenseRef-scancode-other-permissive
   AND (BSD-4-Clause-UC AND ISC AND GPL-2.0-only) AND GPL-2.0-only AND BSD-4-Clause-UC AND Bison-exception-2.2
   AND GPL-3.0-or-later AND BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-only AND GPL-1.0-or-later

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

@@ -56,9 +56,9 @@ other_license_expression: (gpl-2.0 AND gpl-2.0) AND gpl-2.0 AND (gpl-2.0 AND ope
 other_license_expression_spdx: (GPL-2.0-only AND GPL-2.0-only) AND GPL-2.0-only AND (GPL-2.0-only
   AND LicenseRef-scancode-openssl-exception-gpl-3.0-plus 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 AND (GPL-2.0-or-later AND LicenseRef-scancode-autoconf-simple-exception-2.0
-  AND GPL-2.0-only) AND GPL-2.0-only AND (GPL-3.0-or-later WITH LicenseRef-scancode-autoconf-simple-exception
-  AND GPL-3.0-only) AND GPL-3.0-only AND (GPL-2.0-or-later WITH Libtool-exception AND GPL-2.0-only)
+  AND GPL-2.0-only AND (GPL-2.0-or-later AND Autoconf-exception-generic AND GPL-2.0-only) AND
+  GPL-2.0-only AND (GPL-3.0-or-later WITH LicenseRef-scancode-autoconf-simple-exception AND
+  GPL-3.0-only) AND GPL-3.0-only AND (GPL-2.0-or-later WITH Libtool-exception AND GPL-2.0-only)
   AND GPL-2.0-only AND (LGPL-2.0-or-later WITH Libtool-exception AND LGPL-2.0-or-later) AND
   LGPL-2.0-or-later AND (LGPL-2.1-only AND LGPL-2.1-only) AND ((LGPL-2.1-only AND LGPL-2.1-only)
   AND BSD-3-Clause) AND MIT AND (X11 AND LicenseRef-scancode-public-domain) AND MIT AND BSD-2-Clause

tests/packagedcode/data/debian/copyright/debian-2019-11-15/main/g/golang-1.11/stable_copyright-detailed.expected.yml

@@ -34,10 +34,9 @@ other_license_expression_spdx: (BSD-3-Clause AND LicenseRef-scancode-google-pate
   AND MIT AND (BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang) AND (BSD-3-Clause
   AND LicenseRef-scancode-google-patent-license-golang) AND (BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang)
   AND BSD-2-Clause AND (BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang) AND
-  (BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang) AND LicenseRef-scancode-sunpro
-  AND LicenseRef-scancode-mpeg-ssg AND LicenseRef-scancode-other-permissive AND (Apache-2.0
-  AND Apache-2.0) AND BSD-2-Clause-Views AND CC-BY-3.0 AND CC-BY-3.0 AND BSD-3-Clause AND (BSD-3-Clause
-  AND LicenseRef-scancode-google-patent-license-golang)
+  (BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang) AND SunPro AND LicenseRef-scancode-mpeg-ssg
+  AND LicenseRef-scancode-other-permissive AND (Apache-2.0 AND Apache-2.0) AND BSD-2-Clause-Views
+  AND CC-BY-3.0 AND CC-BY-3.0 AND BSD-3-Clause AND (BSD-3-Clause AND LicenseRef-scancode-google-patent-license-golang)
 license_detections: []
 other_license_detections:
   - license_expression: other-permissive

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

@@ -6,8 +6,8 @@ declared_license_expression: openldap-2.8 AND openldap-2.8 AND mit AND fsf-unlim
 declared_license_expression_spdx: OLDAP-2.8 AND OLDAP-2.8 AND MIT AND FSFULLRWD AND Spencer-94
   AND LicenseRef-scancode-ibm-dhcp AND LicenseRef-scancode-ietf AND ISC AND LicenseRef-scancode-other-permissive
   AND LicenseRef-scancode-other-permissive AND NTP AND LicenseRef-scancode-other-permissive
-  AND Spencer-94 AND OLDAP-2.8 AND LicenseRef-scancode-bsla AND BSD-4-Clause-UC AND BSD-4-Clause-UC
-  AND BSD-4-Clause-UC AND LicenseRef-scancode-bsd-original-uc-1986
+  AND Spencer-94 AND OLDAP-2.8 AND BSD-4.3TAHOE AND BSD-4-Clause-UC AND BSD-4-Clause-UC AND
+  BSD-4-Clause-UC AND BSD-4.3RENO
 other_license_expression:
 other_license_expression_spdx:
 license_detections: