pytest parking slots

espvtes · espvtes · commit c6865cac2273 · 2019-09-18T22:48:56.000Z
diff --git a/exercises/14.1-Parking_lot_check/README.md b/exercises/14.1-Parking_lot_check/README.md
@@ -14,7 +14,7 @@ parking_state = [
 ```
 
 # 📝Instructions
-1. Create a function getParkingLotState() that returns an object with totalSlots, availableSlots and occupiedSlots like the following:
+1. Create a function get_parking_lot_state() that returns an object with total_slots, available_slots and occupied_slots like the following:
 const state = {
      totalSlots: 12,
      availableSlots: 3,
diff --git a/exercises/14.1-Parking_lot_check/app.py b/exercises/14.1-Parking_lot_check/app.py
@@ -4,35 +4,21 @@
   [1,1,2]
 ]
 
-
-#Your code go here:
-
-total_slots = []
-available_slots = []
-occupied_slots = []
-not_parking_slots = []
-new_dict = {}
-
-
-for x in parking_state:
-    for j in x:
-        if j == 1:
-            occupied_slots.append(j)
-
-for numb in parking_state:
-    for n in numb:
-        if n ==2:
-            available_slots.append(n)
-
-for number in parking_state:
-    for o in number:
-        total_slots.append(o)
-
-for h in parking_state:
-    for k in h:
-        if k == 0:
-            not_parking_slots.append(k)
-
-new_dict.update({"total_slots" : len(total_slots), "occupied_slots":len(occupied_slots), "available_slots": len(available_slots), "not_parking_slots": len(not_parking_slots)})
-print(new_dict)
+total = []
+occupied = []
+available = []
+not_parking = []
+parking_slots = {}
+for numbs in parking_state:
+    for digit in numbs:
+        total.append(digit)
+        if digit ==1:
+            occupied.append(digit)
+        elif digit == 2:
+            available.append(digit)
+        elif digit == 0:
+            not_parking.append(digit)
+
+parking_slots.update({"total": len(total), "occupied": len(occupied), "available": len(available), "not_parking": len(not_parking)})
+print(parking_slots)
 
diff --git a/exercises/14.1-Parking_lot_check/test.py b/exercises/14.1-Parking_lot_check/test.py
@@ -0,0 +1,29 @@
+import io
+import os
+import sys
+sys.stdout = buffer = io.StringIO()
+
+import app
+import pytest
+
+@pytest.mark.it("Print the object")
+def test_output():
+    captured  = buffer.getvalue()
+    assert "\n" in captured
+
+@pytest.mark.it("Have make a for loop")
+def test_for():
+    f = open(os.path.dirname(os.path.abspath(__file__)) + '/app.py')
+    content = f.read()
+    assert content.find("for") > 0
+
+
+
+@pytest.mark.it("Using conditional statements")
+def test_conditional():
+    f = open(os.path.dirname(os.path.abspath(__file__))+'/app.py')
+    content = f.read()
+    assert content.find('if')>0
+    assert content.find('elif')
+
+
