Changeset 2247

Timestamp:

03/09/2008 05:59:16 AM (7 months ago)

Author:

Geert

Message:

Unit_Test library update:

• User Test classes now must extend Unit_Test_Case instead of Unit_Test_Core. This way the Unit_Test_Core $paths and $results properties cannot be overwritten. Updated example test class: http://pastie.textmate.org/163587
  
• Moved test results html to separate view
  
• Added assert_empty() and assert_pattern()
  

Location:

trunk/system

Files:

• libraries/Unit_Test.php (modified) (8 diffs)
• libraries/View.php (modified) (1 diff)
• views/kohana_unit_test.php (added)

trunk/system/libraries/Unit_Test.php

@@ -21 +21 @@
          * @return  void
          */
-        public function __construct($paths = NULL)
-        {
-                // Use default test path: application/tests/
-                if ($paths === NULL)
+        public function __construct($paths)
+        {
+                // Normalize all given test paths
+                foreach ((array) $paths as $path)
                 {
-                        $this->paths = array(APPPATH.'tests/');
+                        $this->paths[] = str_replace('\\', '/', realpath($path)).'/';
                 }
 
-                // Normalize all given test paths
-                else
-                {
-                        foreach ((array) $paths as $path)
-                        {
-                                $this->paths[] = str_replace('\\', '/', realpath($path)).'/';
-                        }
-                }
-
                 Log::add('debug', 'Unit_Test Library initialized');
+
+                // Automatically run tests
+                $this->run();
         }
 
@@ -83 +77 @@
                                                 continue;
 
-                                        // Instantiate class
+                                        // Instantiate Test class
                                         $object = new $class;
+
+                                        // Test classes must extend Unit_Test_Case
+                                        if ( ! $object instanceof Unit_Test_Case)
+                                                break;
 
                                         // Run setup method
@@ -108 +106 @@
                                                 $object->teardown();
                                         }
+
+                                        // Cleanup
+                                        unset($object);
                                 }
                         }
                 }
 
+                // Return raw results array
                 return $this->results;
         }
@@ -118 +120 @@
          * Generates nice test results.
          *
-         * @param   boolean  set to TRUE to echo the output instead of returning it
-         * @return  string   if print is FALSE
-         * @return  void     if print is TRUE
-         */
-        public function results($print = FALSE)
-        {
-                foreach ($this->results as $class => $methods)
-                {
-                        echo '<p style="font-weight:bold">', html::specialchars($class), ':</p>';
-                        echo '<ul>';
-
-                        foreach ($methods as $method => $result)
-                        {
-                                echo '<li style="color:', ($result === TRUE) ? 'green' : 'red', '">';
-                                echo html::specialchars($method), ': ', ($result === TRUE) ? 'passed' : 'failed';
-                                echo '</li>';
-                        }
-
-                        echo '</ul>';
-                        echo '<hr />';
-                }
-        }
-
-
-        public function assert_true($value, $strict = TRUE)
+         * @param   boolean      set to TRUE to echo the output instead of returning it
+         * @return  string|void  rendered test results html
+         */
+        public function render($print = FALSE)
+        {
+                $view = new View('kohana_unit_test');
+                $view->results = $this->results;
+                return $view->render($print);
+        }
+
+        /**
+         * Magically convert this object to a string.
+         *
+         * @return  string
+         */
+        public function __toString()
+        {
+                return $this->render();
+        }
+
+} // End Unit_Test_Core
+
+
+class Unit_Test_Case {
+
+        public function assert_true($value, $strict = FALSE)
         {
                 if ($strict === TRUE AND $value !== TRUE)
@@ -151 +154 @@
         }
 
-        public function assert_false($value, $strict = TRUE)
+        public function assert_false($value, $strict = FALSE)
         {
                 if ($strict === TRUE AND $value !== FALSE)
@@ -160 +163 @@
         }
 
-        public function assert_equal($value1, $value2, $strict = TRUE)
+        public function assert_equal($value1, $value2, $strict = FALSE)
         {
                 if ($strict === TRUE AND $value1 !== $value2)
@@ -169 +172 @@
         }
 
-        public function assert_not_equal($value1, $value2, $strict = TRUE)
+        public function assert_not_equal($value1, $value2, $strict = FALSE)
         {
                 if ($strict === TRUE AND $value1 === $value2)
@@ -250 +253 @@
         }
 
-} // End Unit_Test
+        public function assert_empty($value)
+        {
+                if ( ! empty($value))
+                        throw new Exception;
+        }
+
+        public function assert_not_empty($value)
+        {
+                if (empty($value))
+                        throw new Exception;
+        }
+
+        public function assert_pattern($value, $regex)
+        {
+                if ( ! preg_match($regex, $value))
+                        throw new Exception;
+        }
+
+        public function assert_not_pattern($value, $regex)
+        {
+                if (preg_match($regex, $value))
+                        throw new Exception;
+        }
+
+} // End Unit_Test_Case

trunk/system/libraries/View.php

@@ -27 +27 @@
          * @param   array   pre-load data
          * @param   string  type of file: html, css, js, etc.
+         * @return  object
          */
         public static function factory($name, $data = NULL, $type = NULL)