cvs: pear(PHPUNIT_2_1) /PHPUnit2 package.xml /PHPUnit2/Framework Assert.php

sebastian Tue Oct 5 08:02:56 2004 EDT Modified files: (Branch: PHPUNIT_2_1) /pear/PHPUnit2 package.xml /pear/PHPUnit2/Framework Assert.php Log: MFH: Fix bug #2460. http://cvs.php.net/diff.php/pear/PHPUnit2/package.xml?r1=1.50.2.6&r2=1.50.2.7&ty=u Index: pear/PHPUnit2/package.xml diff -u pear/PHPUnit2/package.xml:1.50.2.6 pear/PHPUnit2/package.xml:1.50.2.7 --- pear/PHPUnit2/package.xml:1.50.2.6 Thu Sep 30 02:44:30 2004 +++ pear/PHPUnit2/package.xml Tue Oct 5 08:02:55 2004 @@ -13,20 +13,12 @@ </maintainers> <license>PHP License</license> <release> - <version>2.1.1</version> + <version>2.1.2</version> <state>stable</state> - <date>2004-09-30</date> + <date>2004-10-DD</date> <notes> <![CDATA[ -+ Added PHPUnit2_Extensions_CodeCoverage_Renderer::header() and PHPUnit2_Extensions_CodeCoverage_Renderer::footer() methods. - -* Improved the output of the Code Coverage HTML renderer. - -* Added missing files to PHPUnit2_Util_Filter::$filteredFiles and improved PHPUnit2_Util_Filter::getCanonicalFilename($filename) accordingly. - -* Changed visibility of PHPUnit2_Extensions_TestDox_ResultPrinter::startClass($name), PHPUnit2_Extensions_TestDox_ResultPrinter::onTest($name), PHPUnit2_Extensions_TestDox_ResultPrinter::endClass($name), PHPUnit2_Extensions_TestDox_ResultPrinter::startRun(), and PHPUnit2_Extensions_TestDox_ResultPrinter::endRun() from public to protected. - -* Fixed a bug that prevented PHPUnit2_Extensions_TestDox_ResultPrinter::endClass() from being called. +* Fixed bug #2460 (assertContains should return message on line 2). ]]> </notes> <filelist> @@ -176,6 +168,24 @@ </deps> </release> <changelog> + <release> + <version>2.1.1</version> + <state>stable</state> + <date>2004-09-30</date> + <notes> +<![CDATA[ ++ Added PHPUnit2_Extensions_CodeCoverage_Renderer::header() and PHPUnit2_Extensions_CodeCoverage_Renderer::footer() methods. + +* Improved the output of the Code Coverage HTML renderer. + +* Added missing files to PHPUnit2_Util_Filter::$filteredFiles and improved PHPUnit2_Util_Filter::getCanonicalFilename($filename) accordingly. + +* Changed visibility of PHPUnit2_Extensions_TestDox_ResultPrinter::startClass($name), PHPUnit2_Extensions_TestDox_ResultPrinter::onTest($name), PHPUnit2_Extensions_TestDox_ResultPrinter::endClass($name), PHPUnit2_Extensions_TestDox_ResultPrinter::startRun(), and PHPUnit2_Extensions_TestDox_ResultPrinter::endRun() from public to protected. + +* Fixed a bug that prevented PHPUnit2_Extensions_TestDox_ResultPrinter::endClass() from being called. +]]> + </notes> + </release> <release> <version>2.1.0</version> <state>stable</state> http://cvs.php.net/diff.php/pear/PHPUnit2/Framework/Assert.php?r1=1.14.2.1&r2=1.14.2.2&ty=u Index: pear/PHPUnit2/Framework/Assert.php diff -u pear/PHPUnit2/Framework/Assert.php:1.14.2.1 pear/PHPUnit2/Framework/Assert.php:1.14.2.2 --- pear/PHPUnit2/Framework/Assert.php:1.14.2.1 Fri Oct 1 02:11:53 2004 +++ pear/PHPUnit2/Framework/Assert.php Tue Oct 5 08:02:55 2004 @@ -12,7 +12,7 @@ // | license@php.net so we can mail you a copy immediately. | // +------------------------------------------------------------------------+ // -// $Id: Assert.php,v 1.14.2.1 2004/10/01 06:11:53 sebastian Exp $ +// $Id: Assert.php,v 1.14.2.2 2004/10/05 12:02:55 sebastian Exp $ // require_once 'PHPUnit2/Framework/AssertionFailedError.php'; @@ -64,7 +64,7 @@ */ public static function assertContains($needle, $haystack, $message = '') { if (is_string($needle) && is_string($haystack)) { - self::assertTrue(strpos($haystack, $needle) !== FALSE ? TRUE : FALSE); + self::assertTrue(strpos($haystack, $needle) !== FALSE ? TRUE : FALSE, $message); } else if (is_array($haystack)) {