Merge pull request #7 from exercism/master

Wordy : sync with problem-specifications (exercism#1798)

exercises/wordy/example.py

@@ -11,10 +11,10 @@
                     "multiplied by": mul, "divided by": div}
 
 
-def calculate(stmt):
-    if not (stmt.startswith("What is ") and stmt.endswith("?")):
+def answer(question):
+    if not (question.startswith("What is ") and question.endswith("?")):
         raise ValueError("Ill-formed question")
-    words = stmt[8:-1].strip().lower().split()
+    words = question[8:-1].strip().lower().split()
     if not words:
         raise ValueError("Ill-formed question")
     words.reverse()

exercises/wordy/wordy.py

@@ -1,2 +1,2 @@
-def calculate(question):
+def answer(question):
     pass

exercises/wordy/wordy_test.py

@@ -1,100 +1,100 @@
 import unittest
 
-from wordy import calculate
+from wordy import answer
 
 
 # Tests adapted from `problem-specifications//canonical-data.json` @ v1.5.0
 
 class WordyTest(unittest.TestCase):
 
     def test_just_a_number(self):
-        self.assertEqual(calculate('What is 5?'), 5)
+        self.assertEqual(answer('What is 5?'), 5)
 
     def test_addition(self):
-        self.assertEqual(calculate("What is 1 plus 1?"), 2)
+        self.assertEqual(answer("What is 1 plus 1?"), 2)
 
     def test_more_addition(self):
-        self.assertEqual(calculate("What is 53 plus 2?"), 55)
+        self.assertEqual(answer("What is 53 plus 2?"), 55)
 
     def test_addition_with_negative_numbers(self):
-        self.assertEqual(calculate("What is -1 plus -10?"), -11)
+        self.assertEqual(answer("What is -1 plus -10?"), -11)
 
     def test_large_addition(self):
-        self.assertEqual(calculate("What is 123 plus 45678?"), 45801)
+        self.assertEqual(answer("What is 123 plus 45678?"), 45801)
 
     def test_subtraction(self):
-        self.assertEqual(calculate("What is 4 minus -12?"), 16)
+        self.assertEqual(answer("What is 4 minus -12?"), 16)
 
     def test_multiplication(self):
-        self.assertEqual(calculate("What is -3 multiplied by 25?"), -75)
+        self.assertEqual(answer("What is -3 multiplied by 25?"), -75)
 
     def test_division(self):
-        self.assertEqual(calculate("What is 33 divided by -3?"), -11)
+        self.assertEqual(answer("What is 33 divided by -3?"), -11)
 
-    def test_multiple_addition(self):
-        self.assertEqual(calculate("What is 1 plus 1 plus 1?"), 3)
+    def test_multiple_additions(self):
+        self.assertEqual(answer("What is 1 plus 1 plus 1?"), 3)
 
-    def test_addition_then_subtraction(self):
-        self.assertEqual(calculate("What is 1 plus 5 minus -2?"), 8)
+    def test_addition_and_subtraction(self):
+        self.assertEqual(answer("What is 1 plus 5 minus -2?"), 8)
 
     def test_multiple_subtraction(self):
-        self.assertEqual(calculate("What is 20 minus 4 minus 13?"), 3)
+        self.assertEqual(answer("What is 20 minus 4 minus 13?"), 3)
 
     def test_subtraction_then_addition(self):
-        self.assertEqual(calculate("What is 17 minus 6 plus 3?"), 14)
+        self.assertEqual(answer("What is 17 minus 6 plus 3?"), 14)
 
     def test_multiple_multiplication(self):
         self.assertEqual(
-            calculate("What is 2 multiplied by -2 multiplied by 3?"), -12)
+            answer("What is 2 multiplied by -2 multiplied by 3?"), -12)
 
-    def test_addition_then_multiplication(self):
-        self.assertEqual(calculate("What is -3 plus 7 multiplied by -2?"), -8)
+    def test_addition_and_multiplication(self):
+        self.assertEqual(answer("What is -3 plus 7 multiplied by -2?"), -8)
 
     def test_multiple_division(self):
         self.assertEqual(
-            calculate("What is -12 divided by 2 divided by -3?"), 2)
+            answer("What is -12 divided by 2 divided by -3?"), 2)
 
     def test_unknown_operation(self):
         with self.assertRaisesWithMessage(ValueError):
-            calculate("What is 52 cubed?")
+            answer("What is 52 cubed?")
 
     def test_non_math_question(self):
         with self.assertRaisesWithMessage(ValueError):
-            calculate("Who is the President of the United States?")
+            answer("Who is the President of the United States?")
 
     def test_reject_problem_missing_an_operand(self):
         with self.assertRaisesWithMessage(ValueError):
-            calculate('What is 1 plus?')
+            answer('What is 1 plus?')
 
     def test_reject_problem_with_no_operands_or_operators(self):
         with self.assertRaisesWithMessage(ValueError):
-            calculate('What is?')
+            answer('What is?')
 
-    def test_reject_two_operands_in_a_row(self):
+    def test_reject_two_operations_in_a_row(self):
         with self.assertRaisesWithMessage(ValueError):
-            calculate('What is 1 plus plus 2?')
+            answer('What is 1 plus plus 2?')
 
     def test_reject_two_numbers_in_a_row(self):
         with self.assertRaisesWithMessage(ValueError):
-            calculate('What is 1 plus 2 1?')
+            answer('What is 1 plus 2 1?')
 
     def test_reject_postfix_notation(self):
         with self.assertRaisesWithMessage(ValueError):
-            calculate('What is 1 2 plus?')
+            answer('What is 1 2 plus?')
 
     def test_reject_prefix_notation(self):
         with self.assertRaisesWithMessage(ValueError):
-            calculate('What is plus 1 2?')
+            answer('What is plus 1 2?')
 
     # Additional tests for this track
 
     def test_missing_operation(self):
         with self.assertRaisesWithMessage(ValueError):
-            calculate("What is 2 2 minus 3?")
+            answer("What is 2 2 minus 3?")
 
     def test_missing_number(self):
         with self.assertRaisesWithMessage(ValueError):
-            calculate("What is 7 plus multiplied by -2?")
+            answer("What is 7 plus multiplied by -2?")
 
     # Utility functions
     def setUp(self):