Feature 12: Fixed the unit tests, fixed a bug with the number of errors reported, refactored and added testes

gregmalcolm · gregmalcolm · commit e5df97f3348c · 2010-09-19T23:18:42.000-04:00
diff --git a/python 2/runner/runner_tests/test_mountain.py b/python 2/runner/runner_tests/test_mountain.py
@@ -14,12 +14,8 @@ def setUp(self):
         self.mountain = Mountain()
         self.mountain.stream.writeln = Mock()
         
-    def test_it_retrieves_some_koans_tests(self):
-        self.mountain.walk_the_path()
-        self.assertTrue(self.mountain.tests, "No test suite")
-        
     def test_it_gets_test_results(self):
         self.mountain.lesson.learn = Mock()
         self.mountain.walk_the_path()
         self.assertTrue(self.mountain.lesson.learn.called)
-        
+        
diff --git a/python 2/runner/runner_tests/test_sensei.py b/python 2/runner/runner_tests/test_sensei.py
@@ -10,6 +10,7 @@
 from runner.sensei import Sensei
 from runner.writeln_decorator import WritelnDecorator
 from runner.mockable_test_result import MockableTestResult
+from runner import path_to_enlightenment
 
 class AboutParrots:
     pass
@@ -85,6 +86,9 @@ class TestSensei(unittest.TestCase):
     def setUp(self):
         self.sensei = Sensei(WritelnDecorator(sys.stdout))
         self.sensei.stream.writeln = Mock()
+        path_to_enlightenment.koans = Mock()
+        self.tests = Mock()
+        self.tests.countTestCases = Mock()
         
     def test_that_it_delegates_testing_to_test_cases(self):
         MockableTestResult.startTest = Mock()
@@ -228,6 +232,15 @@ def test_that_end_report_displays_something(self):
         self.sensei.learn()
         self.assertTrue(self.sensei.stream.writeln.called)
 
+    def test_that_end_report_shows_student_progress(self):
+        self.sensei.errorReport = Mock()
+        self.sensei.total_lessons = Mock()
+        self.sensei.total_koans = Mock()
+
+        self.sensei.learn()
+        self.assertTrue(self.sensei.total_lessons.called)
+        self.assertTrue(self.sensei.total_koans.called)     
+
     def test_that_end_report_shows_the_failure_report(self):
         self.sensei.errorReport = Mock()
         self.sensei.learn()
@@ -370,3 +383,26 @@ def test_that_if_there_is_37_successes_it_will_say_the_first_zen_of_python_koans
         
         m = re.search("Beautiful is better than ugly", words)
         self.assertTrue(m and m.group(0))
+
+    def test_that_total_lessons_return_7_if_there_are_7_lessons(self):
+        self.sensei.filter_all_lessons = Mock()
+        self.sensei.filter_all_lessons.return_value = [1,2,3,4,5,6,7]
+
+        self.assertEqual(7, self.sensei.total_lessons())
+
+    def test_that_total_lessons_return_0_if_all_lessons_is_none(self):
+        self.sensei.filter_all_lessons = Mock()
+        self.sensei.filter_all_lessons.return_value = None
+
+        self.assertEqual(0, self.sensei.total_lessons())
+
+    def test_total_koans_return_43_if_there_are_43_test_cases(self):
+        self.sensei.tests.countTestCases = Mock()
+        self.sensei.tests.countTestCases.return_value = 43
+        
+        self.assertEqual(43, self.sensei.total_koans())
+
+    def test_filter_all_lessons_will_discover_test_classes_if_none_have_been_discovered_yet(self):
+        self.sensei.all_lessons = 0
+        self.assertTrue(self.sensei.filter_all_lessons() > 10)
+        self.assertTrue(self.sensei.all_lessons > 10)
diff --git a/python 2/runner/sensei.py b/python 2/runner/sensei.py
@@ -6,10 +6,10 @@
 
 import helper
 from mockable_test_result import MockableTestResult
+from runner import path_to_enlightenment
 
 from libs.colorama import init, Fore, Style
 import glob
-import path_to_enlightenment
 
 init()
 
@@ -19,13 +19,10 @@ def __init__(self, stream):
         unittest.TestResult.__init__(self)
         self.stream = stream
         self.prevTestClassName = None
+        self.tests = path_to_enlightenment.koans()        
         self.pass_count = 0
         self.lesson_pass_count  = 0
-        self.tests = path_to_enlightenment.koans()
-        self.all_lessons = glob.glob('koans/about*.py')
-        self.all_lessons.remove('koans/about_extra_credit.py')
-        self.total_lessons = len(self.all_lessons)
-        self.total_koans = self.tests.countTestCases()
+        self.all_lessons = None
 
     def startTest(self, test):
         MockableTestResult.startTest(self, test)
@@ -161,13 +158,11 @@ def scrapeInterestingStackDump(self, err):
         return scrape.replace(sep, '\n').strip('\n')
 
     def report_progress(self):
-        lesson_progress = self.total_lessons - self.lesson_pass_count
-        koans_progress = self.total_koans - self.pass_count
         return ("You are now {0}/{1} lessons and {2}/{3} koans away from " \
-                "reaching enlightenment".format(lesson_progress,
-                                                self.total_lessons,
-                                                koans_progress,
-                                                self.total_koans))
+                "reaching enlightenment".format(self.lesson_pass_count,
+                                                self.total_lessons(),
+                                                self.pass_count,
+                                                self.total_koans()))
 
     # Hat's tip to Tim Peters for the zen statements from The Zen
     # of Python (http://www.python.org/dev/peps/pep-0020/)
@@ -233,3 +228,20 @@ def say_something_zenlike(self):
         
         # Hopefully this will never ever happen!
         return "The temple in collapsing! Run!!!"
+
+    def total_lessons(self):
+        all_lessons = self.filter_all_lessons()
+        if all_lessons:
+          return len(all_lessons)
+        else:
+          return 0
+
+    def total_koans(self):
+        return self.tests.countTestCases()
+
+    def filter_all_lessons(self):
+        if not self.all_lessons:
+            self.all_lessons = glob.glob('koans/about*.py')
+            self.all_lessons.remove('koans/about_extra_credit.py')
+
+        return self.all_lessons
