pull request for lesson 5

students/template_student/lesson01/activity/calculator/calculator.py → students/Justin_Jameson/lesson01/activity/calculator/calculator.py

@@ -1,5 +1,6 @@
 from .exceptions import InsufficientOperands
 
+
 class Calculator(object):
 
     def __init__(self, adder, subtracter, multiplier, divider):
@@ -11,7 +12,7 @@ def __init__(self, adder, subtracter, multiplier, divider):
         self.stack = []
 
     def enter_number(self, number):
-        self.stack.insert(0, number)
+        self.stack.insert(1, number)
 
     def _do_calc(self, operator):
         try:
@@ -31,5 +32,5 @@ def subtract(self):
     def multiply(self):
         return self._do_calc(self.multiplier)
 
-    def divide(self):
+    def divider(self):
         return self._do_calc(self.divider)

students/template_student/lesson01/activity/test_unit.py → students/Justin_Jameson/lesson01/activity/test_unit.py

@@ -8,6 +8,7 @@
 from calculator.calculator import Calculator
 from calculator.exceptions import InsufficientOperands
 
+
 class AdderTests(TestCase):
 
     def test_adding(self):
@@ -28,6 +29,26 @@ def test_subtracting(self):
                 self.assertEqual(i - j, subtracter.calc(i, j))
 
 
+class MultiplierTests(TestCase):
+
+    def test_multiplying(self):
+        multiplier = Multiplier()
+
+        for i in range(-10, 10):
+            for j in range(-10, 10):
+                self.assertEqual(i * j, multiplier.calc(i, j))
+
+
+class DividerTests(TestCase):
+
+    def test_dividing(self):
+        divider = Divider()
+
+        for i in range(-10, 10):
+            for j in range(1, 21):
+                self.assertEqual(i / j, divider.calc(i, j))
+
+
 class CalculatorTests(TestCase):
 
     def setUp(self):
@@ -62,4 +83,20 @@ def test_subtracter_call(self):
 
         self.subtracter.calc.assert_called_with(1, 2)
 
+    def test_multiplier_call(self):
+        self.multiplier.calc = MagicMock(return_value=0)
+
+        self.calculator.enter_number(1)
+        self.calculator.enter_number(2)
+        self.calculator.multiply()
+
+        self.multiplier.calc.assert_called_with(1, 2)
+
+    def test_divider_call(self):
+        self.divider.calc = MagicMock(return_value=0)
+
+        self.calculator.enter_number(1)
+        self.calculator.enter_number(2)
+        self.calculator.divider()
 
+        self.divider.calc.assert_called_with(1, 2)