Improved test update for Loops

Author: sofiiako

Loops/Break keyword/tests/test_task.py

@@ -14,7 +14,8 @@ def test_loop(self):
                             msg='Your loop should only print the last three animals in reverse order.')
 
         def test_list(self):
-            self.assertEqual(zoo, ['lion', 'tiger'], msg='The zoo list in the end should contain only lion and tiger.')
+            expected, actual = ['lion', 'tiger'], zoo
+            self.assertEqual(expected, actual, msg='The zoo list in the end should contain only lion and tiger.')
 
 except IndexError:
     class TestFailCase(unittest.TestCase):

Loops/Continue keyword/tests/test_task.py

@@ -11,8 +11,8 @@
 
 class TestCase(unittest.TestCase):
     def test_default(self):
-        correct = ['0', '1', '2', '4', '1', '3', '5', '7', '9', '']
-        self.assertEqual(correct, output, msg='Wrong output. Check your condition. Please do not change the '
+        expected = ['0', '1', '2', '4', '1', '3', '5', '7', '9', '']
+        self.assertEqual(expected, output, msg='Wrong output. Check your condition. Please do not change the '
                                               'starter code.')
 
     def test_condition(self):

Loops/Else with loops/tests/test_task.py

@@ -20,9 +20,9 @@ def test_default(self):
     def test_correct(self):
         if len(output) == 13:
             self.test_default()
-        correct = ["it's less than 5", "it's less than 5", "it's less than 5",
+        expected = ["it's less than 5", "it's less than 5", "it's less than 5",
                    "it's less than 5", "it's less than 5", "and now it's 5",
                    '1', '2', 'Outside the for loop', '']
-        self.assertEqual(correct, output, msg='Your code does not print what is expected. Check your condition. '
+        self.assertEqual(expected, output, msg='Your code does not print what is expected. Check your condition. '
                                               'Please do not change the starter code.')
 

Loops/For loop/tests/test_task.py

@@ -10,16 +10,16 @@
 
     class TestCase(unittest.TestCase):
         def test_loop(self):
-            self.assertEqual(output[0], '0', msg='Please do not change the starter code.')
-            self.assertEqual(output[1], '1', msg='Please do not change the starter code.')
-            self.assertEqual(output[2], '2', msg='Please do not change the starter code.')
-            self.assertEqual(output[3], '3', msg='Please do not change the starter code.')
-            self.assertEqual(output[4], '4', msg='Please do not change the starter code.')
-            self.assertEqual(output[5], '2', msg='Your code does not print the `primes`')
-            self.assertEqual(output[6], '3', msg='Your code does not print the `primes`')
-            self.assertEqual(output[7], '5', msg='Your code does not print the `primes`')
-            self.assertEqual(output[8], '7', msg='Your code does not print the `primes`')
-            self.assertEqual(output, ['0', '1', '2', '3', '4', '2', '3', '5', '7', ''], msg='Wrong output.')
+            self.assertEqual('0', output[0], msg='Please do not change the starter code.')
+            self.assertEqual('1', output[1], msg='Please do not change the starter code.')
+            self.assertEqual('2', output[2], msg='Please do not change the starter code.')
+            self.assertEqual('3', output[3], msg='Please do not change the starter code.')
+            self.assertEqual('4', output[4], msg='Please do not change the starter code.')
+            self.assertEqual('2', output[5], msg='Your code does not print the `primes`')
+            self.assertEqual('3', output[6], msg='Your code does not print the `primes`')
+            self.assertEqual('5', output[7], msg='Your code does not print the `primes`')
+            self.assertEqual('7', output[8], msg='Your code does not print the `primes`')
+            self.assertEqual(['0', '1', '2', '3', '4', '2', '3', '5', '7', ''], output, msg='Wrong output.')
 
 except IndentationError:
     class TestFailCase(unittest.TestCase):

Loops/Loop over a string/tests/test_task.py

@@ -9,10 +9,14 @@
     output = f.getvalue().split('\n')
 
     class TestCase(unittest.TestCase):
-        def test_loop(self):
-            self.assertEqual(len(output), 15, msg='Wrong output length. Please do not change anything '
+        def test_out_len(self):
+            expected, actual = 15, len(output)
+            self.assertEqual(expected, actual, msg='Wrong output length. Please do not change anything '
                                                   'in the starter code apart from the answer placeholder')
-            self.assertEqual(output[-2], 'True', msg='`length` should be equal to `len(hello_world)`.')
+
+        def test_word_len(self):
+            expected, actual = 'True', output[-2]
+            self.assertEqual(expected, actual, msg='`length` should be equal to `len(hello_world)`.')
 
 except IndentationError:
     class TestFailCase(unittest.TestCase):

Loops/While loop/tests/test_task.py

@@ -10,14 +10,17 @@
 
     class TestCase(unittest.TestCase):
         def test_finished(self):
-            self.assertEqual(output[10], 'Finished', msg='Please do not change the starter code.')
+            expected, actual = 'Finished', output[10]
+            self.assertEqual(expected, actual, msg='Please do not change the starter code.')
 
         def test_output(self):
-            self.assertEqual(output[11:20], ['1', '4', '9', '16', '25', '36', '49', '64', '81'],
+            expected, actual = ['1', '4', '9', '16', '25', '36', '49', '64', '81'], output[11:20]
+            self.assertEqual(expected, actual,
                              msg='Your while loop does not output all of the needed squares.')
 
         def test_last(self):
-            self.assertEqual(output[-2], '81', msg='The last square should be 81. Maybe check your while loop '
+            expected, actual = '81', output[-2]
+            self.assertEqual(expected, actual, msg='The last square should be 81. Maybe check your while loop '
                                                    'condition.')
 
 except IndentationError: