more smaller tests

diff --git a/ext/standard/tests/array/array_values.phpt b/ext/standard/tests/array/array_values.phpt
index 0aeb5a85a39426bd3488a94c018b0ceadf97e7d0..e5e46ca3f72274f691fa1a38d081ea0beb7b4079 100644 (file)
Binary files a/ext/standard/tests/array/array_values.phpt and b/ext/standard/tests/array/array_values.phpt differ

diff --git a/ext/standard/tests/array/array_values_64bit.phpt b/ext/standard/tests/array/array_values_64bit.phpt
deleted file mode 100644 (file)
index a048800..0000000
Binary files a/ext/standard/tests/array/array_values_64bit.phpt and /dev/null differ

diff --git a/ext/standard/tests/array/array_values_errors.phpt b/ext/standard/tests/array/array_values_errors.phpt
new file mode 100644 (file)
index 0000000..66fe620
--- /dev/null
+++ b/ext/standard/tests/array/array_values_errors.phpt
@@ -0,0 +1,40 @@
+--TEST--
+Test array_values() function (errors)
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
+?>
+--INI--
+precision=14
+--FILE--
+<?php
+
+echo "\n*** Testing error conditions ***\n";
+/* Invalid number of args */
+var_dump( array_values() );  // Zero arguments
+var_dump( array_values(array(1,2,3), "") );  // No. of args > expected
+/* Invalid types */
+var_dump( array_values("") );  // Empty string
+var_dump( array_values(100) );  // Integer
+var_dump( array_values(new stdclass) );  // object
+
+echo "Done\n";
+?>
+--EXPECTF--    
+*** Testing error conditions ***
+
+Warning: Wrong parameter count for array_values() in %s on line %d
+NULL
+
+Warning: Wrong parameter count for array_values() in %s on line %d
+NULL
+
+Warning: array_values(): The argument should be an array in %s on line %d
+NULL
+
+Warning: array_values(): The argument should be an array in %s on line %d
+NULL
+
+Warning: array_values(): The argument should be an array in %s on line %d
+NULL
+Done

diff --git a/ext/standard/tests/array/array_values_variation.phpt b/ext/standard/tests/array/array_values_variation.phpt
new file mode 100644 (file)
index 0000000..15da1a6
--- /dev/null
+++ b/ext/standard/tests/array/array_values_variation.phpt
@@ -0,0 +1,76 @@
+--TEST--
+Test array_values() function (variation)
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
+?>
+--INI--
+precision=14
+--FILE--
+<?php
+
+echo "\n*** Testing array_values() with resource type ***\n";
+$resource1 = fopen(__FILE__, "r");  // Creating a file resource
+$resource2 = opendir(".");  // Creating a dir resource
+
+/* creating an array with resources as elements */
+$arr_resource = array( "a" => $resource1, "b" => $resource2);
+var_dump( array_values($arr_resource) );
+
+echo "\n*** Testing array_values() with range checking ***\n";
+$arr_range = array(
+  2147483647, 
+  2147483648, 
+  -2147483647,
+  -2147483648,
+  -0,
+  0,
+  -2147483649
+);
+var_dump( array_values($arr_range) );
+
+echo "\n*** Testing array_values() on an array created on the fly ***\n";
+var_dump( array_values(array(1,2,3)) );
+var_dump( array_values(array()) );  // null array
+
+echo "Done\n";
+?>
+--EXPECTF--    
+*** Testing array_values() with resource type ***
+array(2) {
+  [0]=>
+  resource(%d) of type (stream)
+  [1]=>
+  resource(%d) of type (stream)
+}
+
+*** Testing array_values() with range checking ***
+array(7) {
+  [0]=>
+  int(2147483647)
+  [1]=>
+  float(2147483648)
+  [2]=>
+  int(-2147483647)
+  [3]=>
+  float(-2147483648)
+  [4]=>
+  int(0)
+  [5]=>
+  int(0)
+  [6]=>
+  float(-2147483649)
+}
+
+*** Testing array_values() on an array created on the fly ***
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+}
+array(0) {
+}
+Done

diff --git a/ext/standard/tests/array/array_values_variation_64bit.phpt b/ext/standard/tests/array/array_values_variation_64bit.phpt
new file mode 100644 (file)
index 0000000..8b1e2c0
--- /dev/null
+++ b/ext/standard/tests/array/array_values_variation_64bit.phpt
@@ -0,0 +1,74 @@
+--TEST--
+Test array_values() function
+--SKIPIF--
+<?php
+if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
+?>
+--INI--
+precision=14
+--FILE--
+<?php
+
+echo "\n*** Testing array_values() with resource type ***\n";
+$resource1 = fopen(__FILE__, "r");  // Creating a file resource
+$resource2 = opendir(".");  // Creating a dir resource
+
+/* creating an array with resources as elements */
+$arr_resource = array( "a" => $resource1, "b" => $resource2);
+var_dump( array_values($arr_resource) );
+
+echo "\n*** Testing array_values() with range checking ***\n";
+$arr_range = array(
+  2147483647, 
+  2147483648, 
+  -2147483647,
+  -2147483648,
+  -0,
+  0,
+  -2147483649
+);
+var_dump( array_values($arr_range) );
+
+echo "\n*** Testing array_values() on an array created on the fly ***\n";
+var_dump( array_values(array(1,2,3)) );
+var_dump( array_values(array()) );  // null array
+
+?>
+--EXPECTF--    
+*** Testing array_values() with resource type ***
+array(2) {
+  [0]=>
+  resource(%d) of type (stream)
+  [1]=>
+  resource(%d) of type (stream)
+}
+
+*** Testing array_values() with range checking ***
+array(7) {
+  [0]=>
+  int(2147483647)
+  [1]=>
+  int(2147483648)
+  [2]=>
+  int(-2147483647)
+  [3]=>
+  int(-2147483648)
+  [4]=>
+  int(0)
+  [5]=>
+  int(0)
+  [6]=>
+  int(-2147483649)
+}
+
+*** Testing array_values() on an array created on the fly ***
+array(3) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+}
+array(0) {
+}