Merge pull request #40 from kiddopro/01-10

01 10

Author: tommygonzaleza

exercises/001-hello_world/README.es.md

@@ -6,16 +6,16 @@ Cada idioma tiene funciones para integrarse con la consola, ya que al principio
 
 Hoy en día, la impresión en la consola se utiliza sobre todo como herramienta de monitoreo, ideal para dejar un rastro del contenido de las variables durante la ejecución del programa.
 
+## 📝 Instrucciones:
+
+1. Usa la función `print()` para escribir `"Hello World"` en la consola. Siéntete libre de intentar otras cosas también.
+
 ## Ejemplo:
 
 ```py
 print("How are you?")
 ```
 
-## 📝 Instrucciones:
-
-1. Usa la función `print()` para escribir `"Hello World"` en la consola. Siéntete libre de intentar otras cosas también.
-
 ## 💡 Pista:
 
 + Video de 5 minutos sobre [la consola](https://www.youtube.com/watch?v=vROGBvX_MHQ)

exercises/001-hello_world/README.md

@@ -6,16 +6,16 @@ Every language has a console, as it was the only way to interact with the users
 
 Today, printing in the console is used mostly as a monitoring tool, ideal to leave a trace of the content of variables during the program execution.
 
+## 📝 Instructions:
+
+1. Use the `print()` function to print `"Hello World"` on the console. Feel free to try other things as well.
+
 ## Example:
 
 ```py
 print("How are you?")
 ```
 
-## 📝 Instructions:
-
-1. Use the `print()` function to print `"Hello World"` on the console. Feel free to try other things as well.
-
 ## 💡 Hint:
 
 + 5 minutes video about [the console](https://www.youtube.com/watch?v=1RlkftxAo-M)

exercises/002-sum_of_three_numbers/README.es.md

@@ -6,11 +6,15 @@
 
 ## Ejemplo de entrada:
 
-+ 2
-+ 3
-+ 6
+```py
+2
+3
+6
+```
 
 ## Ejemplo de salida:
 
-+ 11
+```py
+11
+```
 

exercises/002-sum_of_three_numbers/README.md

@@ -6,11 +6,15 @@
 
 ## Example input:
 
-+ 2
-+ 3
-+ 6
+```py
+2
+3
+6
+```
 
 ## Example output:
 
-+ 11
+```py
+11
+```
 

exercises/003-area_of_right_triangle/solution.hide.py

@@ -0,0 +1,7 @@
+#Complete the function to return the area of the triangle.
+def area_of_triangle(arg1, arg2):
+    #your code here, please remove the "None" 
+    return arg1 * arg2 / 2
+
+# Testing your function
+print(area_of_triangle(3, 5))

exercises/003-area_of_right_triangle/test.py

@@ -1,21 +1,25 @@
 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):
+def test_function_exists(capsys, app):
   try:
-    import app
     app.area_of_triangle
   except AttributeError:
       raise AttributeError("The function 'area_of_triangle' should exist on app.py")
 
+@pytest.mark.it('The function must return something')
+def test_function_returns(capsys, app):
+  result = app.area_of_triangle(1, 2)
+  assert result != None
+  
+@pytest.mark.it('The function must return a number')
+def test_function_return_type(capsys, app):
+  result = app.area_of_triangle(1,2)
+  assert type(result) == type(1*2/2)
+  
 @pytest.mark.it('The solution should return the expected output. Testing with 3 and 5')
 def test_convert_inputs(capsys, app):
   result = app.area_of_triangle(3, 5)
   assert result == 7.5
 
-@pytest.mark.it('The solution should return the expected output. Testing with 4 and 6')
-def test_convert_inputs(capsys, app):
-  result = app.area_of_triangle(4, 6)
-  assert result == 12

exercises/004-hello_harry/solution.hide.py

@@ -0,0 +1,7 @@
+#Complete the function below to print the output per the example.
+def hello_name(name):
+
+    return "Hello, "+name+"!"
+
+#Invoke the function with your name as the function's argument. 
+print(hello_name("Bob"))

exercises/004-hello_harry/test.py

@@ -4,6 +4,16 @@
 def test_for_functon_existence(capsys, app):
     assert callable(app.hello_name)
 
+@pytest.mark.it('The function must return something')
+def test_function_return(capsys, app):
+    result = app.hello_name('test')
+    assert result != None
+  
+@pytest.mark.it('The function must return a string')
+def test_function_return_type(capsys, app):
+    result = app.hello_name('test')
+    assert type(result) == type('')
+
 @pytest.mark.it('The function hello_name must accept 1 parameter and return the correct output')
 def test_for_file_output(capsys, app):
     assert app.hello_name('a') == "Hello, a!"

exercises/005-previous_and_next/solution.hide.py

@@ -0,0 +1,7 @@
+#Complete the function to return the previous and next number of a given numner.".
+def previous_next(num):
+  return (num-1, num+1)
+
+
+#Invoke the function with any interger at its argument. 
+print(previous_next(179))

exercises/005-previous_and_next/test.py

@@ -4,6 +4,15 @@
 def test_for_functon_existence(capsys, app):
     assert callable(app.previous_next)
 
+@pytest.mark.it('The function must return something')
+def test_function_return(capsys, app):
+    assert app.previous_next(6) != None
+
+@pytest.mark.it('The function return a tuple')
+def test_function_return_type(capsys, app):
+    result = app.previous_next(6)
+    assert type(result) == type((1,2))
+
 @pytest.mark.it('The function previous_next must return the correct output')
 def test_for_file_output(capsys, app):
     assert app.previous_next(6) == (5, 7)