cvs: php-src /ext/standard/tests/assert assert02.phpt assert_basic.phpt assert_basic1.phpt assert_basic2.phpt assert_basic3.phpt assert_basic4.phpt
assert_basic5.phpt assert_error.phpt assert_error1.phpt assert_variation.phpt

sfox Mon May 26 23:42:10 2008 UTC Modified files: /php-src/ext/standard/tests/assert assert02.phpt assert_basic.phpt assert_basic1.phpt assert_basic2.phpt assert_basic3.phpt assert_basic4.phpt assert_basic5.phpt assert_error.phpt assert_error1.phpt assert_variation.phpt Log: - killed off UEXPECT - another of those parser differences in assert_02.phpt. Please check.

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert02.phpt?r1=1.5&r2=1.6&diff_format=u Index: php-src/ext/standard/tests/assert/assert02.phpt diff -u php-src/ext/standard/tests/assert/assert02.phpt:1.5 php-src/ext/standard/tests/assert/assert02.phpt:1.6 --- php-src/ext/standard/tests/assert/assert02.phpt:1.5 Wed May 2 07:27:52 2007 +++ php-src/ext/standard/tests/assert/assert02.phpt Mon May 26 23:42:10 2008 @@ -29,30 +29,14 @@ Warning: assert(): Assertion "$a" failed in %sassert02.php on line 12 -Parse error: %s error, unexpected '=' in %sassert02.php(14) : assert code on line 1 -in handler() -string(%d) "assert(): Failure evaluating code: -aa=sd+as+safsafasfasafsaf" - -Warning: assert(): Assertion "0" failed in %sassert02.php on line 16 - -Parse error: %s error, unexpected '=' in %sassert02.php(19) : assert code on line 1 -in handler() -string(%d) "assert(): Failure evaluating code: -aa=sd+as+safsafasfasafsaf" ---UEXPECTF-- -Notice: Undefined variable: a in %sassert02.php(12) : assert code on line 1 - -Warning: assert(): Assertion "$a" failed in %sassert02.php on line 12 - -Parse error: %s error, unexpected '=' in %sassert02.php(14) : assert code on line 1 +Parse error: %s error%sin %sassert02.php(14) : assert code on line 1 in handler() unicode(%d) "assert(): Failure evaluating code: aa=sd+as+safsafasfasafsaf" Warning: assert(): Assertion "0" failed in %sassert02.php on line 16 -Parse error: %s error, unexpected '=' in %sassert02.php(19) : assert code on line 1 +Parse error: %s error%sin %sassert02.php(19) : assert code on line 1 in handler() unicode(%d) "assert(): Failure evaluating code: aa=sd+as+safsafasfasafsaf" http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert_basic.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/assert/assert_basic.phpt diff -u php-src/ext/standard/tests/assert/assert_basic.phpt:1.1 php-src/ext/standard/tests/assert/assert_basic.phpt:1.2 --- php-src/ext/standard/tests/assert/assert_basic.phpt:1.1 Fri Jul 13 15:17:28 2007 +++ php-src/ext/standard/tests/assert/assert_basic.phpt Mon May 26 23:42:10 2008 @@ -21,14 +21,7 @@ //Non string assert var_dump($r2=assert(0)); var_dump($r2=assert(1)); ---EXPECTF-- -f1 called -NULL -bool(true) -f1 called -NULL -bool(true) ---UEXPECTF-- +--EXPECT-- f1 called NULL bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert_basic1.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/assert/assert_basic1.phpt diff -u php-src/ext/standard/tests/assert/assert_basic1.phpt:1.1 php-src/ext/standard/tests/assert/assert_basic1.phpt:1.2 --- php-src/ext/standard/tests/assert/assert_basic1.phpt:1.1 Fri Jul 13 15:17:28 2007 +++ php-src/ext/standard/tests/assert/assert_basic1.phpt Mon May 26 23:42:10 2008 @@ -22,12 +22,7 @@ //Non string assert var_dump($r2=assert(0)); var_dump($r2=assert(1)); ---EXPECTF-- -bool(true) -bool(true) -bool(true) -bool(true) ---UEXPECTF-- +--EXPECT-- bool(true) bool(true) bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert_basic2.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/assert/assert_basic2.phpt diff -u php-src/ext/standard/tests/assert/assert_basic2.phpt:1.3 php-src/ext/standard/tests/assert/assert_basic2.phpt:1.4 --- php-src/ext/standard/tests/assert/assert_basic2.phpt:1.3 Wed Mar 19 15:13:12 2008 +++ php-src/ext/standard/tests/assert/assert_basic2.phpt Mon May 26 23:42:10 2008 @@ -31,16 +31,6 @@ Warning: assert(): Assertion failed in %s on line 13 string(2) "f1" -string(2) "f2" -f2 called - -Warning: assert(): Assertion failed in %s on line 17 ---UEXPECTF-- -string(2) "f1" -f1 called - -Warning: assert(): Assertion failed in %s on line 13 -string(2) "f1" unicode(2) "f2" f2 called http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert_basic3.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/assert/assert_basic3.phpt diff -u php-src/ext/standard/tests/assert/assert_basic3.phpt:1.1 php-src/ext/standard/tests/assert/assert_basic3.phpt:1.2 --- php-src/ext/standard/tests/assert/assert_basic3.phpt:1.1 Fri Jul 13 15:17:28 2007 +++ php-src/ext/standard/tests/assert/assert_basic3.phpt Mon May 26 23:42:10 2008 @@ -23,8 +23,3 @@ f1 called Warning: assert(): Assertion "0 != 0" failed in %s on line 10 ---UEXPECTF-- -int(0) -f1 called - -Warning: assert(): Assertion "0 != 0" failed in %s on line 10 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert_basic4.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/assert/assert_basic4.phpt diff -u php-src/ext/standard/tests/assert/assert_basic4.phpt:1.1 php-src/ext/standard/tests/assert/assert_basic4.phpt:1.2 --- php-src/ext/standard/tests/assert/assert_basic4.phpt:1.1 Fri Jul 13 15:17:28 2007 +++ php-src/ext/standard/tests/assert/assert_basic4.phpt Mon May 26 23:42:10 2008 @@ -24,18 +24,7 @@ echo "Initial values: ini.get(\"assert.quiet_eval\") => [".ini_get("assert.quiet_eval")."]\n"; echo "Initial values: ini.get(\"assert.callback\") => [".ini_get("assert.callback")."]\n\n"; ---EXPECTF-- -Initial values: assert_options(ASSERT_ACTIVE) => [0] -Initial values: assert_options(ASSERT_WARNING) => [0] -Initial values: assert_options(ASSERT_BAIL) => [0] -Initial values: assert_options(ASSERT_QUIET_EVAL) => [0] -Initial values: assert_options(ASSERT_CALLBACK) => [f1] -Initial values: ini.get("assert.active") => [0] -Initial values: ini.get("assert.warning") => [0] -Initial values: ini.get("assert.bail") => [0] -Initial values: ini.get("assert.quiet_eval") => [0] -Initial values: ini.get("assert.callback") => [f1] ---UEXPECTF-- +--EXPECT-- Initial values: assert_options(ASSERT_ACTIVE) => [0] Initial values: assert_options(ASSERT_WARNING) => [0] Initial values: assert_options(ASSERT_BAIL) => [0] http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert_basic5.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/assert/assert_basic5.phpt diff -u php-src/ext/standard/tests/assert/assert_basic5.phpt:1.1 php-src/ext/standard/tests/assert/assert_basic5.phpt:1.2 --- php-src/ext/standard/tests/assert/assert_basic5.phpt:1.1 Fri Jul 13 15:17:28 2007 +++ php-src/ext/standard/tests/assert/assert_basic5.phpt Mon May 26 23:42:10 2008 @@ -30,11 +30,3 @@ NULL bool(true) int(1) ---UEXPECTF-- -int(0) -f1 called - -Warning: assert(): Assertion "0 != 0" failed in %s on line 10 -NULL -bool(true) -int(1) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert_error.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/assert/assert_error.phpt diff -u php-src/ext/standard/tests/assert/assert_error.phpt:1.1 php-src/ext/standard/tests/assert/assert_error.phpt:1.2 --- php-src/ext/standard/tests/assert/assert_error.phpt:1.1 Fri Jul 13 15:17:28 2007 +++ php-src/ext/standard/tests/assert/assert_error.phpt Mon May 26 23:42:10 2008 @@ -25,8 +25,3 @@ bool(true) int(0) bool(true) ---UEXPECTF-- -Notice: Use of undefined constant threemeninaboat - assumed 'threemeninaboat' in %s(9) : assert code on line 1 -bool(true) -int(0) -bool(true) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert_error1.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/standard/tests/assert/assert_error1.phpt diff -u php-src/ext/standard/tests/assert/assert_error1.phpt:1.1 php-src/ext/standard/tests/assert/assert_error1.phpt:1.2 --- php-src/ext/standard/tests/assert/assert_error1.phpt:1.1 Fri Jul 13 15:17:28 2007 +++ php-src/ext/standard/tests/assert/assert_error1.phpt Mon May 26 23:42:10 2008 @@ -42,12 +42,3 @@ Warning: Wrong parameter count for assert() in %s on line 22 NULL ---UEXPECTF-- -Warning: Wrong parameter count for assert_options() in %s on line 14 -NULL - -Warning: assert_options(): Unknown value 0 in %s on line 18 -bool(false) - -Warning: Wrong parameter count for assert() in %s on line 22 -NULL http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/assert/assert_variation.phpt?r1=1.3&r2=1.4&diff_format=u Index: php-src/ext/standard/tests/assert/assert_variation.phpt diff -u php-src/ext/standard/tests/assert/assert_variation.phpt:1.3 php-src/ext/standard/tests/assert/assert_variation.phpt:1.4 --- php-src/ext/standard/tests/assert/assert_variation.phpt:1.3 Wed Mar 19 15:13:12 2008 +++ php-src/ext/standard/tests/assert/assert_variation.phpt Mon May 26 23:42:10 2008 @@ -77,65 +77,6 @@ NULL Change callback function using ini.set and test return value -string(2) "f1" -assert_options(ASSERT_CALLBACK) => [f2] -ini.get("assert.callback") => [f2] -f2 called -NULL - -Change callback function using assert_options and test return value -string(2) "f2" -assert_options(ASSERT_CALLBACK) => [f3] -ini.get("assert.callback") => [f2] -f3 called -NULL - -Reset the name of the callback routine to a class method and check that it works -string(2) "f3" -assert_options(ASSERT_CALLBACK) => [c1] -ini.get("assert.callback") => [f2] -NULL - -Reset callback options to use a class method -string(2) "c1" -array(2) { - [0]=> - string(2) "c1" - [1]=> - string(6) "assert" -} -ini.get("assert.callback") => [f2] - - -Strict Standards: Non-static method c1::assert() should not be called statically in %s on line %d -Class assertion failed 53, "0 != 0" -NULL - -Reset callback options to use an object method -array(2) { - [0]=> - string(2) "c1" - [1]=> - string(6) "assert" -} -array(2) { - [0]=> - &object(c1)#1 (0) { - } - [1]=> - string(6) "assert" -} -ini.get("assert.callback") => [f2] - -Class assertion failed 61, "0 != 0" -NULL ---UEXPECTF-- -Initial values: assert_options(ASSERT_CALLBACK) => [f1] -Initial values: ini.get("assert.callback") => [f1] -f1 called -NULL - -Change callback function using ini.set and test return value unicode(2) "f1" assert_options(ASSERT_CALLBACK) => [f2] ini.get("assert.callback") => [f2]