word-search: Update tests to version 1.1.0(exercism#1012) (exercism#1053)

josix · Nathan Parsons · commit f0dfd606cdfc · 2017-10-27T14:05:35.000+01:00
* word-search: Update tests to version 1.1.0(exercism#1012) * Remove redundant and misplaced assertions
diff --git a/exercises/word-search/word_search_test.py b/exercises/word-search/word_search_test.py
@@ -3,8 +3,111 @@
 from word_search import WordSearch, Point
 
 
+# Tests adapted from `problem-specifications//canonical-data.json` @ v1.1.0
+
 class WordSearchTests(unittest.TestCase):
 
+    def test_initial_game_grid(self):
+        puzzle = 'jefblpepre'
+        searchAnswer = WordSearch(puzzle).search('clojure')
+        self.assertIsNone(searchAnswer)
+
+    def test_left_to_right_word(self):
+        puzzle = 'clojurermt'
+        searchAnswer = WordSearch(puzzle).search('clojure')
+        self.assertEqual(searchAnswer, (Point(0, 0), Point(6, 0)))
+
+    def test_left_to_right_word_different_position(self):
+        puzzle = 'mtclojurer'
+        searchAnswer = WordSearch(puzzle).search('clojure')
+        self.assertEqual(searchAnswer, (Point(2, 0), Point(8, 0)))
+
+    def test_different_left_to_right_word(self):
+        puzzle = 'coffeelplx'
+        searchAnswer = WordSearch(puzzle).search('coffee')
+        self.assertEqual(searchAnswer, (Point(0, 0), Point(5, 0)))
+
+    def test_different_left_to_right_word_different_position(self):
+        puzzle = 'xcoffeezlp'
+        searchAnswer = WordSearch(puzzle).search('coffee')
+        self.assertEqual(searchAnswer, (Point(1, 0), Point(6, 0)))
+
+    def test_left_to_right_word_two_lines(self):
+        puzzle = ('jefblpepre\n'
+                  'tclojurerm\n')
+        searchAnswer = WordSearch(puzzle).search('clojure')
+        self.assertEqual(searchAnswer, (Point(1, 1), Point(7, 1)))
+
+    def test_left_to_right_word_three_lines(self):
+        puzzle = ('camdcimgtc\n'
+                  'jefblpepre\n'
+                  'clojurermt\n')
+        searchAnswer = WordSearch(puzzle).search('clojure')
+        self.assertEqual(searchAnswer, (Point(0, 2), Point(6, 2)))
+
+    def test_left_to_right_word_ten_lines(self):
+        puzzle = ('jefblpepre\n'
+                  'camdcimgtc\n'
+                  'oivokprjsm\n'
+                  'pbwasqroua\n'
+                  'rixilelhrs\n'
+                  'wolcqlirpc\n'
+                  'screeaumgr\n'
+                  'alxhpburyi\n'
+                  'jalaycalmp\n'
+                  'clojurermt\n')
+        searchAnswer = WordSearch(puzzle).search('clojure')
+        self.assertEqual(searchAnswer, (Point(0, 9), Point(6, 9)))
+
+    def test_left_to_right_word_ten_lines_different_position(self):
+        puzzle = ('jefblpepre\n'
+                  'camdcimgtc\n'
+                  'oivokprjsm\n'
+                  'pbwasqroua\n'
+                  'rixilelhrs\n'
+                  'wolcqlirpc\n'
+                  'screeaumgr\n'
+                  'alxhpburyi\n'
+                  'clojurermt\n'
+                  'jalaycalmp\n')
+        searchAnswer = WordSearch(puzzle).search('clojure')
+        self.assertEqual(searchAnswer, (Point(0, 8), Point(6, 8)))
+
+    def test_different_left_to_right_word_ten_lines(self):
+        puzzle = ('jefblpepre\n'
+                  'camdcimgtc\n'
+                  'oivokprjsm\n'
+                  'pbwasqroua\n'
+                  'rixilelhrs\n'
+                  'wolcqlirpc\n'
+                  'fortranftw\n'
+                  'alxhpburyi\n'
+                  'clojurermt\n'
+                  'jalaycalmp\n')
+        searchAnswer = WordSearch(puzzle).search('fortran')
+        self.assertEqual(searchAnswer, (Point(0, 6), Point(6, 6)))
+
+    def test_multiple_words(self):
+        puzzle = ('jefblpepre\n'
+                  'camdcimgtc\n'
+                  'oivokprjsm\n'
+                  'pbwasqroua\n'
+                  'rixilelhrs\n'
+                  'wolcqlirpc\n'
+                  'fortranftw\n'
+                  'alxhpburyi\n'
+                  'jalaycalmp\n'
+                  'clojurermt\n')
+        searchAnswer = WordSearch(puzzle).search('fortran')
+        self.assertEqual(searchAnswer, (Point(0, 6), Point(6, 6)))
+        searchAnswer = WordSearch(puzzle).search('clojure')
+        self.assertEqual(searchAnswer, (Point(0, 9), Point(6, 9)))
+
+    def test_single_word_right_to_left(self):
+        puzzle = 'rixilelhrs'
+        searchAnswer = WordSearch(puzzle).search('elixir')
+        self.assertEqual(searchAnswer, (Point(5, 0), Point(0, 0)))
+
     @classmethod
     def setUpClass(self):
         puzzle = ('jefblpepre\n'
@@ -19,13 +122,11 @@ def setUpClass(self):
                   'clojurermt')
         self.example = WordSearch(puzzle)
 
-    def test_horizontal_words_left_to_right(self):
+    def test_horizontal_words_different_directions(self):
         self.assertEqual(
             self.example.search('clojure'),
             (Point(0, 9), Point(6, 9))
         )
-
-    def test_horizontal_words_right_to_left(self):
         self.assertEqual(
             self.example.search('elixir'),
             (Point(5, 4), Point(0, 4))
@@ -70,15 +171,6 @@ def test_diagonal_upper_top_right_to_bottom_left(self):
     def test_words_that_are_not_in_the_puzzle(self):
         self.assertIsNone(self.example.search('haskell'))
 
-    def test_search_differently_sized_puzzles(self):
-        puzzle = ('qwertyuiopz\n'
-                  'luamsicrexe\n'
-                  'abcdefghijk')
-        self.assertEqual(
-            WordSearch(puzzle).search('exercism'),
-            (Point(10, 1), Point(3, 1))
-        )
-
 
 if __name__ == '__main__':
     unittest.main()
