From b1ea6ec28224f7e801b8d44482c535326e30e3b6 Mon Sep 17 00:00:00 2001
From: Jair Aguilar <apjair97@gmail.com>
Date: Thu, 9 Jul 2020 23:26:08 -0500
Subject: [PATCH 1/2] [UPDATE] added .vscode to gitignore file

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b6e4761..2ab793b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,3 +127,4 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+.vscode

From cd0dfb022b84d0e0ece6cd274f016f1aeacdd083 Mon Sep 17 00:00:00 2001
From: Jair Aguilar <apjair97@gmail.com>
Date: Fri, 10 Jul 2020 00:05:53 -0500
Subject: [PATCH 2/2] [SOLVED] Challenge Completed

---
 challenge.py | 93 ++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 76 insertions(+), 17 deletions(-)

diff --git a/challenge.py b/challenge.py
index ffdfcce..4f4ecc5 100644
--- a/challenge.py
+++ b/challenge.py
@@ -5,42 +5,42 @@ def square_area(side):
     """Returns the area of a square"""
     # You have to code here
     # REMEMBER: Tests first!!!
-    pass
+    return side**2
 
 
 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)/2)*height
 
 
 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):
@@ -48,7 +48,7 @@ def circumference_area(radius):
     # You have to code here
     # REMEMBER: Tests first!!!
     # Use math.pi for π value
-    pass
+    return round(math.pi * radius**2,2)
 
 
 if __name__ == '__main__':
@@ -58,31 +58,90 @@ class GeometrySuite(unittest.TestCase):
 
         def setUp(self):
             # Initialize the needed values for the tests
-            pass
+            self.square = {
+                4:2,
+                9:3,
+                16:4,
+                25:5,
+                36:6
+            }
+            self.rectangle = {
+                8:[2, 4],
+                16:[2, 8],
+                32:[8, 4],
+                72:[36, 2],
+                46:[23, 2],
+                102:[51, 2]
+
+           }
+            self.triangle = {
+                4:[2, 4],
+                18:[9, 4],
+                10.5:[3, 7],
+                24.5:[7, 7],
+                15:[5, 6]
+            }
+            self.rhombus = {
+                32 : [8,8],
+                36 : [12,6],
+                12 : [8,3]
+            }
+
+            self.trapezoid = {
+                12: [5,7,2],
+                40: [12,4,5],
+                102: [22,12,6]
+
+            }
+
+            self.polygon = {
+                15: [10,3],
+                48: [24,4],
+               168: [56,6] 
+            }
+
+            self.circumference = {
+                78.54: 5,
+               201.06: 8,
+                28.27: 3
+            }
+
 
         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, value in self.rectangle.items():
+                self.assertEqual(key,rectangle_area(value[0],value[1]))
 
         def test_triangle_area(self):
-            # Make this test first...
+            for key, value in self.triangle.items():
+                self.assertEqual(key,triangle_area(value[0],value[1]))
 
         def test_rhombus_area(self):
-            # Make this test first...
+            for key, value in self.rhombus.items():
+                self.assertEqual(key,rhombus_area(value[0],value[1]))
 
         def test_trapezoid_area(self):
-            # Make this test first...
+            for key, value in self.trapezoid.items():
+                self.assertEqual(key,trapezoid_area(value[0],value[1],value[2]))
 
         def test_regular_polygon_area(self):
-            # Make this test first...
+            for key, value in self.polygon.items():
+                self.assertEqual(key,regular_polygon_area(value[0],value[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()