Revert changes to cluecode_test_utils.CopyrightTest

    * Do not rename summaries to tallies

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

src/summarycode/copyright_tallies.py

@@ -192,15 +192,15 @@ def tally_copyrights(texts, _detector=CopyrightDetector()):
     Return a list of mapping of {value:string, count:int} given a
     list of copyright strings or Text() objects.
     """
-    texts = []
+    texts_to_tally = []
     no_detection_counter = 0
     for text in texts:
         if not text:
             no_detection_counter += 1
             continue
         # Keep Text objects as-is
         if isinstance(text, Text):
-            texts.append(text)
+            texts_to_tally.append(text)
         else:
             # FIXME: redetect to strip year should not be needed!!
             statements_without_years = _detector.detect(
@@ -213,9 +213,9 @@ def tally_copyrights(texts, _detector=CopyrightDetector()):
 
             for detection in statements_without_years:
                 copyr = detection.copyright
-                texts.append(Text(copyr, copyr))
+                texts_to_tally.append(Text(copyr, copyr))
 
-    counter = tally(texts)
+    counter = tally(texts_to_tally)
     if no_detection_counter:
         counter[None] = no_detection_counter
 

tests/cluecode/cluecode_test_utils.py

@@ -60,9 +60,9 @@ class CopyrightTest(object):
     holders = attr.ib(default=attr.Factory(list))
     authors = attr.ib(default=attr.Factory(list))
 
-    holders_tallies = attr.ib(default=attr.Factory(list))
-    copyrights_tallies = attr.ib(default=attr.Factory(list))
-    authors_tallies = attr.ib(default=attr.Factory(list))
+    holders_summary = attr.ib(default=attr.Factory(list))
+    copyrights_summary = attr.ib(default=attr.Factory(list))
+    authors_summary = attr.ib(default=attr.Factory(list))
 
     expected_failures = attr.ib(default=attr.Factory(list))
     notes = attr.ib(default=None)
@@ -83,14 +83,14 @@ def __attrs_post_init__(self, *args, **kwargs):
                 raise Exception(msg)
 
         # fix counts to be ints: saneyaml loads everything as string
-        for holders_tally in self.holders_tallies:
-            holders_tally['count'] = int(holders_tally['count'])
+        for holders_sum in self.holders_summary:
+            holders_sum['count'] = int(holders_sum['count'])
 
-        for copyrs_tally in self.copyrights_tallies:
-            copyrs_tally['count'] = int(copyrs_tally['count'])
+        for copyrs_sum in self.copyrights_summary:
+            copyrs_sum['count'] = int(copyrs_sum['count'])
 
-        for auths_tally in self.authors_tallies:
-            auths_tally['count'] = int(auths_tally['count'])
+        for auths_sum in self.authors_summary:
+            auths_sum['count'] = int(auths_sum['count'])
 
     def to_dict(self):
         """
@@ -182,25 +182,25 @@ def closure_test_function(*args, **kwargs):
         detections = detect_copyrights(test_file)
         copyrights, holders, authors = Detection.split_values(detections)
 
-        holders_tallies = []
-        if 'holders_tallies' in test.what:
-            holders_tallies = as_sorted_mapping(tally_persons(holders))
+        holders_summary = []
+        if 'holders_summary' in test.what:
+            holders_summary = as_sorted_mapping(tally_persons(holders))
 
-        copyrights_tallies = []
-        if 'copyrights_tallies' in test.what:
-            copyrights_tallies = as_sorted_mapping(tally_copyrights(copyrights))
+        copyrights_summary = []
+        if 'copyrights_summary' in test.what:
+            copyrights_summary = as_sorted_mapping(tally_copyrights(copyrights))
 
-        authors_tallies = []
-        if 'authors_tallies' in test.what:
-            authors_tallies = as_sorted_mapping(tally_persons(authors))
+        authors_summary = []
+        if 'authors_summary' in test.what:
+            authors_summary = as_sorted_mapping(tally_persons(authors))
 
         results = dict(
             copyrights=copyrights,
             authors=authors,
             holders=holders,
-            holders_tallies=holders_tallies,
-            copyrights_tallies=copyrights_tallies,
-            authors_tallies=authors_tallies,
+            holders_summary=holders_summary,
+            copyrights_summary=copyrights_summary,
+            authors_summary=authors_summary,
         )
 
         expected_yaml = test.dumps()

tests/cluecode/data/authors/author-config.rpath.yml

@@ -1,8 +1,8 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 authors:
   - Gordon Matzigkeit <gord@gnu.ai.mit.edu>
-authors_tallies:
+authors_summary:
   - value: Gordon Matzigkeit <gord@gnu.ai.mit.edu>
     count: 1

tests/cluecode/data/authors/author_addr_c-addr_c.c.yml

@@ -1,8 +1,8 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 authors:
   - John Doe
-authors_tallies:
+authors_summary:
   - value: John Doe
     count: 1

tests/cluecode/data/authors/author_avinash-BitVector_py.py.yml

@@ -1,9 +1,9 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 authors:
   - Avinash Kak (kak@purdue.edu)
   - Avinash Kak (kak@purdue.edu)
-authors_tallies:
+authors_summary:
   - value: Avinash Kak (kak@purdue.edu)
     count: 2

tests/cluecode/data/authors/author_avinash_kak-BitVector_py.py.yml

@@ -1,9 +1,9 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 authors:
   - Avinash Kak (kak@purdue.edu)
   - Avinash Kak (kak@purdue.edu)
-authors_tallies:
+authors_summary:
   - value: Avinash Kak (kak@purdue.edu)
     count: 2

tests/cluecode/data/authors/author_complex_author-strtol_c.c.yml

@@ -1,8 +1,8 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 authors:
   - the University of California, Berkeley and its contributors
-authors_tallies:
+authors_summary:
   - value: the University of California, Berkeley and its contributors
     count: 1

tests/cluecode/data/authors/author_correct-detail_9_html.html.yml

@@ -1,3 +1,3 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary

tests/cluecode/data/authors/author_do_not_detect_authorize_as_author.csv.yml

@@ -1,3 +1,3 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary

tests/cluecode/data/authors/author_does_not_report_incorrect_junk.txt.yml

@@ -1,3 +1,3 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary

tests/cluecode/data/authors/author_does_not_report_trailing_coma.txt.yml

@@ -1,8 +1,8 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 authors:
   - Gordon Matzigkeit
-authors_tallies:
+authors_summary:
   - value: Gordon Matzigkeit
     count: 1

tests/cluecode/data/authors/author_does_not_report_trailing_junk_and_incorrect_authors.txt.yml

@@ -1,10 +1,10 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 authors:
   - Mohit Agarwal
   - Mitsubishi and NTT.
-authors_tallies:
+authors_summary:
   - value: Mitsubishi and NTT.
     count: 1
   - value: Mohit Agarwal

tests/cluecode/data/authors/author_expat-expat_h.h.yml

@@ -1,3 +1,3 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary

tests/cluecode/data/authors/author_gary-ProjectInfo_java.java.yml

@@ -1,8 +1,8 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 authors:
   - Gary O'Neall
-authors_tallies:
+authors_summary:
   - value: Gary O'Neall
     count: 1

tests/cluecode/data/authors/author_gthomas_c-c.c.yml

@@ -1,10 +1,10 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 authors:
   - gthomas, sorin@netappi.com
   - gthomas, sorin@netappi.com, andrew.lunn@ascom.ch
-authors_tallies:
+authors_summary:
   - value: gthomas, sorin@netappi.com
     count: 1
   - value: gthomas, sorin@netappi.com, andrew.lunn@ascom.ch

tests/cluecode/data/authors/author_in_java-MergeSort_java.java.yml

@@ -1,8 +1,8 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 authors:
   - Scott Violet
-authors_tallies:
+authors_summary:
   - value: Scott Violet
     count: 1

tests/cluecode/data/authors/author_in_java_tag-java.java.yml

@@ -1,8 +1,8 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 authors:
   - Apple Banana Car
-authors_tallies:
+authors_summary:
   - value: Apple Banana Car
     count: 1

tests/cluecode/data/authors/author_in_postcript-9__ps.ps.yml

@@ -1,3 +1,3 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary

tests/cluecode/data/authors/author_in_visio_doc-Glitch_ERD_vsd.vsd.yml

@@ -1,3 +1,3 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary

tests/cluecode/data/authors/author_iproute2.c.yml

@@ -1,8 +1,8 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 authors:
   - Patrick McHardy <kaber@trash.net>
-authors_tallies:
+authors_summary:
   - value: Patrick McHardy <kaber@trash.net>
     count: 1

tests/cluecode/data/authors/author_nathan-KEYS.yml

@@ -1,6 +1,6 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 notes: |
   name +email is not enough to create an author
   hence this is not detected correctly

tests/cluecode/data/authors/author_no_author-c.c.yml

@@ -1,3 +1,3 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary

tests/cluecode/data/authors/author_none-wrong.yml

@@ -1,3 +1,3 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary

tests/cluecode/data/authors/author_none_c-c.c.yml

@@ -1,3 +1,3 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary

tests/cluecode/data/authors/author_none_fp-false_positives_c.c.yml

@@ -1,3 +1,3 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary

tests/cluecode/data/authors/author_none_js-editor_beta_de_js.js.yml

@@ -1,3 +1,3 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary

tests/cluecode/data/authors/author_none_license-LICENSE.yml

@@ -1,3 +1,3 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary

tests/cluecode/data/authors/author_none_sample_java-java.java.yml

@@ -1,8 +1,8 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 authors:
   - not attributable
-authors_tallies:
+authors_summary:
   - value: not attributable
     count: 1

tests/cluecode/data/authors/author_russ_c-c.c.yml

@@ -1,5 +1,5 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 notes: these are detected as copyrights, not authors Russ Dill <Russ.Dill@asu.edu> Vladimir
   Oleynik <dzo@simtreas.ru>

tests/cluecode/data/authors/author_sample-c.c.yml

@@ -1,3 +1,3 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary

tests/cluecode/data/authors/author_samplepy-py.py.yml

@@ -1,3 +1,3 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary

tests/cluecode/data/authors/author_snippet.yml

@@ -1,3 +1,3 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary

tests/cluecode/data/authors/author_stacktrace_cpp-stacktrace_cpp.cpp.yml

@@ -1,8 +1,8 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 authors:
   - faith@dict.org
-authors_tallies:
+authors_summary:
   - value: faith@dict.org
     count: 1

tests/cluecode/data/authors/author_treetablemodeladapter_java-TreeTableModelAdapter_java.java.yml

@@ -1,10 +1,10 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 authors:
   - Philip Milne
   - Scott Violet
-authors_tallies:
+authors_summary:
   - value: Philip Milne
     count: 1
   - value: Scott Violet

tests/cluecode/data/authors/author_uc-LICENSE.yml

@@ -1,11 +1,11 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 authors:
   - the University of California, Berkeley and its contributors
   - UC Berkeley and its contributors
   - the University of California, Berkeley and its contributors
-authors_tallies:
+authors_summary:
   - value: the University of California, Berkeley and its contributors
     count: 2
   - value: UC Berkeley and its contributors

tests/cluecode/data/authors/author_var_route_c-var_route_c.c.yml

@@ -1,11 +1,11 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary
 authors:
   - Erik Schoenfelder (schoenfr@ibr.cs.tu-bs.de)
   - Jennifer Bray of Origin (jbray@origin-at.co.uk)
   - Simon Leinen (simon@switch.ch)
-authors_tallies:
+authors_summary:
   - value: Erik Schoenfelder (schoenfr@ibr.cs.tu-bs.de)
     count: 1
   - value: Jennifer Bray of Origin (jbray@origin-at.co.uk)

tests/cluecode/data/authors/author_vs-visual_studio.txt.yml

@@ -1,3 +1,3 @@
 what:
   - authors
-  - authors_tallies
+  - authors_summary