From 1cb70365152dc6cdf97333b4d6c033fdf82c6c40 Mon Sep 17 00:00:00 2001 From: SVN Migration Date: Mon, 29 Jun 2009 13:04:30 +0000 Subject: This commit was manufactured by cvs2svn to create tag 'php_5_3_0'. --- ext/reflection/tests/bug46064.phpt | 13 +++++-- ext/reflection/tests/bug46064_2.phpt | 12 +++--- ext/standard/tests/array/max_basiclong_64bit.phpt | 35 ----------------- ext/standard/tests/array/min_basiclong_64bit.phpt | 35 ----------------- .../tests/general_functions/sleep_basic.phpt | 40 ------------------- .../tests/general_functions/sleep_error.phpt | 44 --------------------- .../tests/general_functions/usleep_basic.phpt | 39 ------------------- .../tests/general_functions/usleep_error.phpt | 45 ---------------------- 8 files changed, 14 insertions(+), 249 deletions(-) delete mode 100644 ext/standard/tests/array/max_basiclong_64bit.phpt delete mode 100644 ext/standard/tests/array/min_basiclong_64bit.phpt delete mode 100644 ext/standard/tests/general_functions/sleep_basic.phpt delete mode 100644 ext/standard/tests/general_functions/sleep_error.phpt delete mode 100644 ext/standard/tests/general_functions/usleep_basic.phpt delete mode 100644 ext/standard/tests/general_functions/usleep_error.phpt diff --git a/ext/reflection/tests/bug46064.phpt b/ext/reflection/tests/bug46064.phpt index 510e71b00a..89c5af37d5 100644 --- a/ext/reflection/tests/bug46064.phpt +++ b/ext/reflection/tests/bug46064.phpt @@ -37,6 +37,10 @@ class bar extends test { $this->foobar = 2; $this->a = 200; + $p = new reflectionproperty($this, 'a'); + $p->setAccessible(true); + var_dump($p->getValue($this), $p->isDefault(), $p->isPublic()); + $p = new reflectionproperty($this, 'foobar'); var_dump($p->getValue($this), $p->isDefault(), $p->isPublic()); } @@ -45,9 +49,8 @@ class bar extends test { new bar; ?> -===DONE=== --EXPECTF-- -object(ReflectionProperty)#%d (2) { +object(ReflectionProperty)#2 (2) { ["name"]=> string(1) "z" ["class"]=> @@ -64,13 +67,15 @@ array(1) { int(1000) --------------------------- string(30) "Property x::$zz does not exist" -object(ReflectionProperty)#%d (2) { +object(ReflectionProperty)#3 (2) { ["name"]=> string(3) "zzz" ["class"]=> string(1) "x" } +int(200) +bool(true) +bool(false) int(2) bool(false) bool(true) -===DONE=== diff --git a/ext/reflection/tests/bug46064_2.phpt b/ext/reflection/tests/bug46064_2.phpt index da14148a7a..832d13c414 100644 --- a/ext/reflection/tests/bug46064_2.phpt +++ b/ext/reflection/tests/bug46064_2.phpt @@ -36,15 +36,14 @@ class test extends bar { new test; ?> -===DONE=== ---EXPECTF-- -object(ReflectionProperty)#%d (2) { +--EXPECT-- +object(ReflectionProperty)#3 (2) { ["name"]=> string(4) "test" ["class"]=> string(3) "foo" } -object(ReflectionProperty)#%d (2) { +object(ReflectionProperty)#5 (2) { ["name"]=> string(1) "a" ["class"]=> @@ -57,18 +56,17 @@ bool(true) bool(false) array(2) { [0]=> - &object(ReflectionProperty)#%d (2) { + &object(ReflectionProperty)#6 (2) { ["name"]=> string(1) "b" ["class"]=> string(4) "test" } [1]=> - &object(ReflectionProperty)#%d (2) { + &object(ReflectionProperty)#7 (2) { ["name"]=> string(1) "a" ["class"]=> string(4) "test" } } -===DONE=== \ No newline at end of file diff --git a/ext/standard/tests/array/max_basiclong_64bit.phpt b/ext/standard/tests/array/max_basiclong_64bit.phpt deleted file mode 100644 index 1eb7e31cdc..0000000000 --- a/ext/standard/tests/array/max_basiclong_64bit.phpt +++ /dev/null @@ -1,35 +0,0 @@ ---TEST-- -Test max function : 64bit long tests ---SKIPIF-- - ---FILE-- - -===DONE=== ---EXPECT-- -int(9223372036854775807) -int(9223372036854775807) -===DONE=== diff --git a/ext/standard/tests/array/min_basiclong_64bit.phpt b/ext/standard/tests/array/min_basiclong_64bit.phpt deleted file mode 100644 index 52f63f3916..0000000000 --- a/ext/standard/tests/array/min_basiclong_64bit.phpt +++ /dev/null @@ -1,35 +0,0 @@ ---TEST-- -Test min function : 64bit long tests ---SKIPIF-- - ---FILE-- - -===DONE=== ---EXPECT-- -int(-9223372036854775808) -int(-9223372036854775808) -===DONE=== diff --git a/ext/standard/tests/general_functions/sleep_basic.phpt b/ext/standard/tests/general_functions/sleep_basic.phpt deleted file mode 100644 index cfc00c6eab..0000000000 --- a/ext/standard/tests/general_functions/sleep_basic.phpt +++ /dev/null @@ -1,40 +0,0 @@ ---TEST-- -Test sleep() function : basic functionality ---FILE-- -= $sleeplow) { - echo "TEST PASSED\n"; -} else { - echo "TEST FAILED - time is ${time} secs and sleep was ${sleeptime} secs\n"; -} -?> -===DONE=== ---EXPECTF-- -*** Testing sleep() : basic functionality *** -Thread slept for %f seconds -TEST PASSED -===DONE=== diff --git a/ext/standard/tests/general_functions/sleep_error.phpt b/ext/standard/tests/general_functions/sleep_error.phpt deleted file mode 100644 index 199bd8e9bc..0000000000 --- a/ext/standard/tests/general_functions/sleep_error.phpt +++ /dev/null @@ -1,44 +0,0 @@ ---TEST-- -Test sleep() function : error conditions ---FILE-- - -===DONE=== ---EXPECTF-- -*** Testing sleep() : error conditions *** - --- Testing sleep() function with zero arguments -- - -Warning: sleep() expects exactly 1 parameter, 0 given in %s on line %d -bool(false) - --- Testing sleep() function with more than expected no. of arguments -- - -Warning: sleep() expects exactly 1 parameter, 2 given in %s on line %d -bool(false) - --- Testing sleep() function with negative interval -- - -Warning: sleep(): Number of seconds must be greater than or equal to 0 in %s on line %d -bool(false) -===DONE=== diff --git a/ext/standard/tests/general_functions/usleep_basic.phpt b/ext/standard/tests/general_functions/usleep_basic.phpt deleted file mode 100644 index 22c3e658b1..0000000000 --- a/ext/standard/tests/general_functions/usleep_basic.phpt +++ /dev/null @@ -1,39 +0,0 @@ ---TEST-- -Test usleep() function ---FILE-- -= $sleeplow) { - echo "TEST PASSED\n"; -} else { - echo "TEST FAILED\n"; -} -?> -===DONE=== ---EXPECTF-- -*** Testing usleep() : basic functionality *** -Thread slept for %f micro-seconds -TEST PASSED -===DONE=== diff --git a/ext/standard/tests/general_functions/usleep_error.phpt b/ext/standard/tests/general_functions/usleep_error.phpt deleted file mode 100644 index bdd120cde9..0000000000 --- a/ext/standard/tests/general_functions/usleep_error.phpt +++ /dev/null @@ -1,45 +0,0 @@ ---TEST-- -Test usleep() function : error conditions ---FILE-- - -===DONE=== ---EXPECTF-- -*** Testing usleep() : error conditions *** - --- Testing usleep() function with zero arguments -- - -Warning: usleep() expects exactly 1 parameter, 0 given in %s on line %d -NULL - --- Testing usleep() function with more than expected no. of arguments -- - -Warning: usleep() expects exactly 1 parameter, 2 given in %s on line %d -NULL - --- Testing usleep() function with negative interval -- - -Warning: usleep(): Number of microseconds must be greater than or equal to 0 in %s on line %d -bool(false) -===DONE=== -- cgit v1.2.1