kraghuba Fri Nov 2 03:00:18 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/strings chop_variation1.phpt
chop_variation2.phpt
Log:
Fix test: better float values
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/chop_variation1.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/chop_variation1.phpt
diff -u php-src/ext/standard/tests/strings/chop_variation1.phpt:1.1.2.2
php-src/ext/standard/tests/strings/chop_variation1.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/chop_variation1.phpt:1.1.2.2 Tue Oct
9 12:12:19 2007
+++ php-src/ext/standard/tests/strings/chop_variation1.phpt Fri Nov 2
03:00:18 2007
@@ -1,210 +1,210 @@
---TEST--
-Test chop() function : usage variations - unexpected values for str argument
---FILE--
-<?php
-/* Prototype : string chop ( string $str [, string $charlist] )
- * Description: Strip whitespace (or other characters) from the end of a string
- * Source code: ext/standard/string.c
-*/
-
-/*
- * Testing chop() : with different unexpected values for $str argument passed
to the function
-*/
-
-echo "*** Testing chop() : with unexpected values for str argument ***\n";
-// initialize all required variables
-
-$charlist = " @#$%1234567890";
-// get an unset variable
-$unset_var = 'string_val';
-unset($unset_var);
-
-// declaring class
-class sample {
- public function __toString() {
- return " @#$%Object @#$%";
- }
-}
-$sample_obj = new sample;
-
-// creating a file resource
-$file_handle = fopen(__FILE__, 'r');
-
-// array with different values
-$values = array (
-
- // integer values
- 0,
- 1,
- 12345,
- -2345,
-
- // float values
- 10.5,
- -10.5,
- 10.5e10,
- 10.6E-10,
- .5,
-
- // array values
- array(),
- array(0),
- array(1),
- array(1, 2),
- array('color' => 'red', 'item' => 'pen'),
-
- // boolean values
- true,
- false,
- TRUE,
- FALSE,
-
- // empty string
- "",
- '',
-
- // null vlaues
- NULL,
- null,
-
- // undefined variable
- $undefined_var,
-
- // unset variable
- $unset_var,
-
- // object
- $sample_obj,
-
- // resource
- $file_handle
-);
-
-
-// loop through each element of the array and check the working of chop()
-// when $str arugment is supplied with different values
-
-echo "\n--- Testing chop() by supplying different values for 'str' argument
---\n";
-$counter = 1;
-for($index = 0; $index < count($values); $index ++) {
- echo "-- Iteration $counter --\n";
- $str = $values [$index];
-
- var_dump( chop($str) );
- var_dump( chop($str, $charlist) );
-
- $counter ++;
-}
-
-// closing the resource
-fclose( $file_handle);
-
-echo "Done\n";
-?>
---EXPECTF--
-*** Testing chop() : with unexpected values for str argument ***
-
-Notice: Undefined variable: undefined_var in %s on line %d
-
-Notice: Undefined variable: unset_var in %s on line %d
-
---- Testing chop() by supplying different values for 'str' argument ---
--- Iteration 1 --
-string(1) "0"
-string(0) ""
--- Iteration 2 --
-string(1) "1"
-string(0) ""
--- Iteration 3 --
-string(5) "12345"
-string(0) ""
--- Iteration 4 --
-string(5) "-2345"
-string(1) "-"
--- Iteration 5 --
-string(4) "10.5"
-string(3) "10."
--- Iteration 6 --
-string(5) "-10.5"
-string(4) "-10."
--- Iteration 7 --
-string(12) "105000000000"
-string(0) ""
--- Iteration 8 --
-string(7) "1.06E-9"
-string(6) "1.06E-"
--- Iteration 9 --
-string(3) "0.5"
-string(2) "0."
--- Iteration 10 --
-
-Notice: Array to string conversion in %s on line %d
-string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
-string(5) "Array"
--- Iteration 11 --
-
-Notice: Array to string conversion in %s on line %d
-string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
-string(5) "Array"
--- Iteration 12 --
-
-Notice: Array to string conversion in %s on line %d
-string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
-string(5) "Array"
--- Iteration 13 --
-
-Notice: Array to string conversion in %s on line %d
-string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
-string(5) "Array"
--- Iteration 14 --
-
-Notice: Array to string conversion in %s on line %d
-string(5) "Array"
-
-Notice: Array to string conversion in %s on line %d
-string(5) "Array"
--- Iteration 15 --
-string(1) "1"
-string(0) ""
--- Iteration 16 --
-string(0) ""
-string(0) ""
--- Iteration 17 --
-string(1) "1"
-string(0) ""
--- Iteration 18 --
-string(0) ""
-string(0) ""
--- Iteration 19 --
-string(0) ""
-string(0) ""
--- Iteration 20 --
-string(0) ""
-string(0) ""
--- Iteration 21 --
-string(0) ""
-string(0) ""
--- Iteration 22 --
-string(0) ""
-string(0) ""
--- Iteration 23 --
-string(0) ""
-string(0) ""
--- Iteration 24 --
-string(0) ""
-string(0) ""
--- Iteration 25 --
-string(16) " @#$%Object @#$%"
-string(11) " @#$%Object"
--- Iteration 26 --
-string(%d) "Resource id #%d"
-string(11) "Resource id"
-Done
+--TEST--
+Test chop() function : usage variations - unexpected values for str argument
+--FILE--
+<?php
+/* Prototype : string chop ( string $str [, string $charlist] )
+ * Description: Strip whitespace (or other characters) from the end of a string
+ * Source code: ext/standard/string.c
+*/
+
+/*
+ * Testing chop() : with different unexpected values for $str argument passed
to the function
+*/
+
+echo "*** Testing chop() : with unexpected values for str argument ***\n";
+// initialize all required variables
+
+$charlist = " @#$%1234567890";
+// get an unset variable
+$unset_var = 'string_val';
+unset($unset_var);
+
+// declaring class
+class sample {
+ public function __toString() {
+ return " @#$%Object @#$%";
+ }
+}
+$sample_obj = new sample;
+
+// creating a file resource
+$file_handle = fopen(__FILE__, 'r');
+
+// array with different values
+$values = array (
+
+ // integer values
+ 0,
+ 1,
+ 12345,
+ -2345,
+
+ // float values
+ 10.5,
+ -10.5,
+ 10.1234567e10,
+ 10.7654321E-10,
+ .5,
+
+ // array values
+ array(),
+ array(0),
+ array(1),
+ array(1, 2),
+ array('color' => 'red', 'item' => 'pen'),
+
+ // boolean values
+ true,
+ false,
+ TRUE,
+ FALSE,
+
+ // empty string
+ "",
+ '',
+
+ // null vlaues
+ NULL,
+ null,
+
+ // undefined variable
+ $undefined_var,
+
+ // unset variable
+ $unset_var,
+
+ // object
+ $sample_obj,
+
+ // resource
+ $file_handle
+);
+
+
+// loop through each element of the array and check the working of chop()
+// when $str arugment is supplied with different values
+
+echo "\n--- Testing chop() by supplying different values for 'str' argument
---\n";
+$counter = 1;
+for($index = 0; $index < count($values); $index ++) {
+ echo "-- Iteration $counter --\n";
+ $str = $values [$index];
+
+ var_dump( chop($str) );
+ var_dump( chop($str, $charlist) );
+
+ $counter ++;
+}
+
+// closing the resource
+fclose( $file_handle);
+
+echo "Done\n";
+?>
+--EXPECTF--
+*** Testing chop() : with unexpected values for str argument ***
+
+Notice: Undefined variable: undefined_var in %s on line %d
+
+Notice: Undefined variable: unset_var in %s on line %d
+
+--- Testing chop() by supplying different values for 'str' argument ---
+-- Iteration 1 --
+string(1) "0"
+string(0) ""
+-- Iteration 2 --
+string(1) "1"
+string(0) ""
+-- Iteration 3 --
+string(5) "12345"
+string(0) ""
+-- Iteration 4 --
+string(5) "-2345"
+string(1) "-"
+-- Iteration 5 --
+string(4) "10.5"
+string(3) "10."
+-- Iteration 6 --
+string(5) "-10.5"
+string(4) "-10."
+-- Iteration 7 --
+string(12) "101234567000"
+string(0) ""
+-- Iteration 8 --
+string(13) "1.07654321E-9"
+string(12) "1.07654321E-"
+-- Iteration 9 --
+string(3) "0.5"
+string(2) "0."
+-- Iteration 10 --
+
+Notice: Array to string conversion in %s on line %d
+string(5) "Array"
+
+Notice: Array to string conversion in %s on line %d
+string(5) "Array"
+-- Iteration 11 --
+
+Notice: Array to string conversion in %s on line %d
+string(5) "Array"
+
+Notice: Array to string conversion in %s on line %d
+string(5) "Array"
+-- Iteration 12 --
+
+Notice: Array to string conversion in %s on line %d
+string(5) "Array"
+
+Notice: Array to string conversion in %s on line %d
+string(5) "Array"
+-- Iteration 13 --
+
+Notice: Array to string conversion in %s on line %d
+string(5) "Array"
+
+Notice: Array to string conversion in %s on line %d
+string(5) "Array"
+-- Iteration 14 --
+
+Notice: Array to string conversion in %s on line %d
+string(5) "Array"
+
+Notice: Array to string conversion in %s on line %d
+string(5) "Array"
+-- Iteration 15 --
+string(1) "1"
+string(0) ""
+-- Iteration 16 --
+string(0) ""
+string(0) ""
+-- Iteration 17 --
+string(1) "1"
+string(0) ""
+-- Iteration 18 --
+string(0) ""
+string(0) ""
+-- Iteration 19 --
+string(0) ""
+string(0) ""
+-- Iteration 20 --
+string(0) ""
+string(0) ""
+-- Iteration 21 --
+string(0) ""
+string(0) ""
+-- Iteration 22 --
+string(0) ""
+string(0) ""
+-- Iteration 23 --
+string(0) ""
+string(0) ""
+-- Iteration 24 --
+string(0) ""
+string(0) ""
+-- Iteration 25 --
+string(16) " @#$%Object @#$%"
+string(11) " @#$%Object"
+-- Iteration 26 --
+string(%d) "Resource id #%d"
+string(11) "Resource id"
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/chop_variation2.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/strings/chop_variation2.phpt
diff -u php-src/ext/standard/tests/strings/chop_variation2.phpt:1.1.2.1
php-src/ext/standard/tests/strings/chop_variation2.phpt:1.1.2.2
--- php-src/ext/standard/tests/strings/chop_variation2.phpt:1.1.2.1 Fri Sep
14 18:58:02 2007
+++ php-src/ext/standard/tests/strings/chop_variation2.phpt Fri Nov 2
03:00:18 2007
@@ -1,173 +1,173 @@
---TEST--
-Test chop() function : usage variations - unexpected values for charlist
argument
---FILE--
-<?php
-/* Prototype : string chop ( string $str [, string $charlist] )
- * Description: Strip whitespace (or other characters) from the end of a string
- * Source code: ext/standard/string.c
-*/
-
-/*
- * Testing chop() : with different unexpected values for charlist argument
passes to the function
-*/
-
-echo "*** Testing chop() : with different unexpected values for charlist
argument ***\n";
-// initialize all required variables
-$str = 'hello world12345 ';
-
-// get an unset variable
-$unset_var = 'string_val';
-unset($unset_var);
-
-// declaring class
-class sample {
- public function __toString() {
- return "@# $%12345";
- }
-}
-
-// defining a resource
-$file_handle = fopen(__FILE__, 'r');
-
-// array with different values
-$values = array (
-
- // integer values
- 0,
- 1,
- 12345,
- -2345,
-
- // float values
- 10.5,
- -10.5,
- 10.5e10,
- 10.6E-10,
- .5,
-
- // array values
- array(),
- array(0),
- array(1),
- array(1, 2),
- array('color' => 'red', 'item' => 'pen'),
-
- // boolean values
- true,
- false,
- TRUE,
- FALSE,
-
- // objects
- new sample(),
-
- // empty string
- "",
- '',
-
- // null vlaues
- NULL,
- null,
-
- // resource
- $file_handle,
-
- // undefined variable
- $undefined_var,
-
- // unset variable
- $unset_var
-
-);
-
-
-// loop through each element of the array and check the working of chop()
-// when $charlist arugment is supplied with different values
-
-echo "\n--- Testing chop() by supplying different values for 'charlist'
argument ---\n";
-$counter = 1;
-for($index = 0; $index < count($values); $index ++) {
- echo "-- Iteration $counter --\n";
- $charlist = $values [$index];
-
- var_dump( chop($str, $charlist) );
-
- $counter ++;
-}
-
-// closing the resource
-fclose($file_handle);
-
-echo "Done\n";
-?>
---EXPECTF--
-*** Testing chop() : with different unexpected values for charlist argument ***
-
-Notice: Undefined variable: undefined_var in %s on line %d
-
-Notice: Undefined variable: unset_var in %s on line %d
-
---- Testing chop() by supplying different values for 'charlist' argument ---
--- Iteration 1 --
-string(17) "hello world12345 "
--- Iteration 2 --
-string(17) "hello world12345 "
--- Iteration 3 --
-string(17) "hello world12345 "
--- Iteration 4 --
-string(17) "hello world12345 "
--- Iteration 5 --
-string(17) "hello world12345 "
--- Iteration 6 --
-string(17) "hello world12345 "
--- Iteration 7 --
-string(17) "hello world12345 "
--- Iteration 8 --
-string(17) "hello world12345 "
--- Iteration 9 --
-string(17) "hello world12345 "
--- Iteration 10 --
-
-Notice: Array to string conversion in %s on line %d
-string(17) "hello world12345 "
--- Iteration 11 --
-
-Notice: Array to string conversion in %s on line %d
-string(17) "hello world12345 "
--- Iteration 12 --
-
-Notice: Array to string conversion in %s on line %d
-string(17) "hello world12345 "
--- Iteration 13 --
-
-Notice: Array to string conversion in %s on line %d
-string(17) "hello world12345 "
--- Iteration 14 --
-
-Notice: Array to string conversion in %s on line %d
-string(17) "hello world12345 "
--- Iteration 15 --
-string(17) "hello world12345 "
--- Iteration 16 --
-string(17) "hello world12345 "
--- Iteration 17 --
-string(17) "hello world12345 "
--- Iteration 18 --
-string(17) "hello world12345 "
--- Iteration 19 --
-string(11) "hello world"
--- Iteration 20 --
-string(17) "hello world12345 "
--- Iteration 21 --
-string(17) "hello world12345 "
--- Iteration 22 --
-string(17) "hello world12345 "
--- Iteration 23 --
-string(17) "hello world12345 "
--- Iteration 24 --
-string(15) "hello world1234"
--- Iteration 25 --
-string(17) "hello world12345 "
--- Iteration 26 --
-string(17) "hello world12345 "
-Done
+--TEST--
+Test chop() function : usage variations - unexpected values for charlist
argument
+--FILE--
+<?php
+/* Prototype : string chop ( string $str [, string $charlist] )
+ * Description: Strip whitespace (or other characters) from the end of a string
+ * Source code: ext/standard/string.c
+*/
+
+/*
+ * Testing chop() : with different unexpected values for charlist argument
passes to the function
+*/
+
+echo "*** Testing chop() : with different unexpected values for charlist
argument ***\n";
+// initialize all required variables
+$str = 'hello world12345 ';
+
+// get an unset variable
+$unset_var = 'string_val';
+unset($unset_var);
+
+// declaring class
+class sample {
+ public function __toString() {
+ return "@# $%12345";
+ }
+}
+
+// defining a resource
+$file_handle = fopen(__FILE__, 'r');
+
+// array with different values
+$values = array (
+
+ // integer values
+ 0,
+ 1,
+ 12345,
+ -2345,
+
+ // float values
+ 10.5,
+ -10.5,
+ 10.1234567e10,
+ 10.7654321E-10,
+ .5,
+
+ // array values
+ array(),
+ array(0),
+ array(1),
+ array(1, 2),
+ array('color' => 'red', 'item' => 'pen'),
+
+ // boolean values
+ true,
+ false,
+ TRUE,
+ FALSE,
+
+ // objects
+ new sample(),
+
+ // empty string
+ "",
+ '',
+
+ // null values
+ NULL,
+ null,
+
+ // resource
+ $file_handle,
+
+ // undefined variable
+ $undefined_var,
+
+ // unset variable
+ $unset_var
+
+);
+
+
+// loop through each element of the array and check the working of chop()
+// when $charlist arugment is supplied with different values
+
+echo "\n--- Testing chop() by supplying different values for 'charlist'
argument ---\n";
+$counter = 1;
+for($index = 0; $index < count($values); $index ++) {
+ echo "-- Iteration $counter --\n";
+ $charlist = $values [$index];
+
+ var_dump( chop($str, $charlist) );
+
+ $counter ++;
+}
+
+// closing the resource
+fclose($file_handle);
+
+echo "Done\n";
+?>
+--EXPECTF--
+*** Testing chop() : with different unexpected values for charlist argument ***
+
+Notice: Undefined variable: undefined_var in %s on line %d
+
+Notice: Undefined variable: unset_var in %s on line %d
+
+--- Testing chop() by supplying different values for 'charlist' argument ---
+-- Iteration 1 --
+string(17) "hello world12345 "
+-- Iteration 2 --
+string(17) "hello world12345 "
+-- Iteration 3 --
+string(17) "hello world12345 "
+-- Iteration 4 --
+string(17) "hello world12345 "
+-- Iteration 5 --
+string(17) "hello world12345 "
+-- Iteration 6 --
+string(17) "hello world12345 "
+-- Iteration 7 --
+string(17) "hello world12345 "
+-- Iteration 8 --
+string(17) "hello world12345 "
+-- Iteration 9 --
+string(17) "hello world12345 "
+-- Iteration 10 --
+
+Notice: Array to string conversion in %s on line %d
+string(17) "hello world12345 "
+-- Iteration 11 --
+
+Notice: Array to string conversion in %s on line %d
+string(17) "hello world12345 "
+-- Iteration 12 --
+
+Notice: Array to string conversion in %s on line %d
+string(17) "hello world12345 "
+-- Iteration 13 --
+
+Notice: Array to string conversion in %s on line %d
+string(17) "hello world12345 "
+-- Iteration 14 --
+
+Notice: Array to string conversion in %s on line %d
+string(17) "hello world12345 "
+-- Iteration 15 --
+string(17) "hello world12345 "
+-- Iteration 16 --
+string(17) "hello world12345 "
+-- Iteration 17 --
+string(17) "hello world12345 "
+-- Iteration 18 --
+string(17) "hello world12345 "
+-- Iteration 19 --
+string(11) "hello world"
+-- Iteration 20 --
+string(17) "hello world12345 "
+-- Iteration 21 --
+string(17) "hello world12345 "
+-- Iteration 22 --
+string(17) "hello world12345 "
+-- Iteration 23 --
+string(17) "hello world12345 "
+-- Iteration 24 --
+string(%d) "%s"
+-- Iteration 25 --
+string(17) "hello world12345 "
+-- Iteration 26 --
+string(17) "hello world12345 "
+Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
