Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/calculator.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 6 additions & 6 deletions app/test_calculator.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'