Use only expressions in tests #74

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
nexB · May 3, 2018 · 9ff3e14 · 9ff3e14
1 parent 7929d1f
commit 9ff3e14
Show file tree

Hide file tree

Showing 1,482 changed files with 39 additions and 4,599 deletions.
diff --git a/tests/licensedcode/data/licenses/3pp-proprietary-05.yml b/tests/licensedcode/data/licenses/3pp-proprietary-05.yml
@@ -1,4 +1,2 @@
-licenses:
-    - proprietary
 license_expressions:
     - proprietary
diff --git a/tests/licensedcode/data/licenses/3pp-proprietary-05_1.yml b/tests/licensedcode/data/licenses/3pp-proprietary-05_1.yml
@@ -1,5 +1,3 @@
-licenses:
-    - proprietary
 license_expressions:
     - proprietary
 notes: Common for old Motorola code, such as MetroWerks and FreeScale-related code
diff --git a/tests/licensedcode/data/licenses/COPYING.yml b/tests/licensedcode/data/licenses/COPYING.yml
@@ -1,6 +1,3 @@
-licenses:
-    - gpl-3.0
-    - gpl-3.0
 license_expressions:
     - gpl-3.0
     - gpl-3.0
diff --git a/tests/licensedcode/data/licenses/CRC32.yml b/tests/licensedcode/data/licenses/CRC32.yml
@@ -1,7 +1,3 @@
-licenses:
-    - apache-2.0
-    - bsd-new
-    - zlib
 license_expressions:
     - apache-2.0
     - bsd-new

diff --git a/tests/licensedcode/data/licenses/DefaultCRSFilterVisitor.yml b/tests/licensedcode/data/licenses/DefaultCRSFilterVisitor.yml
@@ -1,4 +1,2 @@
-licenses:
-    - lgpl-2.1
 license_expressions:
     - lgpl-2.1
diff --git a/tests/licensedcode/data/licenses/DefaultCRSFilterVisitor_2.yml b/tests/licensedcode/data/licenses/DefaultCRSFilterVisitor_2.yml
@@ -1,4 +1,2 @@
-licenses:
-    - gpl-2.0
 license_expressions:
     - gpl-2.0
diff --git a/tests/licensedcode/data/licenses/EchoEncoder.yml b/tests/licensedcode/data/licenses/EchoEncoder.yml
@@ -1,6 +1,2 @@
-licenses:
-    - epl-1.0
-    - lgpl-2.1
-license_choice: yes
 license_expressions:
     - epl-1.0 OR lgpl-2.1
diff --git a/tests/licensedcode/data/licenses/GetHereClientCredentialsAccessTokenTutorial.yml b/tests/licensedcode/data/licenses/GetHereClientCredentialsAccessTokenTutorial.yml
@@ -1,4 +1,2 @@
-licenses:
-    - apache-2.0
 license_expressions:
     - apache-2.0
diff --git a/tests/licensedcode/data/licenses/JZlib.yml b/tests/licensedcode/data/licenses/JZlib.yml
@@ -1,7 +1,3 @@
-licenses:
-    - apache-2.0
-    - bsd-new
-    - zlib
 license_expressions:
     - apache-2.0
     - bsd-new

diff --git a/tests/licensedcode/data/licenses/ObjCARCAliasAnalysis.yml b/tests/licensedcode/data/licenses/ObjCARCAliasAnalysis.yml
@@ -1,4 +1,2 @@
-licenses:
-    - uoi-ncsa
 license_expressions:
     - uoi-ncsa
diff --git a/tests/licensedcode/data/licenses/address_spec.yml b/tests/licensedcode/data/licenses/address_spec.yml
@@ -1,10 +1,10 @@
 notes: |
     no license should be detected there. Orginally from
     https://raw.githubusercontent.com/braintree/braintree_ruby/719eec824f39bc10bc251d5aadf5add1cfee0d42/spec/integration/braintree/address_spec.rb
-    
+
     The test file is itself under this license (even though it has no notice)
     Copyright (c) 2009-2014 Braintree, a division of PayPal, Inc.
-    
+
     Permission is hereby granted, free of charge, to any person
     obtaining a copy of this software and associated documentation
     files (the "Software"), to deal in the Software without
@@ -13,10 +13,10 @@ notes: |
     copies of the Software, and to permit persons to whom the
     Software is furnished to do so, subject to the following
     conditions:
-    
+
     The above copyright notice and this permission notice shall be
     included in all copies or substantial portions of the Software.
-    
+
     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

diff --git a/tests/licensedcode/data/licenses/adobe-acrobat-reader-eula.yml b/tests/licensedcode/data/licenses/adobe-acrobat-reader-eula.yml
@@ -1,4 +1,2 @@
-licenses:
-    - adobe-acrobat-reader-eula
 license_expressions:
     - adobe-acrobat-reader-eula
diff --git a/tests/licensedcode/data/licenses/adobe-eula.yml b/tests/licensedcode/data/licenses/adobe-eula.yml
@@ -1,6 +1,3 @@
-licenses:
-    - adobe-eula
-    - gpl-1.0-plus
 license_expressions:
     - adobe-eula AND gpl-1.0-plus
 notes: GPL is for the Debian packaging
diff --git a/tests/licensedcode/data/licenses/adobe-scl_and_gfdl-1.1_and_gpl_and_gpl-2.0_and_other.yml b/tests/licensedcode/data/licenses/adobe-scl_and_gfdl-1.1_and_gpl_and_gpl-2.0_and_other.yml
@@ -1,23 +1,3 @@
-licenses:
-    - gpl-2.0-plus
-    - gpl-1.0-plus
-    - lgpl-2.0-plus
-    - gfdl-1.1
-    - gpl-2.0
-    - gpl-2.0-plus
-    - gpl-2.0-plus
-    - gpl-1.0-plus
-    - gpl-2.0
-    - gpl-2.0-plus
-    - lgpl-2.0-plus
-    - gfdl-1.1-plus
-    - afmparse
-    - x11-tiff
-    - mit
-    - gpl-1.0-plus
-    - gpl-2.0-plus
-    - lgpl-2.0-plus
-    - gfdl-1.1
 license_expressions:
     - gpl-2.0-plus
     - gpl-1.0-plus

diff --git a/tests/licensedcode/data/licenses/adobe.yml b/tests/licensedcode/data/licenses/adobe.yml
@@ -1,6 +1,3 @@
-licenses:
-    - adobe-acrobat-reader-eula
-    - adobe-postscript
 license_expressions:
     - adobe-acrobat-reader-eula
     - adobe-postscript

diff --git a/tests/licensedcode/data/licenses/aes-128-3.0.yml b/tests/licensedcode/data/licenses/aes-128-3.0.yml
@@ -1,4 +1,2 @@
-licenses:
-    - public-domain-disclaimer
 license_expressions:
     - public-domain-disclaimer
diff --git a/...ata/licenses/aes-128-3.0_and_bsd-new_and_bsd-original-uc_and_bsd-simplified_and_other.yml b/...ata/licenses/aes-128-3.0_and_bsd-new_and_bsd-original-uc_and_bsd-simplified_and_other.yml
@@ -1,126 +1,3 @@
-licenses:
-    - proprietary
-    - proprietary
-    - proprietary
-    - proprietary
-    - proprietary
-    - proprietary
-    - proprietary
-    - bsd-original-uc
-    - x11-lucent
-    - bsd-new
-    - carnegie-mellon-contributors
-    - paul-mackerras
-    - gpl-2.0
-    - x11-keith-packard
-    - brian-clapper
-    - historical
-    - bsd-2-clause-freebsd
-    - gpl-2.0
-    - gpl-2.0-plus
-    - bsd-simplified
-    - gpl-1.0-plus
-    - gpl-2.0-plus
-    - bsd-simplified
-    - gpl-1.0-plus
-    - gpl-1.0-plus
-    - gpl-1.0-plus
-    - gpl-2.0
-    - gpl-2.0
-    - bsd-simplified
-    - lgpl-2.0-plus
-    - lgpl-2.0-plus
-    - lgpl-2.0-plus
-    - lgpl-2.0-plus
-    - lgpl-2.0-plus
-    - x11-fsf
-    - proprietary
-    - bsd-new
-    - bzip2-libbzip-1.0.5
-    - bsd-new
-    - brian-gladman-dual
-    - public-domain
-    - public-domain
-    - public-domain
-    - gpl-2.0
-    - x11-keith-packard
-    - x11
-    - gpl-2.0
-    - x11-keith-packard
-    - bsd-new
-    - isc
-    - json
-    - ijg
-    - x11-tiff
-    - x11-lucent
-    - mit-old-style-no-advert
-    - bsd-new
-    - lgpl-2.1-plus
-    - mpl-1.1
-    - gpl-2.0
-    - mpl-1.1
-    - gpl-2.0-plus
-    - gpl-1.0-plus
-    - gpl-1.0-plus
-    - gpl-1.0-plus
-    - gpl-1.0-plus
-    - gpl-1.0-plus
-    - mpl-1.1
-    - gpl-2.0-plus
-    - lgpl-2.1-plus
-    - mpl-1.1
-    - gpl-2.0-plus
-    - lgpl-2.1-plus
-    - gpl-1.0-plus
-    - lgpl-2.0-plus
-    - gpl-1.0-plus
-    - lgpl-2.0-plus
-    - gpl-1.0-plus
-    - lgpl-2.0-plus
-    - gpl-1.0-plus
-    - lgpl-2.0-plus
-    - gpl-1.0-plus
-    - lgpl-2.0-plus
-    - bsd-simplified
-    - bsd-new
-    - openssl-ssleay
-    - openssl-ssleay
-    - openssl-ssleay
-    - openssl
-    - proprietary
-    - bsd-original-uc
-    - ssleay-windows
-    - bsd-new
-    - bsla
-    - mit
-    - gpl-1.0-plus
-    - gpl-1.0-plus
-    - gpl-1.0-plus
-    - gpl-1.0-plus
-    - gpl-1.0-plus
-    - bsd-new
-    - public-domain
-    - bzip2-libbzip-1.0.5
-    - clear-bsd
-    - bsd-new
-    - unicode-mappings
-    - bsd-new
-    - gpl-2.0
-    - x11-keith-packard
-    - bsd-original-uc
-    - pcre
-    - mit
-    - bsd-simplified
-    - libpng
-    - lgpl-2.0-plus
-    - lgpl-2.0-plus
-    - lgpl-2.0-plus
-    - lgpl-2.0-plus
-    - bsd-new
-    - lgpl-2.0
-    - bsd-new
-    - bsd-new
-    - unknown
 license_expressions:
     - proprietary
     - proprietary

diff --git a/tests/licensedcode/data/licenses/aes-128-3.0_and_bsd-new_and_gpl-2.0_and_public-domain.yml b/tests/licensedcode/data/licenses/aes-128-3.0_and_bsd-new_and_gpl-2.0_and_public-domain.yml
@@ -1,8 +1,3 @@
-licenses:
-    - public-domain
-    - gpl-2.0
-    - bsd-new
-    - public-domain-disclaimer
 license_expressions:
     - public-domain AND (gpl-2.0 OR bsd-new)
     - public-domain-disclaimer
diff --git a/tests/licensedcode/data/licenses/afl-2.0_and_lgpl-2.0-plus.yml b/tests/licensedcode/data/licenses/afl-2.0_and_lgpl-2.0-plus.yml
@@ -1,5 +1,2 @@
-licenses:
-    - afl-2.0
-    - lgpl-2.0-plus
 license_expressions:
     - afl-2.0 OR lgpl-2.0-plus
diff --git a/tests/licensedcode/data/licenses/afl-2.1_and_apache_and_bsd-new_and_gpl_and_other.yml b/tests/licensedcode/data/licenses/afl-2.1_and_apache_and_bsd-new_and_gpl_and_other.yml
@@ -1,16 +1,3 @@
-licenses:
-    - bsd-new
-    - afl-2.1
-    - mpl-1.0
-    - lgpl-2.0-plus
-    - gpl-1.0-plus
-    - apache-2.0
-    - apache-2.0
-    - afl-2.1
-    - bsd-new
-    - bsd-new
-    - bsd-new
-    - afl-2.1
 license_expressions:
     - bsd-new AND afl-2.1 AND mpl-1.0 AND lgpl-2.0-plus AND gpl-1.0-plus AND apache-2.0 AND
         apache-2.0

diff --git a/tests/licensedcode/data/licenses/agg-2.4_1.yml b/tests/licensedcode/data/licenses/agg-2.4_1.yml
@@ -1,4 +1,2 @@
-licenses:
-    - boost-original
 license_expressions:
     - boost-original
diff --git a/tests/licensedcode/data/licenses/agg-2.4_3.yml b/tests/licensedcode/data/licenses/agg-2.4_3.yml
@@ -1,4 +1,2 @@
-licenses:
-    - boost-original
 license_expressions:
     - boost-original
diff --git a/tests/licensedcode/data/licenses/agpl-1.0.yml b/tests/licensedcode/data/licenses/agpl-1.0.yml
@@ -1,4 +1,2 @@
-licenses:
-    - agpl-1.0
 license_expressions:
     - agpl-1.0
diff --git a/tests/licensedcode/data/licenses/agpl-3.0.yml b/tests/licensedcode/data/licenses/agpl-3.0.yml
@@ -1,4 +1,2 @@
-licenses:
-    - agpl-3.0
 license_expressions:
     - agpl-3.0
diff --git a/tests/licensedcode/data/licenses/agpl-3.0_1.yml b/tests/licensedcode/data/licenses/agpl-3.0_1.yml
@@ -1,4 +1,2 @@
-licenses:
-    - agpl-3.0
 license_expressions:
     - agpl-3.0
diff --git a/tests/licensedcode/data/licenses/aladdin-md5_and_not_rsa-md5.yml b/tests/licensedcode/data/licenses/aladdin-md5_and_not_rsa-md5.yml
@@ -1,4 +1,2 @@
-licenses:
-    - zlib
 license_expressions:
     - zlib
diff --git a/tests/licensedcode/data/licenses/allegro-4.yml b/tests/licensedcode/data/licenses/allegro-4.yml
@@ -1,4 +1,2 @@
-licenses:
-    - allegro-4
 license_expressions:
     - allegro-4
diff --git a/tests/licensedcode/data/licenses/altova-eula.yml b/tests/licensedcode/data/licenses/altova-eula.yml
@@ -1,4 +1,2 @@
-licenses:
-    - altova-eula
 license_expressions:
     - altova-eula
diff --git a/tests/licensedcode/data/licenses/amazon-apache.yml b/tests/licensedcode/data/licenses/amazon-apache.yml
@@ -1,4 +1,2 @@
-licenses:
-    - apache-2.0
 license_expressions:
     - apache-2.0
diff --git a/tests/licensedcode/data/licenses/amdplpa.yml b/tests/licensedcode/data/licenses/amdplpa.yml
@@ -1,4 +1,2 @@
-licenses:
-    - amdplpa
 license_expressions:
     - amdplpa
diff --git a/tests/licensedcode/data/licenses/aml.yml b/tests/licensedcode/data/licenses/aml.yml
@@ -1,4 +1,2 @@
-licenses:
-    - aml
 license_expressions:
     - aml
diff --git a/tests/licensedcode/data/licenses/android-sdk-2012.yml b/tests/licensedcode/data/licenses/android-sdk-2012.yml
@@ -1,4 +1,2 @@
-licenses:
-    - android-sdk-2012
 license_expressions:
     - android-sdk-2012
diff --git a/tests/licensedcode/data/licenses/android-sdk-preview-2015.yml b/tests/licensedcode/data/licenses/android-sdk-preview-2015.yml
@@ -1,7 +1,3 @@
-licenses:
-    - android-sdk-preview-2015
-    - android-sdk-preview-2015
-    - cc-by-2.5
 license_expressions:
     - android-sdk-preview-2015
     - android-sdk-preview-2015

diff --git a/tests/licensedcode/data/licenses/antlr-pd.yml b/tests/licensedcode/data/licenses/antlr-pd.yml
@@ -1,4 +1,2 @@
-licenses:
-    - antlr-pd
 license_expressions:
     - antlr-pd
diff --git a/tests/licensedcode/data/licenses/antlr-pd_1.yml b/tests/licensedcode/data/licenses/antlr-pd_1.yml
@@ -1,4 +1,2 @@
-licenses:
-    - antlr-pd
 license_expressions:
     - antlr-pd
diff --git a/tests/licensedcode/data/licenses/apache-1.0.yml b/tests/licensedcode/data/licenses/apache-1.0.yml
@@ -1,5 +1,2 @@
-licenses:
-    - apache-1.0
-    - public-domain
 license_expressions:
     - apache-1.0 AND public-domain
diff --git a/tests/licensedcode/data/licenses/apache-1.1.yml b/tests/licensedcode/data/licenses/apache-1.1.yml
@@ -1,4 +1,2 @@
-licenses:
-    - apache-1.1
 license_expressions:
     - apache-1.1
diff --git a/tests/licensedcode/data/licenses/apache-1.1_1.yml b/tests/licensedcode/data/licenses/apache-1.1_1.yml
@@ -1,4 +1,2 @@
-licenses:
-    - apache-1.1
 license_expressions:
     - apache-1.1
diff --git a/tests/licensedcode/data/licenses/apache-1.1_10.yml b/tests/licensedcode/data/licenses/apache-1.1_10.yml
@@ -1,4 +1,2 @@
-licenses:
-    - apache-1.1
 license_expressions:
     - apache-1.1
diff --git a/tests/licensedcode/data/licenses/apache-1.1_11.yml b/tests/licensedcode/data/licenses/apache-1.1_11.yml
@@ -1,4 +1,2 @@
-licenses:
-    - apache-1.1
 license_expressions:
     - apache-1.1