Merge pull request #1 from code4policy/new-features

cube and square changes coming thru

Author: thewelltemperedclavier

calculator.py

@@ -1,16 +1,40 @@
-def multiply(a,b):
+def multiply(a, b):
     return a * b
 
-def add(a,b):
-	return a+b
 
-def subtract(a,b):
-	return a-b
+def add(a, b):
+    return a + b
 
-def divide(a,b):
-	return a/b
 
+def subtract(a, b):
+    return a - b
 
-print("I'm going use the calculator functions to multiply 5 and 6")
-x = multiply(5,6)
-print(x)
+
+def divide(a, b):
+    return a / b
+
+
+def square(x):
+    return x ** 2
+
+
+def cube(x):
+    return x ** 3
+
+
+def square_n_times(number, n):
+    """
+    Squares `number` n times, summing each intermediate squared value.
+
+    Example: number=2, n=3
+      2^2 = 4
+      4^2 = 16
+      16^2 = 256
+      return 4 + 16 + 256 = 276
+    """
+    total = 0
+    value = number
+    for _ in range(n):
+        value = value ** 2
+        total += value
+    return total

test_calculator.py

@@ -1,38 +1,30 @@
-import pytest
+from calculator import add, subtract, multiply, divide, square, cube, square_n_times
 
-def test_multiply():
-    from calculator import multiply
-    assert multiply(3, 4) == 12, "Expected 3 * 4 to be 12"
-    assert multiply(0, 5) == 0, "Expected 0 * 5 to be 0"
-    assert multiply(-2, 6) == -12, "Expected -2 * 6 to be -12"
 
 def test_add():
-    from calculator import add
-    assert add(3, 4) == 7, "Expected 3 + 4 to be 7"
-    assert add(-5, 5) == 0, "Expected -5 + 5 to be 0"
-    assert add(0, 0) == 0, "Expected 0 + 0 to be 0"
+    assert add(2, 3) == 5
+
 
 def test_subtract():
-    from calculator import subtract
-    assert subtract(10, 4) == 6, "Expected 10 - 4 to be 6"
-    assert subtract(0, 5) == -5, "Expected 0 - 5 to be -5"
-    assert subtract(-3, -7) == 4, "Expected -3 - (-7) to be 4"
+    assert subtract(10, 4) == 6
+
+
+def test_multiply():
+    assert multiply(3, 7) == 21
+
 
 def test_divide():
-    from calculator import divide
-    assert divide(12, 3) == 4, "Expected 12 / 3 to be 4"
-    assert divide(-9, 3) == -3, "Expected -9 / 3 to be -3"
-    with pytest.raises(ZeroDivisionError):
-        divide(5, 0)  # Ensure it raises an exception for divide by zero
+    assert divide(8, 2) == 4
+
 
 def test_square():
-    from calculator import square
-    assert square(12) == 144, "Expected 12^2 to be 144"
-    assert square(2) == 4, "Expected 2^2 to be 4"
-    assert square(-2) == 4, "Expected (-2)^2 to be 4"
+    assert square(5) == 25
+
 
 def test_cube():
-    from calculator import cube
-    assert cube(12) == 1728, "Expected 12^3 to be 1728"
-    assert cube(2) == 8, "Expected 2^3 to be 8"
-    assert cube(-2) == -8, "Expected (-2)^3 to be -8"
+    assert cube(3) == 27
+
+
+def test_square_n_times():
+    assert square_n_times(2, 3) == 276
+    assert square_n_times(10, 0) == 0