From: Sebastian Bergmann Date: Sat, 28 Jun 2003 05:51:37 +0000 (+0000) Subject: Remove aggregation tests as well. X-Git-Tag: php-5.0.0b1~17 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67400949f253c2f25c6da68c0953c4d3c7f842a7;p=php Remove aggregation tests as well. --- diff --git a/ext/standard/tests/aggregation/aggregate.lib b/ext/standard/tests/aggregation/aggregate.lib deleted file mode 100644 index 3799285f75..0000000000 --- a/ext/standard/tests/aggregation/aggregate.lib +++ /dev/null @@ -1,65 +0,0 @@ - PHP_VERSION); - var $our_prop = '****'; - var $_priv_prop = null; - - function helper() - { - print "just trying to help\n"; - } - - function do_this() - { - print "I'm helping!\n"; - } - - function do_that() - { - print "I'm aggregating!\n"; - } - - function just_another_method() - { - print "yep, that's me\n"; - } - - function _private() - { - print "Don't touch me!\n"; - } - - function __wakeup() - { - } -} - -class mixin { - var $simple_prop = true; - var $mix = true; - - function mix_it() - { - print "mixing\n"; - } -} - -class moby { - function mix_it() - { - print "I'm redundant!\n"; - } -} - -?> diff --git a/ext/standard/tests/aggregation/aggregate.phpt b/ext/standard/tests/aggregation/aggregate.phpt deleted file mode 100644 index 46aa9133b6..0000000000 --- a/ext/standard/tests/aggregation/aggregate.phpt +++ /dev/null @@ -1,19 +0,0 @@ ---TEST-- -aggregating everything ---FILE-- -do_this(); -$obj->do_that(); -print $obj->our_prop; - -?> ---EXPECT-- -I'm alive! -I'm helping! -I'm aggregating! -**** diff --git a/ext/standard/tests/aggregation/aggregate_methods.phpt b/ext/standard/tests/aggregation/aggregate_methods.phpt deleted file mode 100644 index b612881c59..0000000000 --- a/ext/standard/tests/aggregation/aggregate_methods.phpt +++ /dev/null @@ -1,25 +0,0 @@ ---TEST-- -aggregating all methods ---POST-- ---GET-- ---FILE-- -mix_it(); -print $obj->simple_prop."\n"; -print implode(',', get_class_methods($obj))."\n"; -print implode(',', array_keys(get_object_vars($obj)))."\n"; -aggregate_methods($obj, 'moby'); -$obj->mix_it(); - -?> ---EXPECT-- -I'm alive! -mixing -100 -simple,mix_it -simple_prop -mixing diff --git a/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt b/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt deleted file mode 100644 index 312a57d1b2..0000000000 --- a/ext/standard/tests/aggregation/aggregate_methods_by_list.phpt +++ /dev/null @@ -1,22 +0,0 @@ ---TEST-- -aggregating methods specified in the list ---POST-- ---GET-- ---FILE-- -just_another_method(); -?> ---EXPECT-- -I'm alive! -simple,just_another_method -I'm alive! -simple,do_this,do_that -yep, that's me diff --git a/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt b/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt deleted file mode 100644 index 6525e50cff..0000000000 --- a/ext/standard/tests/aggregation/aggregate_methods_by_regexp.phpt +++ /dev/null @@ -1,20 +0,0 @@ ---TEST-- -aggregating methods matching regular expression ---POST-- ---GET-- ---FILE-- - ---EXPECT-- -I'm alive! -simple,do_this,do_that -I'm alive! -simple,just_another_method diff --git a/ext/standard/tests/aggregation/aggregate_properties.phpt b/ext/standard/tests/aggregation/aggregate_properties.phpt deleted file mode 100644 index 2a976c71a7..0000000000 --- a/ext/standard/tests/aggregation/aggregate_properties.phpt +++ /dev/null @@ -1,19 +0,0 @@ ---TEST-- -aggregating all default properties ---POST-- ---GET-- ---FILE-- -simple_prop."\n"; -print implode(',', get_class_methods($obj))."\n"; -?> ---EXPECT-- -I'm alive! -simple_prop,mix -100 -simple diff --git a/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt b/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt deleted file mode 100644 index fa12d36bcb..0000000000 --- a/ext/standard/tests/aggregation/aggregate_properties_by_list.phpt +++ /dev/null @@ -1,20 +0,0 @@ ---TEST-- -aggregating default properties specified in the list ---POST-- ---GET-- ---FILE-- - ---EXPECT-- -I'm alive! -simple_prop,my_prop,our_prop -I'm alive! -simple_prop,your_prop,our_prop diff --git a/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt b/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt deleted file mode 100644 index 9a74f5536d..0000000000 --- a/ext/standard/tests/aggregation/aggregate_properties_by_regexp.phpt +++ /dev/null @@ -1,22 +0,0 @@ ---TEST-- -aggregating default properties matching regular expression ---SKIPIF-- - ---POST-- ---GET-- ---FILE-- - ---EXPECT-- -I'm alive! -simple_prop,my_prop -I'm alive! -simple_prop,your_prop,our_prop diff --git a/ext/standard/tests/aggregation/aggregation_info.phpt b/ext/standard/tests/aggregation/aggregation_info.phpt deleted file mode 100644 index 8dd943cbcc..0000000000 --- a/ext/standard/tests/aggregation/aggregation_info.phpt +++ /dev/null @@ -1,31 +0,0 @@ ---TEST-- -retrieving aggregation info ---POST-- ---GET-- ---FILE-- - ---EXPECT-- -I'm alive! -Array -( - [mixin] => Array - ( - [methods] => Array - ( - [0] => mix_it - ) - - [properties] => Array - ( - [0] => mix - ) - - ) - -) diff --git a/ext/standard/tests/aggregation/deaggregate.phpt b/ext/standard/tests/aggregation/deaggregate.phpt deleted file mode 100644 index 5c551d75bd..0000000000 --- a/ext/standard/tests/aggregation/deaggregate.phpt +++ /dev/null @@ -1,72 +0,0 @@ ---TEST-- -deaggreating ---POST-- ---GET-- ---FILE-- - ---EXPECT-- -I'm alive! -Array -( - [helper] => Array - ( - [methods] => Array - ( - [0] => do_this - [1] => do_that - [2] => just_another_method - ) - - [properties] => Array - ( - [0] => my_prop - [1] => your_prop - [2] => our_prop - ) - - ) - - [mixin] => Array - ( - [methods] => Array - ( - [0] => mix_it - ) - - [properties] => Array - ( - [0] => mix - ) - - ) - -) -Array -( - [mixin] => Array - ( - [methods] => Array - ( - [0] => mix_it - ) - - [properties] => Array - ( - [0] => mix - ) - - ) - -) -bool(false)