cvs: pear /PHPUnit2/Framework ComparisonFailure.php /PHPUnit2/Tests/Framework ComparisonFailureTest.php

sebastian Sat Jul 10 04:03:41 2004 EDT Modified files: /pear/PHPUnit2/Framework ComparisonFailure.php /pear/PHPUnit2/Tests/Framework ComparisonFailureTest.php Log: Move return statement to correct scope. http://cvs.php.net/diff.php/pear/PHPUnit2/Framework/ComparisonFailure.php?r1=1.4&r2=1.5&ty=u Index: pear/PHPUnit2/Framework/ComparisonFailure.php diff -u pear/PHPUnit2/Framework/ComparisonFailure.php:1.4 pear/PHPUnit2/Framework/ComparisonFailure.php:1.5 --- pear/PHPUnit2/Framework/ComparisonFailure.php:1.4 Sat Apr 17 16:14:11 2004 +++ pear/PHPUnit2/Framework/ComparisonFailure.php Sat Jul 10 04:03:41 2004 @@ -12,7 +12,7 @@ // | license@php.net so we can mail you a copy immediately. | // +------------------------------------------------------------------------+ // -// $Id: ComparisonFailure.php,v 1.4 2004/04/17 20:14:11 sebastian Exp $ +// $Id: ComparisonFailure.php,v 1.5 2004/07/10 08:03:41 sebastian Exp $ // require_once 'PHPUnit2/Framework/AssertionFailedError.php'; @@ -107,13 +107,13 @@ if ($k < strlen($this->actual) - 1) { $actual .= '...'; } - - return PHPUnit2_Framework_Assert::format( - $expected, - $actual, - parent::getMessage() - ); } + + return PHPUnit2_Framework_Assert::format( + $expected, + $actual, + parent::getMessage() + ); } // }}} http://cvs.php.net/diff.php/pear/PHPUnit2/Tests/Framework/ComparisonFailureTest.php?r1=1.6&r2=1.7&ty=u Index: pear/PHPUnit2/Tests/Framework/ComparisonFailureTest.php diff -u pear/PHPUnit2/Tests/Framework/ComparisonFailureTest.php:1.6 pear/PHPUnit2/Tests/Framework/ComparisonFailureTest.php:1.7 --- pear/PHPUnit2/Tests/Framework/ComparisonFailureTest.php:1.6 Sat Apr 24 02:29:11 2004 +++ pear/PHPUnit2/Tests/Framework/ComparisonFailureTest.php Sat Jul 10 04:03:41 2004 @@ -12,7 +12,7 @@ // | license@php.net so we can mail you a copy immediately. | // +------------------------------------------------------------------------+ // -// $Id: ComparisonFailureTest.php,v 1.6 2004/04/24 06:29:11 sebastian Exp $ +// $Id: ComparisonFailureTest.php,v 1.7 2004/07/10 08:03:41 sebastian Exp $ // require_once 'PHPUnit2/Framework/TestCase.php'; @@ -57,9 +57,6 @@ ); } - /** - * @todo Investigate why testComparisonErrorSame() fails. - */ public function testComparisonErrorSame() { $failure = new PHPUnit2_Framework_ComparisonFailure('ab', 'ab');