Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Tst fork #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 18 commits into from
Closed

Tst fork #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
4a07540
test
dana-yaish Oct 12, 2022
dc51ae2
test
dana-yaish Oct 12, 2022
260728c
Merge pull request #3 from dana-yaish/test
dana-yaish Oct 13, 2022
0eae751
remove test
dana-yaish Oct 13, 2022
847c967
Merge pull request #4 from dana-yaish/test1
dana-yaish Oct 13, 2022
caa5c49
add test
dana-yaish Oct 13, 2022
8453812
adding new func
dana-yaish Oct 13, 2022
a4b466f
Merge pull request #5 from dana-yaish/test2
dana-yaish Oct 13, 2022
0a14e26
add new func
dana-yaish Oct 13, 2022
e833825
Merge pull request #6 from dana-yaish/test3
dana-yaish Oct 13, 2022
94d47ca
delete test
dana-yaish Oct 13, 2022
75d78e1
remove second test
dana-yaish Oct 13, 2022
c3c029a
Merge pull request #7 from dana-yaish/test4
dana-yaish Oct 13, 2022
dd47ff9
adding test
dana-yaish Oct 17, 2022
fea5910
force pushing
dana-yaish Oct 17, 2022
eeba010
Merge pull request #9 from dana-yaish/test6
dana-yaish Oct 17, 2022
9153e73
removing tests
dana-yaish May 16, 2023
578b96a
add test
dana-yaish May 16, 2023
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
6 changes: 6 additions & 0 deletions app/calculator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,9 @@ 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

def subtract2(x, y,z):
return x - y - z
38 changes: 20 additions & 18 deletions app/test_calculator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@


def test_add():
assert Calculator.add(1, 2) == 3.0
assert Calculator.add(1.0, 2.0) == 3.0
assert Calculator.add(0, 2.0) == 2.0
assert Calculator.add(2.0, 0) == 2.0
assert Calculator.add(-4, 2.0) == -2.0
assert 1 == 1

def test_subtract():
assert Calculator.subtract(1, 2) == -1.0
Expand All @@ -15,17 +11,23 @@ def test_subtract():
assert Calculator.subtract(0, 2.0) == -2.0
assert Calculator.subtract(2.0, 0.0) == 2.0
assert Calculator.subtract(-4, 2.0) == -6.0
assert Calculator.subtract(-4, 4.0) == -8.0

# def test_multiply():
# assert Calculator.multiply(1, 2) == 2.0
# assert Calculator.multiply(1.0, 2.0) == 2.0
# assert Calculator.multiply(0, 2.0) == 0.0
# assert Calculator.multiply(2.0, 0.0) == 0.0
# assert Calculator.multiply(-4, 2.0) == -8.0

def test_trivial():
assert True

# 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_multiply():
assert Calculator.multiply(1, 2) == 2.0
assert Calculator.multiply(1.0, 2.0) == 2.0
assert Calculator.multiply(0, 2.0) == 0.0
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'