Completed about_control_statements

dhiller · dhiller · commit 2ed738ffcfae · 2014-11-19T21:26:13.000+01:00
diff --git a/python2/koans/about_control_statements.py b/python2/koans/about_control_statements.py
@@ -11,13 +11,13 @@ def test_if_then_else_statements(self):
             result = 'true value'
         else:
             result = 'false value'
-        self.assertEqual(__, result)
+        self.assertEqual('true value', result)
 
     def test_if_then_statements(self):
         result = 'default value'
         if True:
             result = 'true value'
-        self.assertEqual(__, result)
+        self.assertEqual('true value', result)
         
     def test_if_then_elif_else_statements(self):
         if False:
@@ -26,15 +26,15 @@ def test_if_then_elif_else_statements(self):
             result = 'true value'
         else:
             result = 'default value'
-        self.assertEqual(__, result)
+        self.assertEqual('true value', result)
 
     def test_while_statement(self):
         i = 1
         result = 1
         while i <= 10:
             result = result * i
             i += 1
-        self.assertEqual(__, result)
+        self.assertEqual(3628800, result)
 
     def test_break_statement(self):
         i = 1
@@ -43,7 +43,7 @@ def test_break_statement(self):
             if i > 10: break
             result = result * i
             i += 1
-        self.assertEqual(__, result)
+        self.assertEqual(3628800, result)
 
     def test_continue_statement(self):
         i = 0
@@ -52,14 +52,14 @@ def test_continue_statement(self):
             i += 1
             if (i % 2) == 0: continue
             result.append(i)
-        self.assertEqual(__, result)
+        self.assertEqual([1, 3, 5, 7, 9], result)
 
     def test_for_statement(self):
         phrase = ["fish", "and", "chips"]
         result = []
         for item in phrase:
             result.append(item.upper())
-        self.assertEqual([__, __, __], result)
+        self.assertEqual(["FISH", "AND", "CHIPS"], result)
 
     def test_for_statement_with_tuples(self):
         round_table = [
@@ -73,7 +73,7 @@ def test_for_statement_with_tuples(self):
             result.append("Contestant: '" + knight + \
             "'   Answer: '" + answer + "'")
 
-        text = __
+        text = ".* 'Robin' .* 'Blue! I mean Green!'"
 
         self.assertMatch(text, result[2])
 
