diff --git a/app/calculator.py b/app/calculator.py index 8a976b25..4b767c9a 100644 --- a/app/calculator.py +++ b/app/calculator.py @@ -13,3 +13,6 @@ def divide(x, y): if y == 0: return 'Cannot divide by 0' return x * 1.0 / y + + def add2(x,y,z): + return x+y+z diff --git a/app/test_calculator.py b/app/test_calculator.py index 13353471..49a4750c 100644 --- a/app/test_calculator.py +++ b/app/test_calculator.py @@ -23,11 +23,11 @@ def test_multiply(): assert Calculator.multiply(2.0, 0.0) == 0.0 assert Calculator.multiply(-4, 2.0) == -8.0 -# def test_divide(): -# # assert Calculator.divide(1, 2) == 0.5 -# assert Calculator.divide(1.0, 2.0) == 0.5 -# assert Calculator.divide(0, 2.0) == 0 -# assert Calculator.divide(-4, 2.0) == -2.0 -# # assert Calculator.divide(2.0, 0.0) == 'Cannot divide by 0' +def test_divide(): + # assert Calculator.divide(1, 2) == 0.5 + assert Calculator.divide(1.0, 2.0) == 0.5 + assert Calculator.divide(0, 2.0) == 0 + assert Calculator.divide(-4, 2.0) == -2.0 + # assert Calculator.divide(2.0, 0.0) == 'Cannot divide by 0'