04-area_of_right_triangle

Author: kiddopro

exercises/04-area_of_right_triangle/app.py

@@ -4,7 +4,7 @@
 
 def area_of_triangle(arg1, arg2):
     #your code here, please remove the "None" 
-    return None
+    return int(arg1) * int(arg2) / 2
 
 # Testing your function
 print(area_of_triangle(b, h))

exercises/04-area_of_right_triangle/test.py

@@ -1,24 +1,22 @@
 import io, sys, os, pytest, json, mock
 path = os.path.dirname(os.path.abspath(__file__))+'/app.py'
+
+
 @pytest.mark.it('The function area_of_triangle should exist')
 def test_function_exists(capsys):
-  
   try:
     import app
     app.area_of_triangle
   except AttributeError:
       raise AttributeError("The function 'area_of_triangle' should exist on app.py")
 
-@pytest.mark.it('Calculate the area of the triangle.')
-def test_area_of_triangle(stdin):
-
-  _stdin = json.loads(stdin)
-  with mock.patch('builtins.input', lambda x: _stdin.pop(0)):
-
-    sys.stdout = buffer = io.StringIO()
-    import app
-    _stdin = json.loads(stdin)
-    result = int(_stdin[0]) * int(_stdin[1]) / 2
-    assert buffer.getvalue() == str(result) + "\n"
+@pytest.mark.it('The solution should return the expected output')
+def test_convert_inputs(capsys, app):
+  app.area_of_triangle(3,5)
+  captured = capsys.readouterr()
+  assert "7.5\n" == captured.out
+  # from app import area_of_triangle
+  # result = area_of_triangle(3,5)
+  # assert result == "7.5\n"
 
 

exercises/22-Integral/test.py

@@ -1,7 +1,7 @@
 import pytest,os,re,io,sys, mock, json
 
 
-@pytest.mark.it('Almost there! But you need to convert the incoming input from string to integer')
+@pytest.mark.it('The solution should return the expected output')
 def test_convert_inputs(capsys, app):
 
     fake_input = ["8"] #fake input
@@ -11,7 +11,7 @@ def test_convert_inputs(capsys, app):
         assert captured.out == "{1: 1, 2: 4, 3: 9, 4: 16, 5: 25, 6: 36, 7: 49, 8: 64}\n"
 
 
-@pytest.mark.it('Almost there! But you need to convert the incoming input from string to integer')
+@pytest.mark.it('The solution should work with other entries')
 def test_convert_inputs_2(capsys, app):
 
     fake_input = ["5"] #fake input