Skip to content

Commit e1b843c

Browse files
new operation
1 parent 10eaa1c commit e1b843c

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

app/calculator.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ def multiply(x, y):
1111

1212
def divide(x, y):
1313
if y == 0:
14-
return 'Cannot divide by 0'
14+
return "Cannot divide by 0"
1515
return x * 1.0 / y
1616

17+
def abs(x):
18+
return x if x >= 0 else -x

app/test_calculator.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ def test_add():
88
assert Calculator.add(2.0, 0) == 2.0
99
assert Calculator.add(-4, 2.0) == -2.0
1010

11+
1112
def test_subtract():
1213
assert Calculator.subtract(1, 2) == -1.0
1314
assert Calculator.subtract(2, 1) == 1.0
@@ -16,16 +17,24 @@ def test_subtract():
1617
assert Calculator.subtract(2.0, 0.0) == 2.0
1718
assert Calculator.subtract(-4, 2.0) == -6.0
1819

20+
1921
def test_multiply():
2022
assert Calculator.multiply(1, 2) == 2.0
2123
assert Calculator.multiply(1.0, 2.0) == 2.0
2224
assert Calculator.multiply(0, 2.0) == 0.0
2325
assert Calculator.multiply(2.0, 0.0) == 0.0
2426
assert Calculator.multiply(-4, 2.0) == -8.0
2527

28+
2629
def test_divide():
2730
# assert Calculator.divide(1, 2) == 0.5
2831
assert Calculator.divide(1.0, 2.0) == 0.5
2932
assert Calculator.divide(0, 2.0) == 0
3033
assert Calculator.divide(-4, 2.0) == -2.0
3134
# assert Calculator.divide(2.0, 0.0) == 'Cannot divide by 0'
35+
36+
37+
def test_abs():
38+
assert Calculator.abs(1) == 1
39+
assert Calculator.abs(-1) == 1
40+
assert Calculator.abs(0) == 0

0 commit comments

Comments
 (0)