Changeset 2270 for trunk/modules/unit_test/libraries/Unit_Test.php

Timestamp:

03/10/2008 09:41:45 AM (9 months ago)

Author:

Geert

Message:

Made assert methods chainable. Thanks, allain.

Files:

• trunk/modules/unit_test/libraries/Unit_Test.php (modified) (24 diffs)

trunk/modules/unit_test/libraries/Unit_Test.php

@@ -145 +145 @@
                 if ($value != TRUE)
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_true', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -151 +153 @@
                 if ($value !== TRUE)
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_true_strict', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -157 +161 @@
                 if ($value != FALSE)
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_false', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -163 +169 @@
                 if ($value !== FALSE)
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_false_strict', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -169 +177 @@
                 if ($value1 != $value2)
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_equal', gettype($value1), var_export($value1, TRUE), gettype($value2), var_export($value2, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -175 +185 @@
                 if ($value1 == $value2)
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_equal', gettype($value1), var_export($value1, TRUE), gettype($value2), var_export($value2, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -181 +193 @@
                 if ($value1 !== $value2)
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_identical', gettype($value1), var_export($value1, TRUE), gettype($value2), var_export($value2, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -187 +201 @@
                 if ($value1 === $value2)
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_identical', gettype($value1), var_export($value1, TRUE), gettype($value2), var_export($value2, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -193 +209 @@
                 if ( ! is_bool($value))
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_boolean', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -199 +217 @@
                 if (is_bool($value))
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_boolean', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -205 +225 @@
                 if ( ! is_int($value))
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_integer', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -211 +233 @@
                 if (is_int($value))
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_integer', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -217 +241 @@
                 if ( ! is_float($value))
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_float', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -223 +249 @@
                 if (is_float($value))
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_float', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -229 +257 @@
                 if ( ! is_array($value))
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_array', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -235 +265 @@
                 if (is_array($value))
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_array', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -241 +273 @@
                 if ( ! is_object($value))
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_object', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -247 +281 @@
                 if (is_object($value))
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_object', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -253 +289 @@
                 if ($value !== NULL)
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_null', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -259 +297 @@
                 if ($value === NULL)
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_null', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -265 +305 @@
                 if ( ! empty($value))
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_empty', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -271 +313 @@
                 if (empty($value))
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_empty', gettype($value), var_export($value, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -277 +321 @@
                 if ( ! is_string($value) OR ! is_string($regex) OR ! preg_match($regex, $value))
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_pattern', var_export($value, TRUE), var_export($regex, TRUE)), $debug);
+
+                return $this;
         }
 
@@ -283 +329 @@
                 if ( ! is_string($value) OR ! is_string($regex) OR preg_match($regex, $value))
                         throw new Kohana_Unit_Test_Exception(Kohana::lang('unit_test.assert_not_pattern', var_export($value, TRUE), var_export($regex, TRUE)), $debug);
+
+                return $this;
         }