Changeset 2288

Timestamp:

03/12/2008 10:16:18 AM (7 months ago)

Author:

Geert

Message:

Fix #477

Location:

trunk/modules/unit_test

Files:

• i18n/en_US/unit_test.php (modified) (1 diff)
• libraries/Unit_Test.php (modified) (2 diffs)
• tests/Example_Test.php (modified) (1 diff)
• views/kohana_unit_test.php (modified) (3 diffs)

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',
+        'error'                => 'Error',
+        'errors'               => 'Errors',
         'line'                 => 'line',
         'assert_true'          => 'Expected (boolean) TRUE, but was (%s) %s.',

trunk/modules/unit_test/libraries/Unit_Test.php

@@ -85 +85 @@
                                 // Initialize test class results and stats
                                 $this->results[$class] = array();
-                                $this->stats[$class] = array('passed' => 0, 'failed' => 0);
+                                $this->stats[$class] = array('passed' => 0, 'failed' => 0, 'errors' => 0);
 
                                 // Loop through all the class methods
@@ -122 +122 @@
                                                 $this->stats[$class]['failed']++;
                                         }
+                                        catch (Exception $e)
+                                        {
+                                                // Test error
+                                                $this->results[$class][$method_name] = $e;
+                                                $this->stats[$class]['errors']++;
+                                        }
 
                                         // Run teardown method

trunk/modules/unit_test/tests/Example_Test.php

@@ -69 +69 @@
         }
 
+        public function error_test()
+        {
+                throw new Exception;
+        }
+
 }

trunk/modules/unit_test/views/kohana_unit_test.php

@@ -80 +80 @@
         background-color: #FFD0D0;
 }
+#kohana-unit-test .k-error
+{
+        background-color: #FFFFE0;
+}
+#kohana-unit-test .k-altrow .k-error
+{
+        background-color: #FFFFD1;
+}
 </style>
 
@@ -95 +103 @@
                         <th><?php echo $class ?></th>
                         <th class="k-stats">
-                                <?php echo Kohana::lang('unit_test.stats', $stats[$class]['passed'], array_sum($stats[$class])) ?>
+                                <?php echo Kohana::lang('unit_test.passed'), ': ', $stats[$class]['passed'] ?>,
+                                <?php echo Kohana::lang('unit_test.failed'), ': ', $stats[$class]['failed'] ?>,
+                                <?php echo Kohana::lang('unit_test.errors'), ': ', $stats[$class]['errors'] ?>
                         </th>
                 </tr>
@@ -135 +145 @@
                                                 </td>
 
+                                        <?php elseif ($result instanceof Exception): ?>
+
+                                                <td class="k-error">
+                                                        <strong><?php echo Kohana::lang('unit_test.error') ?></strong>
+                                                        <pre><?php echo html::specialchars($result->getMessage()) ?></pre>
+                                                        <?php echo html::specialchars($result->getFile()) ?> (<?php echo Kohana::lang('unit_test.line') ?>&nbsp;<?php echo $result->getLine() ?>)
+                                                </td>
+
                                         <?php endif ?>