Merge pull request #67 from UmiKami/01-Console---10-Calling-Your-First-Function

tommygonzaleza · web-flow · commit 0f796f4e9b7f · 2022-08-22T09:07:56.000-04:00
01 console   10 calling your first function
diff --git a/exercises/03-Print-Variables-In-The-Console/test.py b/exercises/03-Print-Variables-In-The-Console/test.py
@@ -18,7 +18,7 @@ def test_for_printing_variable():
    
     with open(path, 'r') as content_file:
         content = content_file.read()
-        regex = re.compile(r"print(\s*)\(\s*color\s*\)")
+        regex = re.compile(r"print\s*\(\s*color\s*\)")
         assert bool(regex.search(content)) == True
 
 @pytest.mark.it('The printed value on the console should be "red"')
diff --git a/exercises/04-Multiply-Two-Values/test.py b/exercises/04-Multiply-Two-Values/test.py
@@ -23,4 +23,12 @@ def test_use_variable_name():
 @pytest.mark.it('Print on the console the variables_are_cool value ')
 def test_for_file_output(capsys):
     captured = buffer.getvalue()
-    assert captured == '17172435\n'
+    assert captured == '17172435\n'
+
+@pytest.mark.it('Print on the console the variables_are_cool variable')
+def test_for_print():
+    with open(path, 'r') as content_file:
+        content = content_file.read()
+        # makes sure we are calling print function with a variable and not the hard coded value
+        regex = re.compile(r"print\s*\(\s*variables_are_cool\s*\)")
+        assert bool(regex.search(content)) == True
diff --git a/exercises/05-User-Inputed-Values/test.py b/exercises/05-User-Inputed-Values/test.py
@@ -9,7 +9,6 @@ def test_for_file_output(capsys):
         regex = re.compile(pattern)
         assert bool(regex.search(content)) == True
 
-
 @pytest.mark.it("We tried with age 50 and it was supposed to return 60")
 @mock.patch('builtins.input', lambda x: 50)
 def test_plus_ten(stdin):
diff --git a/exercises/06-String-Concatenation/test.py b/exercises/06-String-Concatenation/test.py
@@ -10,7 +10,6 @@ def test_my_var1_exists():
     except ImportError:
         raise ImportError("The variable 'my_var1' should exist on app.py")
 
-    
 @pytest.mark.it("Create a variable named my_var2")
 def test_my_var2_exists():
     try:
@@ -24,10 +23,18 @@ def test_my_var1_value():
     assert my_var1 == "Hello"
 
 @pytest.mark.it("Variable my_var2 value should be 'World'")
-def test_my_var1_value():
+def test_my_var2_value():
     from app import my_var2
     assert my_var2 == "World"
 
+@pytest.mark.it("Variable my_var2 value should be 'World'")
+def test_the_new_string_exists():
+    import app
+    try:
+        app.the_new_string
+    except AttributeError:
+        raise AttributeError('The variable "the_new_string" should exist on app.py')
+
 @pytest.mark.it('Print "Hello World" on the console')
 def test_for_file_output():
     captured = buffer.getvalue()
diff --git a/exercises/08.1-Your-First-If/README.es.md b/exercises/08.1-Your-First-If/README.es.md
@@ -1,4 +1,4 @@
-# `08` Your First If...
+# `08.1` Your First If...
 
 La aplicación actual está preguntando cuánto dinero tiene el usuario. Una vez el usuario ingresa la cantidad, debemos 'imprimir' usando **print** una de las siguientes respuestas:
 
diff --git a/exercises/08.1-Your-First-If/README.md b/exercises/08.1-Your-First-If/README.md
@@ -2,7 +2,7 @@
 tutorial: "https://www.youtube.com/watch?v=x9wqa5WQZiM"
 ---
 
-# `08` Your First if...
+# `08.1` Your First if...
 
 The current application is prompting asking how much money the user has. Once the user inputs the amount, we need to **print** one of the following answers:
 
diff --git a/exercises/08.1-Your-First-If/app.py b/exercises/08.1-Your-First-If/app.py
@@ -1,3 +1,3 @@
 total = int(input('How much money do you have in your pocket\n'))
 
-# YOUR CODE HERE
+# YOUR CODE HERE
diff --git a/exercises/08.1-Your-First-If/solution.hide.py b/exercises/08.1-Your-First-If/solution.hide.py
diff --git a/exercises/08.1-Your-First-If/test.py b/exercises/08.1-Your-First-If/test.py
@@ -15,13 +15,13 @@ def test_for_print(capsys):
         content = content_file.read()
         regex = re.compile(r"if\s*")
         regex2 = re.compile(r"elif\s*")
-        assert bool(regex.search(content)) == True or bool(regex.search(content))==False
+        assert ((bool(regex.search(content)) == True) and (bool(regex2.search(content))==True))
 
 @pytest.mark.it('Use the function print()')
 def test_for_print(capsys):
     with open(path, 'r') as content_file:
         content = content_file.read()
-        regex = re.compile(r"print\(.+\)")
+        regex = re.compile(r"print\s*\(")
         assert bool(regex.search(content)) == True
 
 @pytest.mark.it("When input for more than 100 it should print: Give me your money!")
@@ -64,8 +64,4 @@ def test_for_output_when_49(capsys, app):
     with mock.patch('builtins.input', lambda x: 49):
         app()
         captured = capsys.readouterr()
-        assert "You are a poor guy, go away!\n" == captured.out
-
-
-
-
+        assert "You are a poor guy, go away!\n" == captured.out
diff --git a/exercises/08.2-How-Much-The-Wedding-Costs/README.es.md b/exercises/08.2-How-Much-The-Wedding-Costs/README.es.md
@@ -1,4 +1,4 @@
-# `08.1` Cuánto costará la boda (if...else)
+# `08.2` Cuánto costará la boda (if...else)
 
 Aquí tenemos una tabla de precios de una compañía de catering de bodas:
 
diff --git a/exercises/08.2-How-Much-The-Wedding-Costs/README.md b/exercises/08.2-How-Much-The-Wedding-Costs/README.md
@@ -2,7 +2,7 @@
 tutorial: "https://www.youtube.com/watch?v=Wu7uK8BN4nI"
 ---
 
-# `08.1` How Much The Wedding Costs (if...else)
+# `08.2` How Much The Wedding Costs (if...else)
 
 Here is a table of prices for a wedding catering company:
 
diff --git a/exercises/08.2-How-Much-The-Wedding-Costs/app.py b/exercises/08.2-How-Much-The-Wedding-Costs/app.py
diff --git a/exercises/08.2-How-Much-The-Wedding-Costs/solution.hide.py b/exercises/08.2-How-Much-The-Wedding-Costs/solution.hide.py
diff --git a/exercises/08.2-How-Much-The-Wedding-Costs/test.py b/exercises/08.2-How-Much-The-Wedding-Costs/test.py
@@ -14,7 +14,7 @@ def test_for_print(capsys):
     with open(path, 'r') as content_file:
         content = content_file.read()
         regex2 = re.compile(r"elif\s*")
-        assert bool(regex2.search(content)) == True or bool(regex2.search(content)) == False
+        assert bool(regex2.search(content)) == True
 
 @pytest.mark.it("Between 101 and 199 guests sould be priced 15,000")
 def test__between_100_and_200(capsys, app):
diff --git a/exercises/09-Random-Numbers/app.py b/exercises/09-Random-Numbers/app.py
@@ -1,10 +1,8 @@
 import random
 
 def get_randomInt():
-  # CHANGE ONLY THIS LINE BELOW
+  	# CHANGE ONLY THIS LINE BELOW
 	random_number = random.random()
 	return random_number
 
-
-
 print(get_randomInt())
diff --git a/exercises/09-Random-Numbers/solution.hide.py b/exercises/09-Random-Numbers/solution.hide.py
@@ -0,0 +1,8 @@
+import random
+
+def get_randomInt():
+	# CHANGE ONLY THIS LINE BELOW
+	random_number = random.randint(1,10)
+	return random_number
+
+print(get_randomInt())
diff --git a/exercises/09-Random-Numbers/test.py b/exercises/09-Random-Numbers/test.py
@@ -6,32 +6,45 @@
 import pytest
 import os
 import re
+import app
 
-@pytest.mark.it("You should edit the function randint() to generate a random number between 1 and 10")
-def test_conditional():
-    path = os.path.dirname(os.path.abspath(__file__))+'/app.py'
-    with open(path, 'r') as content_file:
-        content = content_file.read()
-        pattern = r"random_number(\s*)=(\s*)random\.rand\w+(\s)*\((\s)*1(\s)*,(\s)*10(\s)*\)"
-        regex = re.compile(pattern)
-        assert bool(regex.search(content)) == True
 
-@pytest.mark.it("You should only change line 5")
+@pytest.mark.it("You should be printing the get_randomInt function")
 def test_only_change_line_5():
     path = os.path.dirname(os.path.abspath(__file__))+'/app.py'
     with open(path, 'r') as content_file:
         content = content_file.read()
-        line_1 = r"import(\s)random"
-        line_2 = r"def(\s)get_randomInt\((\s*)\)(\s*)\:"
-        line_3 = r"return(\s)random_number"
-        line_4 = r"print(\s*)\(get_randomInt(\s*)\((\s*)\)(\s*)\)"
+        line = r"print\s*\(\s*get_randomInt\s*\(\s*\)\s*\)"
+        regex = re.compile(line)
+        assert bool(regex.search(content)) == True
 
-        regex = re.compile(line_1)
-        regex = re.compile(line_2)
-        regex = re.compile(line_3)
-        regex = re.compile(line_4)
+@pytest.mark.it("get_randomInt function should exist")
+def test_function_exists():
+    try:
+        assert app.get_randomInt()
+    except AttributeError:
+        raise AttributeError('The function "get_randomInt" should exist')
 
-        assert bool(regex.search(content)) == True
-        assert bool(regex.search(content)) == True
-        assert bool(regex.search(content)) == True
-        assert bool(regex.search(content)) == True
+@pytest.mark.it("get_randomInt function should return a random integer between 1 and 10")
+def test_function_returns_random_integer():
+    try:
+        for i in range(10):
+            # only asserting if value is outside the range, else it will pass
+            result = app.get_randomInt()
+            assert result >= 1 and result <= 10
+    except AttributeError:
+        raise AttributeError('The function "get_randomInt" is returning values outside the specified range')
+
+@pytest.mark.it("get_randomInt function should NOT be returning a static integer value")
+# in case user returns single value between [1 and 10]
+def test_function_return_no_static():
+    try:
+        tries = 0
+        output = app.get_randomInt()
+        for i in range(10):
+            if output == app.get_randomInt():
+                tries+=1
+                # only asserting if value is outside the range, else it will pass
+        assert tries < 10
+    except AttributeError:
+        raise AttributeError('The function "get_randomInt" is returning a static value, not a random one')

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-# `08` Your First If...
	`1`	+# `08.1` Your First If...
`2`	`2`
`3`	`3`	`La aplicación actual está preguntando cuánto dinero tiene el usuario. Una vez el usuario ingresa la cantidad, debemos 'imprimir' usando print una de las siguientes respuestas:`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`total = int(input('How much money do you have in your pocket\n'))`
`2`	`2`
`3`		`-# YOUR CODE HERE`
	`3`	`+# YOUR CODE HERE`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-# `08.1` Cuánto costará la boda (if...else)
	`1`	+# `08.2` Cuánto costará la boda (if...else)
`2`	`2`
`3`	`3`	`Aquí tenemos una tabla de precios de una compañía de catering de bodas:`
`4`	`4`