diff --git a/src/calc.py b/src/calc.py index 0ca74f50fade11db0dffc0281ba1ec3b00494560..8b2ce42500ff22ef90e630bbfabf772408889b17 100644 --- a/src/calc.py +++ b/src/calc.py @@ -25,6 +25,11 @@ class Calculator: 'operation': '{} * {}'.format(op1, op2), 'resultat': op1 * op2, } + elif operation == 'DIVISE': + return { + 'operation': '{} / {}'.format(op1, op2), + 'resultat': op1 / op2, + } return None diff --git a/src/tests.py b/src/tests.py index 65242c092f2e23c4113d85975ea1ee901cc3da5a..21f054cb387d1207719c78496f79d7d2b72c1b99 100755 --- a/src/tests.py +++ b/src/tests.py @@ -17,6 +17,18 @@ class TestCalculator(unittest.TestCase): self.assertEqual(result['operation'], "{} + {}".format(operation['op1'], operation['op2'])) self.assertEqual(result['resultat'], operation['op1'] + operation['op2']) + def test_DIVISE(self): + calculator = calc.Calculator() + operation = { + 'operation': 'DIVISE', + 'op1': random.randint(-20,20), + 'op2': random.randint(-20,20) + } + result = calculator.do_op(operation) + self.assertEqual(result['operation'], "{} / {}".format(operation['op1'], operation['op2'])) + self.assertEqual(result['resultat'], operation['op1'] / operation['op2']) + + def test_FOIS(self): calculator = calc.Calculator() operation = {