cvs: pear(ZEND_ENGINE_2) /PHPUnit/PHPUnit Assert.php

sebastian Wed Jan 15 12:00:05 2003 EDT Modified files: (Branch: ZEND_ENGINE_2) /pear/PHPUnit/PHPUnit Assert.php Log: Make assertion methods non-statically callable again. Index: pear/PHPUnit/PHPUnit/Assert.php diff -u pear/PHPUnit/PHPUnit/Assert.php:1.1.2.9 pear/PHPUnit/PHPUnit/Assert.php:1.1.2.10 --- pear/PHPUnit/PHPUnit/Assert.php:1.1.2.9 Mon Jan 13 04:36:59 2003 +++ pear/PHPUnit/PHPUnit/Assert.php Wed Jan 15 12:00:04 2003 @@ -12,7 +12,7 @@ // | license@php.net so we can mail you a copy immediately. | // +------------------------------------------------------------------------+ // -// $Id: Assert.php,v 1.1.2.9 2003/01/13 09:36:59 sebastian Exp $ +// $Id: Assert.php,v 1.1.2.10 2003/01/15 17:00:04 sebastian Exp $ // /** @@ -34,7 +34,7 @@ protected function __construct() {} // }}} - // {{{ public static function assertEquals($expected, $actual, $message = '', $delta = 0) + // {{{ public function assertEquals($expected, $actual, $message = '', $delta = 0) /** * Asserts that two variables are equal. @@ -44,9 +44,8 @@ * @param string * @param mixed * @access public - * @static */ - public static function assertEquals($expected, $actual, $message = '', $delta = 0) { + public function assertEquals($expected, $actual, $message = '', $delta = 0) { if ((is_array($actual) && is_array($expected)) || (is_object($actual) && is_object($expected))) { if (is_array($actual) && is_array($expected)) { @@ -67,7 +66,7 @@ } if (serialize($actual) != serialize($expected)) { - return self::fail($message); + return $this->fail($message); } } @@ -85,7 +84,7 @@ } if (!($actual >= ($expected - $delta) && $actual <= ($expected + $delta))) { - return self::fail($message); + return $this->fail($message); } } @@ -100,15 +99,15 @@ } if ($actual != $expected) { - return self::fail($message); + return $this->fail($message); } } - return self::pass(); + return $this->pass(); } // }}} - // {{{ public static function assertNotNull($object, $message = '') + // {{{ public function assertNotNull($object, $message = '') /** * Asserts that an object isn't null. @@ -116,22 +115,21 @@ * @param object * @param string * @access public - * @static */ - public static function assertNotNull($object, $message = '') { + public function assertNotNull($object, $message = '') { if (empty($message)) { $message = 'expected NOT NULL, actual NULL'; } if ($object === null) { - return self::fail($message); + return $this->fail($message); } - return self::pass(); + return $this->pass(); } // }}} - // {{{ public static function assertNull($object, $message = '') + // {{{ public function assertNull($object, $message = '') /** * Asserts that an object is null. @@ -139,22 +137,21 @@ * @param object * @param string * @access public - * @static */ - public static function assertNull($object, $message = '') { + public function assertNull($object, $message = '') { if (empty($message)) { $message = 'expected NULL, actual NOT NULL'; } if ($object !== null) { - return self::fail($message); + return $this->fail($message); } - return self::pass(); + return $this->pass(); } // }}} - // {{{ public static function assertSame($expected, $actual, $message = '') + // {{{ public function assertSame($expected, $actual, $message = '') /** * Asserts that two objects refer to the same object. @@ -163,22 +160,21 @@ * @param object * @param string * @access public - * @static */ - public static function assertSame($expected, $actual, $message = '') { + public function assertSame($expected, $actual, $message = '') { if (empty($message)) { $message = 'expected two variables to refer to the same object'; } if ($actual !== $expected) { - return self::fail($message); + return $this->fail($message); } - return self::pass(); + return $this->pass(); } // }}} - // {{{ public static function assertNotSame($expected, $actual, $message = '') + // {{{ public function assertNotSame($expected, $actual, $message = '') /** * Asserts that two objects refer not to the same object. @@ -187,22 +183,21 @@ * @param object * @param string * @access public - * @static */ - public static function assertNotSame($expected, $actual, $message = '') { + public function assertNotSame($expected, $actual, $message = '') { if (empty($message)) { $message = 'expected two variables to refer to different objects'; } if ($actual === $expected) { - return self::fail($message); + return $this->fail($message); } - return self::pass(); + return $this->pass(); } // }}} - // {{{ public static function assertTrue($condition, $message = '') + // {{{ public function assertTrue($condition, $message = '') /** * Asserts that a condition is true. @@ -210,22 +205,21 @@ * @param boolean * @param string * @access public - * @static */ - public static function assertTrue($condition, $message = '') { + public function assertTrue($condition, $message = '') { if (empty($message)) { $message = 'expected true, actual false'; } if (!$condition) { - return self::fail($message); + return $this->fail($message); } - return self::pass(); + return $this->pass(); } // }}} - // {{{ public static function assertFalse($condition, $message = '') + // {{{ public function assertFalse($condition, $message = '') /** * Asserts that a condition is false. @@ -233,22 +227,21 @@ * @param boolean * @param string * @access public - * @static */ - public static function assertFalse($condition, $message = '') { + public function assertFalse($condition, $message = '') { if (empty($message)) { $message = 'expected false, actual true'; } if ($condition) { - return self::fail($message); + return $this->fail($message); } - return self::pass(); + return $this->pass(); } // }}} - // {{{ public static function assertRegExp($expected, $actual, $message = '') + // {{{ public function assertRegExp($expected, $actual, $message = '') /** * Asserts that a string matches a given @@ -258,10 +251,9 @@ * @param string * @param string * @access public - * @static * @author Sébastien Hordeaux <marms@marms.com> */ - public static function assertRegExp($expected, $actual, $message = '') { + public function assertRegExp($expected, $actual, $message = '') { if (empty($message)) { $message = sprintf( '"%s" expected, actual "%s"', @@ -271,14 +263,14 @@ } if (!preg_match($expected, $actual)) { - return self::fail($message); + return $this->fail($message); } - return self::pass(); + return $this->pass(); } // }}} - // {{{ public static function fail($message = '') + // {{{ public function fail($message = '') /** * Fails a test with the given message. @@ -289,7 +281,7 @@ protected function fail($message = '') {} // }}} - // {{{ public static function pass() + // {{{ public function pass() /** * Passes a test.