Skip to content
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.

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

Dominik's task #92

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion calculator/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from .calcurator import add, subtract, divide, multiply
from .calculator import add, subtract, divide, multiply, square_root, exponentiate
11 changes: 11 additions & 0 deletions calculator/calcurator.py → calculator/calculator.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import math


def add(x, y):
"""Returns the sum of x and y."""
return x + y
Expand All @@ -16,3 +19,11 @@ def divide(x, y):
def subtract(x, y):
"""Returns the difference between x and y."""
return x - y

def square_root(x):
"""Returns the square root of x."""
return math.sqrt(x)

def exponentiate(x, y):
"""Returns x raised to the power of y."""
return x ** y
12 changes: 11 additions & 1 deletion calculator/tests/unit_tests_calculator.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# test_calculator.py

from calculator import add, multiply, divide, subtract
from calculator import add, multiply, divide, subtract, square_root, exponentiate

def test_addition():
assert add(5, 3) == 8
Expand All @@ -21,3 +21,13 @@ def test_subtraction():
assert subtract(10, 7) == 3
assert subtract(5, 5) == 0
assert subtract(7, 10) == -3

def test_square_root():
assert square_root(9) == 3
assert square_root(0) == 0
assert square_root(36) == 6

def test_exponentiation():
assert exponentiate(2, 3) == 8
assert exponentiate(5, 0) == 1
assert exponentiate(3, -2) == 1/9