Changeset 2278

Timestamp:

03/10/08 17:17:44 (6 months ago)

Author:

Geert

Message:

Added stats to test report (e.g. "Passed: 4 / 5").

Location:

trunk/modules/unit_test

Files:

• controllers/unit_test.php (modified) (1 diff)
• i18n/en_US/unit_test.php (modified) (1 diff)
• libraries/Unit_Test.php (modified) (5 diffs)
• views/kohana_unit_test.php (modified) (2 diffs)

trunk/modules/unit_test/controllers/unit_test.php

@@ -17 +17 @@
     {
         // Run tests and show results!
-        $test = new Unit_Test(MODPATH.'unit_test/tests/');
-        echo $test->report();
+        echo new Unit_Test(MODPATH.'unit_test/tests');
     }
 

trunk/modules/unit_test/i18n/en_US/unit_test.php

@@ -8 +8 @@
     'test_class_extends'   => '%s must extend Unit_Test_Case.',
     'no_tests_found'       => 'No tests found',
+    'stats'                => 'Passed: %s / %s',
     'passed'               => 'Passed',
     'failed'               => 'Failed',

trunk/modules/unit_test/libraries/Unit_Test.php

@@ -12 +12 @@
 class Unit_Test_Core {
 
+    // The path(s) to recursively scan for tests
     protected $paths = array();
+
+    // The results of all tests from every test class
     protected $results = array();
+
+    // Statistics for every test class
+    protected $stats = array();
 
     /**
@@ -61 +67 @@
                     throw new Kohana_Exception('unit_test.test_class_not_found', $class, $path);
 
-                // Instantiate test class results
-                $this->results[$class] = array();
-
                 // Reverse-engineer Test class
                 $reflector = new ReflectionClass($class);
@@ -70 +73 @@
                 if ( ! $reflector->isSubclassOf(new ReflectionClass('Unit_Test_Case')))
                     throw new Kohana_Exception('unit_test.test_class_extends', $class);
+
+                // Initialize test class results and stats
+                $this->results[$class] = array();
+                $this->stats[$class] = array('passed' => 0, 'failed' => 0);
 
                 // Loop through all the class methods
@@ -95 +102 @@
                     {
                         $object->$method_name();
+
+                        // Test passed
                         $this->results[$class][$method_name] = TRUE;
+                        $this->stats[$class]['passed']++;
                     }
                     catch (Kohana_Unit_Test_Exception $e)
                     {
+                        // Test failed
                         $this->results[$class][$method_name] = $e;
+                        $this->stats[$class]['failed']++;
                     }
 
@@ -122 +134 @@
     public function report()
     {
-        return empty($this->results) ? '' : View::factory('kohana_unit_test')->set('results', $this->results)->render();
+        if (empty($this->results))
+            return '';
+
+        return View::factory('kohana_unit_test')
+            ->set('results', $this->results)
+            ->set('stats', $this->stats)
+            ->render();
     }
 

trunk/modules/unit_test/views/kohana_unit_test.php

@@ -39 +39 @@
     border-bottom: 1px solid #E5EFF8;
     padding: 3px;
+}
+#kohana-unit-test .k-stats
+{
+    font-weight: normal;
+    color: #83919C;
+    text-align: right;
 }
 #kohana-unit-test .k-debug
@@ -87 +93 @@
     <table>
         <tr>
-            <th colspan="2"><?php echo $class ?></th>
+            <th><?php echo $class ?></th>
+            <th class="k-stats">
+                <?php echo Kohana::lang('unit_test.stats', $stats[$class]['passed'], array_sum($stats[$class])) ?>
+            </th>
         </tr>