Changeset 3131 for trunk/modules

Timestamp:

07/16/2008 08:39:52 PM (5 months ago)

Author:

msaraujo

Message:

add assert_in_array

Location:

trunk/modules/unit_test

Files:

• i18n/en_US/unit_test.php (modified) (1 diff)
• libraries/Unit_Test.php (modified) (4 diffs)
• tests/Example_Test.php (modified) (1 diff)

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

@@ -30 +30 @@
         'assert_not_float'     => 'assert_not_float: Expected not a float, but was given (%s) %s.',
         'assert_array'         => 'assert_array: Expected an array, but was given (%s) %s.',
-        'assert_array_key'     => 'assert_array_key: Expected a valid key, but was given (%s) %s.',     
+        'assert_array_key'     => 'assert_array_key: Expected a valid key, but was given (%s) %s.',
+        'assert_in_array'      => 'assert_in_array: Expected a valid value, but was given (%s) %s.',    
         'assert_not_array'     => 'assert_not_array: Expected not an array, but was given (%s) %s.',
         'assert_object'        => 'assert_object: Expected an object, but was given (%s) %s.',

trunk/modules/unit_test/libraries/Unit_Test.php

@@ -364 +364 @@
         }
 
-        public function assert_array_key($key, $array)
+        public function assert_array_key($key, $array, $debug = NULL)
         {
                 if ( ! array_key_exists($key, $array)) {
-                        throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_array_key', gettype($value), var_export($value, TRUE)), $debug);
+                        throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_array_key', gettype($key), var_export($key, TRUE)), $debug);
                 }
 
+                return $this;
+        }
+
+        public function assert_in_array($value, $array, $debug = NULL) 
+        {
+                if ( ! in_array($value, $array)) {
+                        throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_in_array', gettype($value), var_export($value, TRUE)), $debug);
+                }               
+                
                 return $this;
         }
@@ -445 +454 @@
         }
 
-        public function assert_class_attribute() 
+        public function assert_class_attribute($attribute, $class)
         {
                 
@@ -452 +461 @@
         }
 
-        public function assert_class_static_attribute() 
+        public function assert_class_static_attribute($attribute, $class) 
         {
                 
@@ -459 +468 @@
         }
         
+        public function assert_file_exists($file) 
+        {
+                
+
+
+        }
+
 } // End Unit_Test_Case
 

trunk/modules/unit_test/tests/Example_Test.php

@@ -78 +78 @@
                 $this->assert_array_key("a", $array);
         }
-
+        
+        public function in_array_test() 
+        {
+                $array = array("X", "Y", "Z");
+                $this->assert_in_array("X", $array);
+        }       
 
         public function debug_example_test()