ex 38, 40

Author: kiddopro

exercises/38-sort-tuples-ascending/solution.hide.py

@@ -1,10 +1,5 @@
 from operator import itemgetter, attrgetter
-
-l = []
-while True:
-    s = input("")
-    if not s:
-        break
-    l.append(tuple(s.split(",")))
-
-print (sorted(l, key=itemgetter(0,1,2)))
+def sort_tuples_ascending(tuples):
+    l = []
+    l.append(tuple(tuples.split(",")))
+    return (sorted(l, key=itemgetter(0,1,2)))

exercises/38-sort-tuples-ascending/test.py

@@ -2,11 +2,16 @@
 
 path = os.path.dirname(os.path.abspath(__file__))+'/app.py'
 
-@pytest.mark.it('The solution should return the expected output')
-def test_convert_inputs(capsys, app):
-
-    fake_input = ["Tom,19,80 John,20,90 Jony,17,91 Jony,17,93 Json,21,85"] #fake input
-    with mock.patch('builtins.input', lambda x: fake_input.pop()):
-        app()
-        captured = capsys.readouterr()
-        assert captured.out == "[('John', '20', '90'), ('Jony', '17', '91'), ('Jony', '17', '93'), ('Json', '21', '85'), ('Tom', '19', '80')]\n"
+
+@pytest.mark.it('The function sort_tuples_ascending must exist')
+def test_function_existence(capsys, app):
+    assert app.sort_tuples_ascending
+
+
+@pytest.mark.it('The function should return the expected output')
+def etest_expected_output(capsys, app):
+    app.sort_tuples_ascending("Tom,19,80 John,20,90 Jony,17,91 Jony,17,93 Json,21,85") == [('John', '20', '90'), ('Jony', '17', '91'), ('Jony', '17', '93'), ('Json', '21', '85'), ('Tom', '19', '80')]
+
+@pytest.mark.it('The solution should work with other entries')
+def test_another_entry(capsys, app):
+    app.sort_tuples_ascending("Martin,23,30 Tomas,25,27") == [('Martin', '23', '30', 'Tomas', '25', '27')]

exercises/40-compute-robot-distance/app.py

@@ -1,21 +0,0 @@
-import math
-pos = [0,0]
-while True:
-    s = input("")
-    if not s:
-        break
-    movement = s.split(" ")
-    direction = movement[0]
-    steps = int(movement[1])
-    if direction=="UP":
-        pos[0]+=steps
-    elif direction=="DOWN":
-        pos[0]-=steps
-    elif direction=="LEFT":
-        pos[1]-=steps
-    elif direction=="RIGHT":
-        pos[1]+=steps
-    else:
-        pass
-
-print (int(round(math.sqrt(pos[1]**2+pos[0]**2))))

exercises/40-compute-robot-distance/solution.hide.py

@@ -1,21 +1,17 @@
 import math
-pos = [0,0]
-while True:
-    s = input("")
-    if not s:
-        break
-    movement = s.split(" ")
-    direction = movement[0]
-    steps = int(movement[1])
-    if direction=="UP":
-        pos[0]+=steps
-    elif direction=="DOWN":
-        pos[0]-=steps
-    elif direction=="LEFT":
-        pos[1]-=steps
-    elif direction=="RIGHT":
-        pos[1]+=steps
-    else:
-        pass
-
-print (int(round(math.sqrt(pos[1]**2+pos[0]**2))))
+def compute_robot_distance(props):
+    pos = [0,0]
+    new_prop = props.split(" ")
+    for x in range(len(new_prop)):
+        if new_prop[x].upper() == 'UP':
+            pos[0]+=int(new_prop[x+1])
+        elif new_prop[x].upper() == 'DOWN':
+            pos[0]-=int(new_prop[x+1])
+        elif new_prop[x].upper() == 'LEFT':
+            pos[1]-=int(new_prop[x+1])
+        elif new_prop[x].upper() == 'RIGHT':
+            pos[1]+=int(new_prop[x+1])
+        else:
+            None
+    return (int(round(math.sqrt(pos[1]**2+pos[0]**2))))
+   

exercises/40-compute-robot-distance/test.py

@@ -1,10 +1,19 @@
 import pytest, io, sys, json, mock, re, os
 
-@pytest.mark.it('Your solution should work as expected')
+
+@pytest.mark.it('The function compute_robot_distance must exist')
+def test_function_existence(capsys, app):
+    assert app.compute_robot_distance
+
+
+@pytest.mark.it('The function should return the expected output')
 def test_expected_output(capsys, app):
-    fake_input=['UP 5 DOWN 3 LEFT 3 RIGHT 2']
-    with mock.patch('builtins.input', lambda x: fake_input.pop()):
-        app()
-        captured = capsys.readouterr()
-        assert captured.out == "2\n"
+    assert app.compute_robot_distance("UP 5 DOWN 3 LEFT 3 RIGHT 2") ==  2
+
+@pytest.mark.it('The solution should work with other entries')
+def test_another_output(capsys, app):
+    assert app.compute_robot_distance("DOWN 20 UP 5 LEFT 5 RIGHT 2") ==  15
 
+@pytest.mark.it('The solution should work with other entries')
+def test_negative_inputs(capsys, app):
+    assert app.compute_robot_distance("DOWN -1 UP -5 LEFT 50 RIGHT 20") ==  30