Changeset 2273

Timestamp:

03/10/2008 11:03:30 AM (9 months ago)

Author:

Geert

Message:

Unit_Test library now throws nice Kohana_Exceptions in case of invalid test paths or other fatal conflicts.

Location:

trunk/modules/unit_test

Files:

• i18n/en_US/unit_test.php (modified) (1 diff)
• libraries/Unit_Test.php (modified) (3 diffs)

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

@@ -3 +3 @@
 $lang = array
 (
+        'invalid_test_path'    => 'Failed to open test path: %s.',
+        'duplicate_test_class' => 'Duplicate test class named %s found in %s.',
+        'test_class_not_found' => 'No test class by the name of %s found in %s.',
+        'test_class_extends'   => '%s must extend Unit_Test_Case.',
         'passed'               => 'Passed',
         'failed'               => 'Failed',

trunk/modules/unit_test/libraries/Unit_Test.php

@@ -23 +23 @@
         public function __construct()
         {
-                // Normalize all given test paths
+                // Loop over each given test path
                 foreach (func_get_args() as $path)
                 {
-                        $this->paths[] = str_replace('\\', '/', realpath($path));
-                }
-
-                // Recursively iterate over all test paths
-                foreach ($this->paths as $test_path)
-                {
+                        // Normalize all given test paths and store them
+                        $this->paths[] = $test_path = str_replace('\\', '/', realpath((string) $path));
+
+                        // Validate test path
+                        if ( ! is_dir($test_path))
+                                throw new Kohana_Exception('unit_test.invalid_test_path', $test_path);
+
+                        // Recursively iterate over each file in the test path
                         foreach
                         (
@@ -48 +50 @@
                                 $class = substr($path, strrpos($path, '/') + 1, -(strlen(EXT)));
 
+                                // Check for duplicate test class name
+                                if (class_exists($class, FALSE))
+                                        throw new Kohana_Exception('unit_test.duplicate_test_class', $class, $path);
+
                                 // Include the test class
                                 include_once $path;
 
-                                // Validate the class name
+                                // Check whether the test class has been found and loaded
                                 if ( ! class_exists($class, FALSE))
-                                        continue;
+                                        throw new Kohana_Exception('unit_test.test_class_not_found', $class, $path);
 
                                 // Reverse-engineer Test class
@@ -60 +66 @@
                                 // Test classes must extend Unit_Test_Case
                                 if ( ! $reflector->isSubclassOf(new ReflectionClass('Unit_Test_Case')))
-                                        break;
+                                        throw new Kohana_Exception('unit_test.test_class_extends', $class);
 
                                 // Loop through all the class methods