diff --git a/calculator.py b/calculator.py index a9f3005..943416d 100644 --- a/calculator.py +++ b/calculator.py @@ -12,6 +12,12 @@ def multiply(a, b): def divide(a, b): return a / b +def CircleArea(r): + if r >= 0: + return 3.14 * r * r + else: + return "NaN" + def main(): while True: a = float(input("First number: ")) diff --git a/test_calculator.py b/test_calculator.py index 4d99646..d464d1e 100644 --- a/test_calculator.py +++ b/test_calculator.py @@ -1,4 +1,4 @@ -from calculator import add, subtract, multiply, divide +from calculator import add, subtract, multiply, divide, CircleArea def test_add(): assert add(2, 3) == 5 @@ -19,3 +19,6 @@ def test_divide_uneven(): result = divide(a, b) # Assert assert result == 2.5 + +def test_circleArea(): + assert CircleArea(-4) == "Error"