Update extended copyright test expectations #2972

Signed-off-by: Jono Yang <jyang@nexb.com>

src/summarycode/copyright_tallies.py

@@ -494,6 +494,7 @@ def filter_junk(texts):
     'cisco': 'Cisco Systems',
 
     'daisy': 'Daisy',
+    'daisyltd': 'Daisy',
 
     'fsf': 'Free Software Foundation',
     'freesoftwarefoundation': 'Free Software Foundation',
@@ -541,6 +542,7 @@ def filter_junk(texts):
     'regentsoftheuniversityofcalifornia': 'The Regents of the University of California',
 
     'borland': 'Borland',
+    'borlandcorp': 'Borland',
 
     'microsoft': 'Microsoft',
     'microsoftcorp': 'Microsoft',

tests/cluecode/data/copyrights/COPYING_gpl-COPYING_gpl.gpl.yml

@@ -9,5 +9,5 @@ holders:
   - Free Software Foundation, Inc.
   - the Free Software Foundation
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 2

tests/cluecode/data/copyrights/afferogplv1-AfferoGPLv.yml

@@ -13,5 +13,5 @@ holders:
 holders_summary:
   - value: Affero Inc.
     count: 2
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1

tests/cluecode/data/copyrights/afferogplv3-AfferoGPLv.yml

@@ -7,5 +7,5 @@ copyrights:
 holders:
   - Free Software Foundation, Inc.
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1

tests/cluecode/data/copyrights/android_c-c.c.yml

@@ -9,7 +9,7 @@ holders:
   - The Android Open Source Project
   - Colin Percival
 holders_summary:
-  - value: Colin Percival
+  - value: Android Open Source Project
     count: 1
-  - value: The Android Open Source Project, Inc.
+  - value: Colin Percival
     count: 1

tests/cluecode/data/copyrights/apache2_debian_trailing_name_missed-apache.label.yml

@@ -75,7 +75,7 @@ holders_summary:
     count: 2
   - value: Board of Trustees of the University of Illinois
     count: 1
-  - value: Cisco Systems, Inc.
+  - value: Cisco Systems
     count: 1
   - value: Eric Haines
     count: 1

tests/cluecode/data/copyrights/bigelow_holmes-Bigelow&Holmes.yml

@@ -11,5 +11,5 @@ holders:
 holders_summary:
   - value: Bigelow & Holmes
     count: 1
-  - value: Sun Microsystems, Inc.
+  - value: Sun Microsystems
     count: 1

tests/cluecode/data/copyrights/colin_android-bsdiff_c.c.yml

@@ -9,7 +9,7 @@ holders:
   - The Android Open Source Project
   - Colin Percival
 holders_summary:
-  - value: Colin Percival
+  - value: Android Open Source Project
     count: 1
-  - value: The Android Open Source Project, Inc.
+  - value: Colin Percival
     count: 1

tests/cluecode/data/copyrights/complex_notice-NOTICE.yml

@@ -58,7 +58,7 @@ holders:
 holders_summary:
   - value: David Schultz
     count: 9
-  - value: Sun Microsystems, Inc.
+  - value: Sun Microsystems
     count: 4
   - value: Mike Barcroft
     count: 2

tests/cluecode/data/copyrights/complex_notice_sun_microsystems_on_multiple_lines-NOTICE.yml

@@ -23,7 +23,7 @@ holders:
 holders_summary:
   - value: IBM Corporation
     count: 3
-  - value: Sun Microsystems, Inc.
+  - value: Sun Microsystems
     count: 3
   - value: Lotus Development Corporation
     count: 1

tests/cluecode/data/copyrights/config-config_guess.guess.yml

@@ -8,5 +8,5 @@ copyrights:
 holders:
   - Free Software Foundation, Inc.
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1

tests/cluecode/data/copyrights/config1_guess-config_guess.guess.yml

@@ -8,5 +8,5 @@ copyrights:
 holders:
   - Free Software Foundation, Inc.
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1

tests/cluecode/data/copyrights/copyright_is_not_mixed_with_authors.txt.yml

@@ -7,5 +7,5 @@ copyrights:
 holders:
   - Free Software Foundation, Inc.
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1

tests/cluecode/data/copyrights/copyright_name_sign_year-c.c.yml

@@ -9,5 +9,7 @@ holders:
   - Daisy Ltd.
   - Daisy
 holders_summary:
+  - value: Daisy
+    count: 1
   - value: Daisy Ltd.
-    count: 2
+    count: 1

tests/cluecode/data/copyrights/copytest/aosp.txt.yml

@@ -7,5 +7,5 @@ copyrights:
 holders:
   - Android Open Source Project
 holders_summary:
-  - value: The Android Open Source Project, Inc.
+  - value: Android Open Source Project
     count: 1

tests/cluecode/data/copyrights/copytest/hp_co_or_company.txt.yml

@@ -11,5 +11,5 @@ holders:
   - Hewlett-Packard Co.
   - Hewlett-Packard Co.
 holders_summary:
-  - value: Hewlett-Packard, Inc.
+  - value: Hewlett-Packard
     count: 3

tests/cluecode/data/copyrights/copytest/with_format_code.txt.yml

@@ -7,5 +7,5 @@ copyrights:
 holders:
   - Free Software Foundation, Inc.
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1

tests/cluecode/data/copyrights/copytest/with_trailing_caps.txt.yml

@@ -8,5 +8,5 @@ copyrights:
 holders:
   - Free Software Foundation, Inc.
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1

tests/cluecode/data/copyrights/coreutils_debian-coreutils.copyright.yml

@@ -43,7 +43,7 @@ holders:
   - Free Software Foundation, Inc.
   - Free Software Foundation, Inc.
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 11
   - value: Colin Plumb
     count: 2

tests/cluecode/data/copyrights/ecosv2_0-eCosv.0.yml

@@ -7,5 +7,5 @@ copyrights:
 holders:
   - Red Hat, Inc.
 holders_summary:
-  - value: Red Hat, Inc.
+  - value: Red Hat
     count: 1

tests/cluecode/data/copyrights/ed-ed.copyright.yml

@@ -17,7 +17,7 @@ holders_summary:
     count: 1
   - value: Antonio Diaz Diaz
     count: 1
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1
   - value: James Troup
     count: 1

tests/cluecode/data/copyrights/esmertec_java-java.java.yml

@@ -9,7 +9,7 @@ holders:
   - Esmertec AG
   - The Android Open Source Project
 holders_summary:
-  - value: Esmertec AG
+  - value: Android Open Source Project
     count: 1
-  - value: The Android Open Source Project, Inc.
+  - value: Esmertec AG
     count: 1

tests/cluecode/data/copyrights/fsf_py-999_py.py.yml

@@ -8,5 +8,5 @@ copyrights:
 holders:
   - Free Software Foundation, Inc.
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1

tests/cluecode/data/copyrights/gfdlv1_2-GFDLv.2.yml

@@ -7,5 +7,5 @@ copyrights:
 holders:
   - Free Software Foundation, Inc.
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1

tests/cluecode/data/copyrights/gfdlv1_3-GFDLv.3.yml

@@ -7,5 +7,5 @@ copyrights:
 holders:
   - Free Software Foundation, Inc.
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1

tests/cluecode/data/copyrights/gnome_session-gnome_session.copyright.yml

@@ -29,7 +29,7 @@ holders:
   - Free Software Foundation, Inc.
   - Sun Microsystems, Inc.
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1
   - value: George Lebl
     count: 1
@@ -43,9 +43,9 @@ holders_summary:
     count: 1
   - value: Ray Strode
     count: 1
-  - value: Red Hat, Inc.
+  - value: Red Hat
     count: 1
-  - value: Sun Microsystems, Inc.
+  - value: Sun Microsystems
     count: 1
   - value: Tom Tromey
     count: 1

tests/cluecode/data/copyrights/gobjc_4_3-gobjc.copyright.yml

@@ -14,9 +14,9 @@ holders:
   - Digital Mars, www.digitalmars.com
   - Red Hat, Inc.
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 2
   - value: Digital Mars, www.digitalmars.com
     count: 1
-  - value: Red Hat, Inc.
+  - value: Red Hat
     count: 1

tests/cluecode/data/copyrights/google_closure_templates_java_html-html.html.yml

@@ -7,5 +7,5 @@ copyrights:
 holders:
   - Google
 holders_summary:
-  - value: Google Inc.
+  - value: Google
     count: 1

tests/cluecode/data/copyrights/google_view_layout1_xml-view_layout_xml.xml.yml

@@ -7,5 +7,5 @@ copyrights:
 holders:
   - Google Inc.
 holders_summary:
-  - value: Google Inc.
+  - value: Google
     count: 1

tests/cluecode/data/copyrights/gpl_v1-GPL_v.yml

@@ -9,5 +9,5 @@ holders:
   - Free Software Foundation, Inc.
   - the Free Software Foundation
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 2

tests/cluecode/data/copyrights/gpl_v2-GPL_v.yml

@@ -9,5 +9,5 @@ holders:
   - Free Software Foundation, Inc.
   - the Free Software Foundation
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 2

tests/cluecode/data/copyrights/gpl_v3-GPL_v.yml

@@ -7,5 +7,5 @@ copyrights:
 holders:
   - Free Software Foundation, Inc.
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1

tests/cluecode/data/copyrights/hewlett_packard-Hewlett_Packard.yml

@@ -7,5 +7,5 @@ copyrights:
 holders:
   - HEWLETT-PACKARD COMPANY
 holders_summary:
-  - value: Hewlett-Packard, Inc.
+  - value: Hewlett-Packard
     count: 1

tests/cluecode/data/copyrights/hp_notice-NOTICE.yml

@@ -25,5 +25,5 @@ holders_summary:
     count: 4
   - value: Alan D. Brunelle
     count: 2
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 2

tests/cluecode/data/copyrights/hpijs_ppds-hpijs_ppds.label.yml

@@ -15,9 +15,9 @@ holders:
 holders_summary:
   - value: Henrique de Moraes Holschuh
     count: 1
-  - value: Hewlett-Packard Development Company, L.P.
+  - value: Hewlett-Packard
     count: 1
-  - value: Hewlett-Packard, Inc.
+  - value: Hewlett-Packard Development Company, L.P.
     count: 1
   - value: Torsten Landschoff
     count: 1

tests/cluecode/data/copyrights/ijg-IJG.yml

@@ -19,7 +19,7 @@ holders_summary:
     count: 1
   - value: CompuServe Incorporated
     count: 1
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1
   - value: M.I.T.
     count: 1

tests/cluecode/data/copyrights/kbuild-kbuild.copyright.yml

@@ -17,7 +17,7 @@ holders:
   - Torsten Werner
   - Daniel Baumann
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 2
   - value: Daniel Baumann
     count: 1

tests/cluecode/data/copyrights/lgpl_v2_0-LGPL_v.0.yml

@@ -9,5 +9,5 @@ holders:
   - Free Software Foundation, Inc.
   - the Free Software Foundation
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 2

tests/cluecode/data/copyrights/lgpl_v2_1-LGPL_v.1.yml

@@ -9,5 +9,5 @@ holders:
   - Free Software Foundation, Inc.
   - the Free Software Foundation
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 2

tests/cluecode/data/copyrights/lgpl_v3-LGPL_v.yml

@@ -7,5 +7,5 @@ copyrights:
 holders:
   - Free Software Foundation, Inc.
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1

tests/cluecode/data/copyrights/libc6_i686-libc_i.copyright.yml

@@ -23,7 +23,7 @@ holders:
   - Intel Corporation
   - Craig Metz
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 2
   - value: Carnegie Mellon University
     count: 1
@@ -33,7 +33,7 @@ holders_summary:
     count: 1
   - value: Intel Corporation
     count: 1
-  - value: Sun Microsystems, Inc.
+  - value: Sun Microsystems
     count: 1
   - value: The Regents of the University of California
     count: 1

tests/cluecode/data/copyrights/libcdio10-libcdio.label.yml

@@ -50,7 +50,7 @@ holders_summary:
     count: 1
   - value: Eric Youngdale
     count: 1
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1
   - value: Gerd Knorr
     count: 1

tests/cluecode/data/copyrights/libgnome_desktop_2-libgnome_desktop.copyright.yml

@@ -15,13 +15,13 @@ holders:
   - Sun Microsystems, Inc.
   - Kristian Rietveld
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1
   - value: Kristian Rietveld
     count: 1
-  - value: Red Hat, Inc.
+  - value: Red Hat
     count: 1
   - value: Sid Vicious
     count: 1
-  - value: Sun Microsystems, Inc.
+  - value: Sun Microsystems
     count: 1

tests/cluecode/data/copyrights/libgtkhtml2_0-libgtkhtml.copyright.yml

@@ -7,5 +7,5 @@ copyrights:
 holders:
   - Free Software Foundation, Inc.
 holders_summary:
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1

tests/cluecode/data/copyrights/libjpeg62-libjpeg.copyright.yml

@@ -19,7 +19,7 @@ holders_summary:
     count: 1
   - value: CompuServe Incorporated
     count: 1
-  - value: Free Software Foundation, Inc.
+  - value: Free Software Foundation
     count: 1
   - value: M.I.T.
     count: 1