Update extended copyright test expectations #2972

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

Author: JonoYang

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