MFH

diff --git a/ext/standard/tests/array/array_change_key_case.phpt b/ext/standard/tests/array/array_change_key_case.phpt
index 8e785a84d961eca35ca5567f65a37b97e2c43330..31234582522f136f092d48b85a47092f480652cd 100644 (file)
--- a/ext/standard/tests/array/array_change_key_case.phpt
+++ b/ext/standard/tests/array/array_change_key_case.phpt
@@ -58,30 +58,6 @@ foreach ($arrays as $item) {
        echo "\n";
 }
 
-echo "\n*** Testing possible variations ***\n";
-$int_var  = -19;
-$item = array ("one" => 1, "two" => 2, "THREE" => 3, "FOUR" => "four");
-
-/* use 'case' argument other than CASE_LOWER & CASE_UPPER */
-var_dump(array_change_key_case($item, "CASE_UPPER")); 
-var_dump(array_change_key_case($item, 5)); 
-
-/* when keys are different in terms of only case */
-/* should return one value key pair with key being in lowercase */
-var_dump( array_change_key_case( array("ONE" => 1, "one" => 3, "One" => 4) ) ); 
-var_dump( array_change_key_case( array("ONE" => 1, "one" => 6, "One" => 5), "CASE_UPPER" ) ); 
-
-/* should return one value key pair with key being in uppercase */
-var_dump( array_change_key_case( array("ONE" => 1, "one" => 2, "One" => 3), CASE_UPPER ) ); 
-var_dump( array_change_key_case( array("ONE" => 1, "one" => 1, "One" => 2), 5 ) ); 
-
-echo "\n*** Testing error conditions ***\n";
-/* generate different failure conditions */
-var_dump( array_change_key_case($int_var) ); // args less than expected
-var_dump( array_change_key_case($int_var, CASE_UPPER) ); // invalid first argument
-var_dump( array_change_key_case() ); // Zero argument
-var_dump( array_change_key_case($item, $item["one"], "CASE_UPPER") ); // more than expected numbers
-
 echo "end\n";
 ?>
 --EXPECTF--
@@ -838,56 +814,4 @@ array(4) {
   string(4) "four"
 }
 
-
-*** Testing possible variations ***
-array(4) {
-  ["one"]=>
-  int(1)
-  ["two"]=>
-  int(2)
-  ["three"]=>
-  int(3)
-  ["four"]=>
-  string(4) "four"
-}
-array(4) {
-  ["ONE"]=>
-  int(1)
-  ["TWO"]=>
-  int(2)
-  ["THREE"]=>
-  int(3)
-  ["FOUR"]=>
-  string(4) "four"
-}
-array(1) {
-  ["one"]=>
-  int(4)
-}
-array(1) {
-  ["one"]=>
-  int(5)
-}
-array(1) {
-  ["ONE"]=>
-  int(3)
-}
-array(1) {
-  ["ONE"]=>
-  int(2)
-}
-
-*** Testing error conditions ***
-
-Warning: array_change_key_case(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: array_change_key_case(): The argument should be an array in %s on line %d
-bool(false)
-
-Warning: Wrong parameter count for array_change_key_case() in %s on line %d
-NULL
-
-Warning: Wrong parameter count for array_change_key_case() in %s on line %d
-NULL
 end

diff --git a/ext/standard/tests/array/array_change_key_case_errors.phpt b/ext/standard/tests/array/array_change_key_case_errors.phpt
new file mode 100644 (file)
index 0000000..9abe177
--- /dev/null
+++ b/ext/standard/tests/array/array_change_key_case_errors.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Test array_change_key_case() function - 3
+--FILE--
+<?php
+/* generate different failure conditions */
+$int_var  = -19;
+$item = array ("one" => 1, "two" => 2, "THREE" => 3, "FOUR" => "four");
+
+var_dump( array_change_key_case($int_var) ); // args less than expected
+var_dump( array_change_key_case($int_var, CASE_UPPER) ); // invalid first argument
+var_dump( array_change_key_case() ); // Zero argument
+var_dump( array_change_key_case($item, $item["one"], "CASE_UPPER") ); // more than expected numbers
+
+echo "end\n";
+?>
+--EXPECTF--
+Warning: array_change_key_case(): The argument should be an array in %s on line %d
+bool(false)
+
+Warning: array_change_key_case(): The argument should be an array in %s on line %d
+bool(false)
+
+Warning: Wrong parameter count for array_change_key_case() in %s on line %d
+NULL
+
+Warning: Wrong parameter count for array_change_key_case() in %s on line %d
+NULL
+end

diff --git a/ext/standard/tests/array/array_change_key_case_variation.phpt b/ext/standard/tests/array/array_change_key_case_variation.phpt
new file mode 100644 (file)
index 0000000..ede2972
--- /dev/null
+++ b/ext/standard/tests/array/array_change_key_case_variation.phpt
@@ -0,0 +1,60 @@
+--TEST--
+Test array_change_key_case() function - 2
+--FILE--
+<?php
+
+$item = array ("one" => 1, "two" => 2, "THREE" => 3, "FOUR" => "four");
+
+/* use 'case' argument other than CASE_LOWER & CASE_UPPER */
+var_dump(array_change_key_case($item, "CASE_UPPER")); 
+var_dump(array_change_key_case($item, 5)); 
+
+/* when keys are different in terms of only case */
+/* should return one value key pair with key being in lowercase */
+var_dump( array_change_key_case( array("ONE" => 1, "one" => 3, "One" => 4) ) ); 
+var_dump( array_change_key_case( array("ONE" => 1, "one" => 6, "One" => 5), "CASE_UPPER" ) ); 
+
+/* should return one value key pair with key being in uppercase */
+var_dump( array_change_key_case( array("ONE" => 1, "one" => 2, "One" => 3), CASE_UPPER ) ); 
+var_dump( array_change_key_case( array("ONE" => 1, "one" => 1, "One" => 2), 5 ) ); 
+
+echo "end\n";
+?>
+--EXPECTF--
+array(4) {
+  ["one"]=>
+  int(1)
+  ["two"]=>
+  int(2)
+  ["three"]=>
+  int(3)
+  ["four"]=>
+  string(4) "four"
+}
+array(4) {
+  ["ONE"]=>
+  int(1)
+  ["TWO"]=>
+  int(2)
+  ["THREE"]=>
+  int(3)
+  ["FOUR"]=>
+  string(4) "four"
+}
+array(1) {
+  ["one"]=>
+  int(4)
+}
+array(1) {
+  ["one"]=>
+  int(5)
+}
+array(1) {
+  ["ONE"]=>
+  int(3)
+}
+array(1) {
+  ["ONE"]=>
+  int(2)
+}
+end