forth: Fix exercism#1135, update test to v1.4.0 (exercism#1175)

mrcfps · cmccandless · commit e09fee45c321 · 2018-01-26T08:29:22.000-06:00
* forth: Fix exercism#1135, update test to v1.4.0 * forth: improve example to pass test v1.4.0
diff --git a/exercises/forth/example.py b/exercises/forth/example.py
@@ -18,7 +18,7 @@ def evaluate(input_data):
         values = input_data.pop(0).split()
         values.pop()
         values.pop(0)
-        key = values.pop(0)
+        key = values.pop(0).lower()
         if is_integer(key):
             raise ValueError("Integers cannot be redefined")
         defines[key] = values
diff --git a/exercises/forth/forth_test.py b/exercises/forth/forth_test.py
@@ -3,20 +3,10 @@
 from forth import evaluate, StackUnderflowError
 
 
-# Tests adapted from `problem-specifications//canonical-data.json` @ v1.2.0
+# Tests adapted from `problem-specifications//canonical-data.json` @ v1.4.0
 # Tests for case-insensitivity are track-specific
 
 class ForthParsingTest(unittest.TestCase):
-    def test_empty_input_empty_stack(self):
-        input_data = []
-        expected = []
-        self.assertEqual(evaluate(input_data), expected)
-
-    def test_empty_line_empty_stack(self):
-        input_data = [""]
-        expected = []
-        self.assertEqual(evaluate(input_data), expected)
-
     def test_numbers_just_get_pushed_to_stack(self):
         input_data = ["1 2 3 4 5"]
         expected = [1, 2, 3, 4, 5]
@@ -154,13 +144,13 @@ def test_multiplication_and_division(self):
 
 
 class ForthDupTest(unittest.TestCase):
-    def test_copies_the_top_value_on_the_stack(self):
-        input_data = ["1 DUP"]
+    def test_copies_a_value_on_the_stack(self):
+        input_data = ["1 dup"]
         expected = [1, 1]
         self.assertEqual(evaluate(input_data), expected)
 
-    def test_is_case_insensitive(self):
-        input_data = ["1 2 Dup"]
+    def test_copies_the_top_value_on_the_stack(self):
+        input_data = ["1 2 dup"]
         expected = [1, 2, 2]
         self.assertEqual(evaluate(input_data), expected)
 
@@ -191,11 +181,6 @@ def test_removes_the_top_value_on_the_stack_if_it_not_the_only_one(self):
         expected = [3]
         self.assertEqual(evaluate(input_data), expected)
 
-    def test_is_case_insensitive(self):
-        input_data = ["1 2 Drop"]
-        expected = [1]
-        self.assertEqual(evaluate(input_data), expected)
-
     def test_errors_if_there_is_nothing_on_the_stack(self):
         input_data = ["drop"]
         with self.assertRaisesWithMessage(StackUnderflowError):
@@ -223,11 +208,6 @@ def test_swaps_two_two_values_on_stack(self):
         expected = [1, 3, 2]
         self.assertEqual(evaluate(input_data), expected)
 
-    def test_is_case_insensitive(self):
-        input_data = ["3 4 Swap"]
-        expected = [4, 3]
-        self.assertEqual(evaluate(input_data), expected)
-
     def test_errors_if_there_is_nothing_on_the_stack(self):
         input_data = ["swap"]
         with self.assertRaisesWithMessage(StackUnderflowError):
@@ -260,11 +240,6 @@ def test_copies_the_second_element_if_there_are_more_than_two(self):
         expected = [1, 2, 3, 2]
         self.assertEqual(evaluate(input_data), expected)
 
-    def test_is_case_insensitive(self):
-        input_data = ["3 4 Over"]
-        expected = [3, 4, 3]
-        self.assertEqual(evaluate(input_data), expected)
-
     def test_errors_if_there_is_nothing_on_the_stack(self):
         input_data = ["over"]
         with self.assertRaisesWithMessage(StackUnderflowError):
@@ -328,14 +303,6 @@ def test_can_override_built_in_operators(self):
         expected = [12]
         self.assertEqual(evaluate(input_data), expected)
 
-    def test_is_case_insensitive(self):
-        input_data = [
-            ": foo dup ;",
-            "1 FOO"
-        ]
-        expected = [1, 1]
-        self.assertEqual(evaluate(input_data), expected)
-
     def test_cannot_redefine_numbers(self):
         input_data = [": 1 2 ;"]
         with self.assertRaisesWithMessage(ValueError):
@@ -357,5 +324,43 @@ def assertRaisesWithMessage(self, exception):
         return self.assertRaisesRegex(exception, r".+")
 
 
+class ForthCaseInsensitivityTest(unittest.TestCase):
+    def test_dup_is_case_insensitive(self):
+        input_data = ["1 DUP Dup dup"]
+        expected = [1, 1, 1, 1]
+        self.assertEqual(evaluate(input_data), expected)
+
+    def test_drop_is_case_insensitive(self):
+        input_data = ["1 2 3 4 DROP Drop drop"]
+        expected = [1]
+        self.assertEqual(evaluate(input_data), expected)
+
+    def test_swap_is_case_insensitive(self):
+        input_data = ["1 2 SWAP 3 Swap 4 swap"]
+        expected = [2, 3, 4, 1]
+        self.assertEqual(evaluate(input_data), expected)
+
+    def test_over_is_case_insensitive(self):
+        input_data = ["1 2 OVER Over over"]
+        expected = [1, 2, 1, 2, 1]
+        self.assertEqual(evaluate(input_data), expected)
+
+    def test_user_defined_words_are_case_insensitive(self):
+        input_data = [
+            ": foo dup ;",
+            "1 FOO Foo foo"
+        ]
+        expected = [1, 1, 1, 1]
+        self.assertEqual(evaluate(input_data), expected)
+
+    def test_definitions_are_case_insensitive(self):
+        input_data = [
+            ": SWAP DUP Dup dup ;",
+            "1 swap"
+        ]
+        expected = [1, 1, 1, 1]
+        self.assertEqual(evaluate(input_data), expected)
+
+
 if __name__ == '__main__':
     unittest.main()
