fixed some exercises

Author: alesanchezr

exercises/01-Console/test.py

@@ -11,8 +11,9 @@ def test_for_file_output(capsys):
     path = os.path.dirname(os.path.abspath(__file__))+'/app.py'
     with open(path, 'r') as content_file:
         content = content_file.read()
-        regex = r"print\("
-        assert re.match(regex, content) != None
+        pattern = r"print\("
+        regex = re.compile(pattern)
+        assert bool(regex.search(content)) == True
 
 @pytest.mark.it('Print Hello World! on the console')
 def test_for_console_log(capsys):

exercises/03-Print-Variables-In-The-Console/test.py

@@ -13,7 +13,7 @@ def test_declare_variable():
     path = os.path.dirname(os.path.abspath(__file__))+'/app.py'
     with open(path, 'r') as content_file:
         content = content_file.read()
-        regex = re.compile(r"color(\s*)=(\s*)\"red\"")
+        regex = re.compile(r"color(\s*)=(\s*)[\"']red[\"']")
         assert bool(regex.search(content)) == True
 
 @pytest.mark.it('Print on the console the value of the variable ')

exercises/05-User-Inputed-Values/test.py

@@ -1,11 +1,10 @@
 import pytest,os,re,io,sys, mock, json
 
-@pytest.mark.it("Print on the console the input value + 10")
+@pytest.mark.it("We tried with age 50 and it was supposed to return 60")
 def test_t(stdin):
-    _input = [40,30,20]
-    with mock.patch('builtins.input', lambda x: _input.pop()):
+    with mock.patch('builtins.input', lambda x: 50):
       # f = open(os.path.dirname(os.path.abspath(__file__))+'/app.py')
       sys.stdout = buffer = io.StringIO()
       import app
       captured = buffer.getvalue()
-      assert captured == "Your age is: 50\n"
+      assert captured == "Your age is: 60\n"

exercises/09-Creating-Your-First-Function/test.py

@@ -33,15 +33,12 @@ def test_call_sample2():
 
 @pytest.mark.it("Add the return statement inside the existing function")
 def test_use_my_var1():
-
-    f = open(os.path.dirname(os.path.abspath(__file__))+'/app.py')
-    content = f.readlines()
-    content = [x.strip() for x in content]
-    my_return = [s for s in content if "return" in s]
-    my_returnIndex = content.index(my_return[0])
-    # print(my_print_index)
-    regex = r"return\s+.+"
-    assert re.match(regex, content[my_returnIndex])
+    path = os.path.dirname(os.path.abspath(__file__))+'/app.py'
+    with open(path, 'r') as content_file:
+        content = content_file.read()
+        pattern = r"return\s+.+"
+        regex = re.compile(pattern)
+        assert bool(regex.search(content)) == True
 
 #     assert re.match(regex, content)
 @pytest.mark.it('Console should output 7')

exercises/13-Random-Numbers/test.py

@@ -9,11 +9,10 @@
 
 @pytest.mark.it("You should update only line 5 using randint()")
 def test_conditional():
-    f = open(os.path.dirname(os.path.abspath(__file__))+ '/app.py')
-    content = f.readlines()
-    content = [x.strip() for x in content]
-    my_print = [s for s in content if "random_number =" in s]
-    my_printVar = content.index(my_print[0])
-    regex = r"random_number(\s*)=(\s*)random\.rand\w+\(1,10\)"
-    assert re.match(regex, content[my_printVar])
+    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+\(1,10\)"
+        regex = re.compile(pattern)
+        assert bool(regex.search(content)) == True
 

exercises/14-Rand-From-One-to-Six/app.py

@@ -1,7 +1,7 @@
 import random
 
 def get_randomInt():
-	random_number = random.randint(1,10)
+	random_number = random.randrange(1,13)
 	return random_number
 
 

exercises/14-Rand-From-One-to-Six/test.py

@@ -10,10 +10,9 @@
 
 @pytest.mark.it("You should return a random number between 1 and 12 included")
 def test_conditional():
-    f = open(os.path.dirname(os.path.abspath(__file__))+ '/app.py')
-    content = f.readlines()
-    content = [x.strip() for x in content]
-    my_print = [s for s in content if "random_number =" in s]
-    my_printVar = content.index(my_print[0])
-    regex = r"random_number(\s*)=(\s*)random\.randrange+\(1,13\)"
-    assert re.match(regex, content[my_printVar])
+    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\.randrange+\(1,13\)"
+        regex = re.compile(pattern)
+        assert bool(regex.search(content)) == True

exercises/16-Create-A-For-Loop/app.py

@@ -1,6 +1,4 @@
 def standards_maker():
-    for x in range(300):
-        print("I will write questions if I am stuck")
-    pass
+    #your code here
 
-standards_maker()
+#remember to call the function outside (here)

exercises/16-Create-A-For-Loop/test.py

@@ -31,13 +31,9 @@ def test_for_print():
 
 @pytest.mark.it("You should call the function standards_maker ")
 def test_callTheFunction():
-    f = open(os.path.dirname(os.path.abspath(__file__))+ '/app.py')
-    content = f.readlines()
-    content = [x.strip() for x in content]
-    my_call = [s for s in content[2:] if "standards_maker()" in s]
-    my_callVar = content.index(my_call[0])
-    print("###",my_callVar)
-    regex_call = r"standards_maker\(\)"
-
-
-    assert re.match(regex_call, content[my_callVar])
+    path = os.path.dirname(os.path.abspath(__file__))+'/app.py'
+    with open(path, 'r') as content_file:
+        content = content_file.read()
+        pattern = r"standards_maker\(\)"
+        regex = re.compile(pattern)
+        assert bool(regex.search(content)) == True

exercises/18-Random-Colors-Loop/test.py

@@ -10,19 +10,9 @@
 
 @pytest.mark.it('Print the correct output on the console')
 def test_for_file_output(capsys):
-    captured = buffer.getvalue()
-    f = open(os.path.dirname(os.path.abspath(__file__))+'/app.py')
-    content = f.readlines()
-    content = [x.strip() for x in content]
-    regex = r"print\(get_allStudentColors\(\)\)"
-    assert re.match(regex, content[(len(content)-1)])
-
-# @pytest.mark.it('Your function needs to print "Hello Inside Function" on the console')
-# def test_for_function_output(capsys):
-#     my_function()
-#     captured = capsys.readouterr()
-#     assert captured.out == "Hello Inside Function\n"
-
-# @pytest.mark.it('Your function needs to return True')
-# def test_for_function_return(capsys):
-#     assert my_function() == True
+    path = os.path.dirname(os.path.abspath(__file__))+'/app.py'
+    with open(path, 'r') as content_file:
+        content = content_file.read()
+        pattern = r"print\(get_allStudentColors\(\)\)"
+        regex = re.compile(pattern)
+        assert bool(regex.search(content)) == True

exercises/19-Looping-With-FizzBuzz/test.py

@@ -22,6 +22,7 @@ def test_forExistingCode(capsys):
 
     assert re.match(regex, content[my_codeVar])
     assert re.match(regexCall, content[my_codeCallVar])
+    
 @pytest.mark.it('2. Your function needs to print the correct output')
 def test_for_function_output(capsys):
     fizz_buzz()