ex 03, 04, 22, 25, 26, 27 changed

Author: kiddopro

exercises/03-sum_of_three_numbers/test.py

@@ -8,23 +8,32 @@ def test_use_print():
         regex = re.compile(r"print(\s)*\(")
         assert bool(regex.search(content)) == True
 
-@pytest.mark.it('Almost there! But you need to convert the incoming input from string to integer')
-def test_convert_inputs(capsys, app):
+@pytest.mark.it('The solution should return the expected output. Tested with 2, 3, 6')
+def test_sum_expected_inputs(capsys, app):
+
+    fake_input = ["2","3","6"] #fake input
+    with mock.patch('builtins.input', lambda x: fake_input.pop()):
+        app()
+        captured = capsys.readouterr()
+        assert captured.out == "11\n"
+
+@pytest.mark.it('The solution must sum all entries. Tested with 0, 3, 7')
+def test_sum_another_inputs(capsys, app):
 
     fake_input = ["0","3","7"] #fake input
     with mock.patch('builtins.input', lambda x: fake_input.pop()):
         app()
         captured = capsys.readouterr()
         assert captured.out == "10\n"
 
-@pytest.mark.it('Sum all three input numbers and print on the console the result')
-def test_add_variables(capsys, app):
+@pytest.mark.it('The solution must sum all entries. Tested with 0, 0, 0')
+def test_sum_with_zero(capsys, app):
 
-    fake_input = ["2","3","4"] #fake input
+    fake_input = ["0","0","0"] #fake input
     with mock.patch('builtins.input', lambda x: fake_input.pop()):
         app()
         captured = capsys.readouterr()
-        assert captured.out == "9\n"
+        assert captured.out == "0\n"
 
 
 

exercises/04-area_of_right_triangle/app.py

@@ -4,4 +4,4 @@ def area_of_triangle(arg1, arg2):
     return None
 
 # Testing your function
-print(area_of_triangle(4, 5))
+print(area_of_triangle(3, 5))

exercises/22-Integral/solution.hide.py

@@ -1,6 +1,7 @@
-n=int(input("Insert a number"))
-d=dict()
-for i in range(1,n+1):
-    d[i]=i*i
+def generate_dict(n):
+    d=dict()
+    for i in range(1,n+1):
+        d[i]=i*i
+    return d
 
-print (d)
+print(generate_dict(n))

exercises/22-Integral/test.py

@@ -1,23 +1,19 @@
 import pytest,os,re,io,sys, mock, json
 
+@pytest.mark.it('The function generate_dict should exist')
+def test_function_existence(capsys, app):
+    assert app.generate_dict
 
-@pytest.mark.it('The solution should return the expected output')
-def test_convert_inputs(capsys, app):
+@pytest.mark.it('The function should return a dictionary')
+def test_typeof_return(capsys, app):
+    assert type(app.generate_dict(7)) == type({})
 
-    fake_input = ["8"] #fake input
-    with mock.patch('builtins.input', lambda x: fake_input.pop()):
-        app()
-        captured = capsys.readouterr()
-        assert captured.out == "{1: 1, 2: 4, 3: 9, 4: 16, 5: 25, 6: 36, 7: 49, 8: 64}\n"
+@pytest.mark.it('The function should return the expected output')
+def test_expected_output(capsys, app):
+    assert app.generate_dict(8) == {1: 1, 2: 4, 3: 9, 4: 16, 5: 25, 6: 36, 7: 49, 8: 64}
 
-
-@pytest.mark.it('The solution should work with other entries')
-def test_convert_inputs_2(capsys, app):
-
-    fake_input = ["5"] #fake input
-    with mock.patch('builtins.input', lambda x: fake_input.pop()):
-        app()
-        captured = capsys.readouterr()
-        assert captured.out == "{1: 1, 2: 4, 3: 9, 4: 16, 5: 25}\n"
+@pytest.mark.it('The function should work with other entries')
+def test_another_entry_5(capsys, app):
+    assert app.generate_dict(5) == {1: 1, 2: 4, 3: 9, 4: 16, 5: 25}
 
 

exercises/25-print-formula/solution.hide.py

@@ -1,10 +1,9 @@
 #!/usr/bin/env python
 import math
-c=50
-h=30
-value = []
-items=[x for x in input("").split(',')]
-for d in items:
-    value.append(str(int(round(math.sqrt(2*c*float(d)/h)))))
+def print_formula(n1,n2,n3):
+    value = []
+    items=[x for x in "{},{},{}".format(n1,n2,n3).split(',')]
+    for d in items:
+        value.append(str(int(round(math.sqrt(2*50*float(d)/30)))))
 
-print (','.join(value))
+    return (','.join(value))

exercises/25-print-formula/test.py

@@ -1,20 +1,15 @@
 import pytest, io, sys, json, mock, re, os
 path = os.path.dirname(os.path.abspath(__file__))+'/app.py'
 
-@pytest.mark.it('The solution should work as expected')
-def test_convert_inputs(capsys, app):
+@pytest.mark.it('The function print_formula must exist')
+def test_function_existence(capsys, app):
+    assert app.print_formula
 
-    fake_input = ["100,150,180"] #fake input
-    with mock.patch('builtins.input', lambda x: fake_input.pop()):
-        app()
-        captured = capsys.readouterr()
-        assert captured.out == "18,22,24\n"
+@pytest.mark.it('The solution should work as expected')
+def test_expected_output(capsys, app):
+    assert app.print_formula(100,150,180) == "18,22,24"
 
-@pytest.mark.it('The solution should work with other parameters')
-def test_convert_inputs_2(capsys, app):
+@pytest.mark.it('The solution should work as expected')
+def test_another_output(capsys, app):
+    assert app.print_formula(200,90,300) == "26,17,32"
 
-    fake_input = ["200,90,300"] #fake input
-    with mock.patch('builtins.input', lambda x: fake_input.pop()):
-        app()
-        captured = capsys.readouterr()
-        assert captured.out == "26,17,32\n"

exercises/26-two-dimensional-array/solution.hide.py

@@ -1,11 +1,11 @@
-input_str = input("")
-dimensions=[int(x) for x in input_str.split(',')]
-rowNum=dimensions[0]
-colNum=dimensions[1]
-multilist = [[0 for col in range(colNum)] for row in range(rowNum)]
+def two_dimensional_array(nList, nElements):
+    dimensions=[int(x) for x in "{},{}".format(nList,nElements).split(',')]
+    rowNum=dimensions[0]
+    colNum=dimensions[1]
+    multilist = [[0 for col in range(colNum)] for row in range(rowNum)]
 
-for row in range(rowNum):
-    for col in range(colNum):
-        multilist[row][col]= row*col
+    for row in range(rowNum):
+        for col in range(colNum):
+            multilist[row][col]= row*col
 
-print (multilist)
+    return (multilist)

exercises/26-two-dimensional-array/test.py

@@ -1,28 +1,18 @@
 
 import pytest,os,re,io,sys, mock, json
 
-@pytest.mark.it('The solution must return the expected value for an input like "3,5"')
-def test_for_output_3_5(capsys, app):
-    fake_input = ["3,5"]
-    with mock.patch('builtins.input', lambda x: fake_input.pop()):
-        app()
-        captured = capsys.readouterr()
-        assert captured.out == "[[0, 0, 0, 0, 0], [0, 1, 2, 3, 4], [0, 2, 4, 6, 8]]\n"
+@pytest.mark.it('The function two_dimensional_array must exist')
+def test_function_existence(capsys, app):
+    assert app.two_dimensional_array
 
-        
-
-@pytest.mark.it('Your solution should work with others input values, testing with: 2,7')
-def test_for_output_2_7(capsys, app):
-    fake_input = ["2,7"]
-    with mock.patch('builtins.input', lambda x: fake_input.pop()):
-        app()
-        captured = capsys.readouterr()
-        assert captured.out == "[[0, 0, 0, 0, 0, 0, 0], [0, 1, 2, 3, 4, 5, 6]]\n"
+@pytest.mark.it('The function should return the expected output.')
+def test_expected_output(capsys, app):
+    assert app.two_dimensional_array(3,5) == [[0, 0, 0, 0, 0], [0, 1, 2, 3, 4], [0, 2, 4, 6, 8]]
 
-@pytest.mark.it('The input must be two numbers separate by comma, like this: 7,8')
-def test_input(capsys, app):
-    fake_input = ["2,7"]
-    with mock.patch('builtins.input', lambda x: fake_input.pop()):
-        app()
-        captured = capsys.readouterr()
-        assert captured.out == "[[0, 0, 0, 0, 0, 0, 0], [0, 1, 2, 3, 4, 5, 6]]\n"
+@pytest.mark.it('The function should work with other entries. Testing with 2,7')
+def test_expected_output(capsys, app):
+    assert app.two_dimensional_array(2,7) == [[0, 0, 0, 0, 0, 0, 0], [0, 1, 2, 3, 4, 5, 6]]
+        
+@pytest.mark.it('The function should work with other entries. Testing with 2,7')
+def test_expected_output(capsys, app):
+    assert app.two_dimensional_array(1,10) == [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]

exercises/27-sequence-of-words/solution.hide.py

@@ -1,3 +1,4 @@
-items=[x for x in input("").split(',')]
-items.sort()
-print (','.join(items))
+def sequence_of_words(words):
+    items=[x for x in "{}".format(words).split(',')]
+    items.sort()
+    return (','.join(items))

exercises/27-sequence-of-words/test.py

@@ -1,18 +1,14 @@
 import pytest, io, sys, json, mock, re, os
 path = os.path.dirname(os.path.abspath(__file__))+'/app.py'
 
-@pytest.mark.it('The output should be the expected')
-def test_output(capsys, app):
-    fake_input = ["without,hello,bag,world"] #fake input
-    with mock.patch('builtins.input', lambda x: fake_input.pop()):
-        app()
-        captured = capsys.readouterr()
-        assert captured.out == "bag,hello,without,world\n"
+@pytest.mark.it('The function sequence_of_words must exist')
+def test_function_existence(capsys, app):
+    assert app.sequence_of_words
 
-@pytest.mark.it('Your solution should work with other entries')
-def test_other_inputs(capsys, app):
-    fake_input = ["hola,como,estas"] #fake input
-    with mock.patch('builtins.input', lambda x: fake_input.pop()):
-        app()
-        captured = capsys.readouterr()
-        assert captured.out == "como,estas,hola\n"
+@pytest.mark.it('The function should return the expected output')
+def test_function_existence(capsys, app):
+    assert app.sequence_of_words("bag,hello,without,world") == "bag,hello,without,world"
+
+@pytest.mark.it('The function should return the expected output')
+def test_function_existence(capsys, app):
+    assert app.sequence_of_words("No,pain,gain") == "No,gain,pain"