From 69982ebcca6d4da796b8296b834d901f7578c4d6 Mon Sep 17 00:00:00 2001
From: Asoretzu <asoretzu@gmail.com>
Date: Mon, 8 Jun 2020 18:25:31 -0500
Subject: [PATCH] Challenge completed.

---
 __pycache__/tests.cpython-37.pyc | Bin 1029 -> 0 bytes
 challenge.py                     |  67 ++++++++++++++++---------------
 2 files changed, 35 insertions(+), 32 deletions(-)
 delete mode 100644 __pycache__/tests.cpython-37.pyc

diff --git a/__pycache__/tests.cpython-37.pyc b/__pycache__/tests.cpython-37.pyc
deleted file mode 100644
index 14edd50edc53ec539457d3d4d27dd1744571f7e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1029
zcmZuvO>fgc5S?AyiRmYVBEgLVLb60F#Gyh6p@;^!MM!N0S{aPxT^hHJo$fk?RPL$e
z&JW<w9QjMWa_V2;0yAqG+Nvw<cx}(Teecb@TwI(3TuW!)Kdy6tU-WXmTs(Afn{^Bl
zBs&2Cib=l5^%LnxH{*i80qM!s3CNb>yUwvAT*XhlDKL=kCIsz-VKFUw65<AKvxK1{
zOho<W+yl(y{j)!~enP<NmML|b?`UKMHvH};&%$k^v<bHc<6J8J{&k@f750?bD~nP1
zRu{V}DNUGUu`#QoNjWI;)yGf6Qkl}MjVASyRtH$Gq6VAj7{UjpJ&d&<MZ-AFqv(u2
z_7jTdi}Jd-%>xVy1d|}RL?_S@hn&Et+xQ?n*+w;fy|8IDm@Oi3y$c;gBNRgT;ZzWz
zA6V=4g&SwZKzOD|WsEPwLI>#VpvYq3#WF37aCI?^(W-VM$KcU5D*OE3Gfi&So>ArY
z=mwE*VF1n<XNR4O<koD;jG}{ClxiFG2oGN$R<H}FYzjU2a5v;f?1)!z$}3hn6+dQE
z&R~DxT|=Jr16R{^wU?G^Xv94BL+SF>{y5I8(}AOD=4xk8O=|BT&c^C0>D$z`=yJnu
zVvQk5z*gAd{YwI_NuSA~M$@)(d^}X}X-1V<ssXc%uCnk;73*H{C11g+f3tFU=gP%R
zMn7oL0Oj#eMNvJ6qg2RoM(2enBIV5=J&#CwnF7hVaG{-aQm2U`ZQCxN`EB2|--4EP
rPv63S!XM{pNvefU^R*G9#Z*+gG{e{7*8cN`(+fNK_7)f6d1v`AEcoX0

diff --git a/challenge.py b/challenge.py
index ffdfcce..660fa54 100644
--- a/challenge.py
+++ b/challenge.py
@@ -3,86 +3,89 @@
 
 def square_area(side):
     """Returns the area of a square"""
-    # You have to code here
-    # REMEMBER: Tests first!!!
-    pass
+    return side * side
 
 
 def rectangle_area(base, height):
     """Returns the area of a rectangle"""
-    # You have to code here
-    # REMEMBER: Tests first!!!
-    pass
+    return base * height
 
 
 def triangle_area(base, height):
     """Returns the area of a triangle"""
-    # You have to code here
-    # REMEMBER: Tests first!!!
-    pass
+    return (base * height) / 2
 
 
 def rhombus_area(diagonal_1, diagonal_2):
     """Returns the area of a rhombus"""
-    # You have to code here
-    # REMEMBER: Tests first!!!
-    pass
+    return (diagonal_1 * diagonal_2) / 2
 
 
 def trapezoid_area(base_minor, base_major, height):
     """Returns the area of a trapezoid"""
-    # You have to code here
-    # REMEMBER: Tests first!!!
-    pass
+    return (base_major * base_minor * height) / 2
 
 
 def regular_polygon_area(perimeter, apothem):
     """Returns the area of a regular polygon"""
-    # You have to code here
-    # REMEMBER: Tests first!!!
-    pass
+    return (perimeter * apothem) / 2
 
 
 def circumference_area(radius):
     """Returns the area of a circumference"""
-    # You have to code here
-    # REMEMBER: Tests first!!!
-    # Use math.pi for π value
-    pass
+    return round(math.pi * radius**2, 2)
 
 
 if __name__ == '__main__':
     import unittest
 
     class GeometrySuite(unittest.TestCase):
-
         def setUp(self):
             # Initialize the needed values for the tests
-            pass
+            self.square = {4: 2, 16: 4, 25: 5}
+            self.rectangle = {12: [3, 4], 48: [6, 8], 56: [7, 8]}
+            self.triangle = {6: [3, 4], 24: [6, 8], 28: [7, 8]}
+            self.rhombus = {8: [4, 4], 18: [6, 6], 6: [4, 3]}
+            self.trapezoid = {12: [3, 4, 2], 15: [3, 5, 2], 84: [7, 8, 3]}
+            self.polygon = {6: [3, 4], 24: [6, 8], 28: [7, 8]}
+            self.circumference = {50.27: 4, 201.06: 8, 78.54: 5}
 
         def test_square_area(self):
-            # Make this test first...
+            for key, value in self.square.items():
+                self.assertEqual(key, square_area(value))
 
         def test_rectangle_area(self):
-            # Make this test first...
+            for key, values in self.rectangle.items():
+                self.assertEqual(key, rectangle_area(values[0], values[1]))
 
         def test_triangle_area(self):
-            # Make this test first...
+            for key, values in self.triangle.items():
+                self.assertEqual(key, triangle_area(values[0], values[1]))
 
         def test_rhombus_area(self):
-            # Make this test first...
+            for key, values in self.rhombus.items():
+                self.assertEqual(key, rhombus_area(values[0], values[1]))
 
         def test_trapezoid_area(self):
-            # Make this test first...
+            for key, values in self.trapezoid.items():
+                self.assertEqual(key, trapezoid_area(values[0], values[1], values[2]))
 
         def test_regular_polygon_area(self):
-            # Make this test first...
+            for key, values in self.polygon.items():
+                self.assertEqual(key, regular_polygon_area(values[0], values[1]))
 
         def test_circumference_area(self):
-            # Make this test first...
+            for key, value in self.circumference.items():
+                self.assertEqual(key, circumference_area(value))
 
         def tearDown(self):
             # Delete the needed values for the tests
-            pass
+            del(self.square)
+            del(self.rectangle)
+            del(self.triangle)
+            del(self.rhombus)
+            del(self.trapezoid)
+            del(self.polygon)
+            del(self.circumference)
 
     unittest.main()