word-count: sync with canonical data (exercism#1805)

Grociu · cmccandless · commit e248503d3f44 · 2019-05-31T08:57:14.000-04:00
diff --git a/exercises/word-count/example.py b/exercises/word-count/example.py
@@ -6,5 +6,5 @@
 WORDS = re.compile("[a-z0-9]+(['][a-z]+)?")
 
 
-def word_count(text):
+def count_words(text):
     return Counter(word.group(0) for word in WORDS.finditer(text.lower()))
diff --git a/exercises/word-count/word_count.py b/exercises/word-count/word_count.py
@@ -1,2 +1,2 @@
-def word_count(phrase):
+def count_words(sentence):
     pass
diff --git a/exercises/word-count/word_count_test.py b/exercises/word-count/word_count_test.py
@@ -1,6 +1,6 @@
 import unittest
 
-from word_count import word_count
+from word_count import count_words
 
 
 # Tests adapted from `problem-specifications//canonical-data.json` @ v1.3.0
@@ -9,90 +9,90 @@ class WordCountTest(unittest.TestCase):
 
     def test_count_one_word(self):
         self.assertEqual(
-            word_count('word'),
+            count_words('word'),
             {'word': 1}
         )
 
-    def test_count_one_of_each(self):
+    def test_count_one_of_each_word(self):
         self.assertEqual(
-            word_count('one of each'),
+            count_words('one of each'),
             {'one': 1, 'of': 1, 'each': 1}
         )
 
-    def test_count_multiple_occurrences_of_a_word(self):
+    def test_multiple_occurrences_of_a_word(self):
         self.assertEqual(
-            word_count('one fish two fish red fish blue fish'),
+            count_words('one fish two fish red fish blue fish'),
             {'one': 1, 'fish': 4, 'two': 1, 'red': 1, 'blue': 1}
         )
 
-    def test_cramped_list(self):
+    def test_handles_cramped_lists(self):
         self.assertEqual(
-            word_count('one,two,three'),
+            count_words('one,two,three'),
             {'one': 1, 'two': 1, 'three': 1}
         )
 
-    def test_expanded_list(self):
+    def test_handles_expanded_lists(self):
         self.assertEqual(
-            word_count('one,\ntwo,\nthree'),
+            count_words('one,\ntwo,\nthree'),
             {'one': 1, 'two': 1, 'three': 1}
         )
 
-    def test_ignores_punctuation(self):
+    def test_ignore_punctuation(self):
         self.assertEqual(
-            word_count('car : carpet as java : javascript!!&@$%^&'),
+            count_words('car : carpet as java : javascript!!&@$%^&'),
             {'car': 1, 'carpet': 1, 'as': 1, 'java': 1, 'javascript': 1}
         )
 
     def test_include_numbers(self):
         self.assertEqual(
-            word_count('testing 1 2 testing'),
+            count_words('testing 1 2 testing'),
             {'testing': 2, '1': 1, '2': 1}
         )
 
     def test_normalize_case(self):
         self.assertEqual(
-            word_count('go Go GO Stop stop'),
+            count_words('go Go GO Stop stop'),
             {'go': 3, 'stop': 2}
         )
 
-    def test_apostrophes(self):
+    def test_with_apostrophes(self):
         self.assertEqual(
-            word_count("First: don't laugh. Then: don't cry."),
+            count_words("First: don't laugh. Then: don't cry."),
             {'first': 1, "don't": 2, 'laugh': 1, 'then': 1, 'cry': 1}
         )
 
-    def test_quotations(self):
+    def test_with_quotations(self):
         self.assertEqual(
-            word_count("Joe can't tell between 'large' and large."),
+            count_words("Joe can't tell between 'large' and large."),
             {'joe': 1, "can't": 1, 'tell': 1, 'between': 1, 'large': 2,
              'and': 1}
         )
 
     def test_multiple_spaces_not_detected_as_a_word(self):
         self.assertEqual(
-            word_count(' multiple   whitespaces'),
+            count_words(' multiple   whitespaces'),
             {'multiple': 1, 'whitespaces': 1}
         )
 
-    def test_alternating_word_separators(self):
+    def test_alternating_word_separators_not_detected_as_a_word(self):
         self.assertEqual(
-            word_count(",\n,one,\n ,two \n 'three'"),
+            count_words(",\n,one,\n ,two \n 'three'"),
             {'one': 1, 'two': 1, 'three': 1}
         )
 
     # Additional tests for this track
 
     def test_tabs(self):
         self.assertEqual(
-            word_count('rah rah ah ah ah\troma roma ma\tga ga oh la la\t'
-                       'want your bad romance'),
+            count_words('rah rah ah ah ah\troma roma ma\tga ga oh la la\t'
+                        'want your bad romance'),
             {'rah': 2, 'ah': 3, 'roma': 2, 'ma': 1, 'ga': 2, 'oh': 1, 'la': 2,
              'want': 1, 'your': 1, 'bad': 1, 'romance': 1}
         )
 
     def test_non_alphanumeric(self):
         self.assertEqual(
-            word_count('hey,my_spacebar_is_broken.'),
+            count_words('hey,my_spacebar_is_broken.'),
             {'hey': 1, 'my': 1, 'spacebar': 1, 'is': 1, 'broken': 1}
         )
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-def word_count(phrase):`
	`1`	`+def count_words(sentence):`
`2`	`2`	`pass`