stevseea Mon Feb 25 10:28:43 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard/tests/file fgetc_variation2.phpt
fgetc_basic.phpt
Log:
Replace hardcoded resource ids with %d in fgetc() tests.
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetc_variation2.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/file/fgetc_variation2.phpt
diff -u php-src/ext/standard/tests/file/fgetc_variation2.phpt:1.1.2.1
php-src/ext/standard/tests/file/fgetc_variation2.phpt:1.1.2.2
--- php-src/ext/standard/tests/file/fgetc_variation2.phpt:1.1.2.1 Sat Jul
21 07:55:07 2007
+++ php-src/ext/standard/tests/file/fgetc_variation2.phpt Mon Feb 25
10:28:43 2008
@@ -41,20 +41,7 @@
*** Testing fgetc() : usage variations ***
-- Testing fgetc() with closed handle --
-Warning: fgetc(): 6 is not a valid stream resource in %s on line %d
-bool(false)
--- Testing fgetc() with unset handle --
-
-Notice: Undefined variable: file_handle in %s on line %d
-
-Warning: fgetc(): supplied argument is not a valid stream resource in %s on
line %d
-bool(false)
-Done
---UEXPECTF--
-*** Testing fgetc() : usage variations ***
--- Testing fgetc() with closed handle --
-
-Warning: fgetc(): 6 is not a valid stream resource in %s on line %d
+Warning: fgetc(): %d is not a valid stream resource in %s on line %d
bool(false)
-- Testing fgetc() with unset handle --
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fgetc_basic.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/standard/tests/file/fgetc_basic.phpt
diff -u php-src/ext/standard/tests/file/fgetc_basic.phpt:1.1.2.3
php-src/ext/standard/tests/file/fgetc_basic.phpt:1.1.2.4
--- php-src/ext/standard/tests/file/fgetc_basic.phpt:1.1.2.3 Wed Oct 31
13:39:14 2007
+++ php-src/ext/standard/tests/file/fgetc_basic.phpt Mon Feb 25 10:28:43 2008
@@ -69,475 +69,475 @@
string(1) "2"
int(1)
bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(2)
bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(3)
bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(4)
bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(5)
bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(6)
bool(false)
-resource(8) of type (stream)
+resource(%d) of type (stream)
-- Innerloop iteration 2 of Outerloop Iteration 1 --
-- Testing fgetc() : file opened using rb mode --
string(1) "2"
int(1)
bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(2)
bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(3)
bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(4)
bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(5)
bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(6)
bool(false)
-resource(9) of type (stream)
+resource(%d) of type (stream)
-- Innerloop iteration 3 of Outerloop Iteration 1 --
-- Testing fgetc() : file opened using rt mode --
string(1) "2"
int(1)
bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(2)
bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(3)
bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(4)
bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(5)
bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(6)
bool(false)
-resource(10) of type (stream)
+resource(%d) of type (stream)
-- Innerloop iteration 4 of Outerloop Iteration 1 --
-- Testing fgetc() : file opened using r+ mode --
string(1) "2"
int(1)
bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(2)
bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(3)
bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(4)
bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(5)
bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(6)
bool(false)
-resource(11) of type (stream)
+resource(%d) of type (stream)
-- Innerloop iteration 5 of Outerloop Iteration 1 --
-- Testing fgetc() : file opened using r+b mode --
string(1) "2"
int(1)
bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(2)
bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(3)
bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(4)
bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(5)
bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(6)
bool(false)
-resource(12) of type (stream)
+resource(%d) of type (stream)
-- Innerloop iteration 6 of Outerloop Iteration 1 --
-- Testing fgetc() : file opened using r+t mode --
string(1) "2"
int(1)
bool(false)
-resource(13) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(2)
bool(false)
-resource(13) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(3)
bool(false)
-resource(13) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(4)
bool(false)
-resource(13) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(5)
bool(false)
-resource(13) of type (stream)
+resource(%d) of type (stream)
string(1) "2"
int(6)
bool(false)
-resource(13) of type (stream)
+resource(%d) of type (stream)
--- Outerloop iteration 2 ---
-- Innerloop iteration 1 of Outerloop Iteration 2 --
-- Testing fgetc() : file opened using r mode --
string(1) "t"
int(1)
bool(false)
-resource(16) of type (stream)
+resource(%d) of type (stream)
string(1) "e"
int(2)
bool(false)
-resource(16) of type (stream)
+resource(%d) of type (stream)
string(1) "x"
int(3)
bool(false)
-resource(16) of type (stream)
+resource(%d) of type (stream)
string(1) "t"
int(4)
bool(false)
-resource(16) of type (stream)
+resource(%d) of type (stream)
string(1) " "
int(5)
bool(false)
-resource(16) of type (stream)
+resource(%d) of type (stream)
string(1) "t"
int(6)
bool(false)
-resource(16) of type (stream)
+resource(%d) of type (stream)
-- Innerloop iteration 2 of Outerloop Iteration 2 --
-- Testing fgetc() : file opened using rb mode --
string(1) "t"
int(1)
bool(false)
-resource(17) of type (stream)
+resource(%d) of type (stream)
string(1) "e"
int(2)
bool(false)
-resource(17) of type (stream)
+resource(%d) of type (stream)
string(1) "x"
int(3)
bool(false)
-resource(17) of type (stream)
+resource(%d) of type (stream)
string(1) "t"
int(4)
bool(false)
-resource(17) of type (stream)
+resource(%d) of type (stream)
string(1) " "
int(5)
bool(false)
-resource(17) of type (stream)
+resource(%d) of type (stream)
string(1) "t"
int(6)
bool(false)
-resource(17) of type (stream)
+resource(%d) of type (stream)
-- Innerloop iteration 3 of Outerloop Iteration 2 --
-- Testing fgetc() : file opened using rt mode --
string(1) "t"
int(1)
bool(false)
-resource(18) of type (stream)
+resource(%d) of type (stream)
string(1) "e"
int(2)
bool(false)
-resource(18) of type (stream)
+resource(%d) of type (stream)
string(1) "x"
int(3)
bool(false)
-resource(18) of type (stream)
+resource(%d) of type (stream)
string(1) "t"
int(4)
bool(false)
-resource(18) of type (stream)
+resource(%d) of type (stream)
string(1) " "
int(5)
bool(false)
-resource(18) of type (stream)
+resource(%d) of type (stream)
string(1) "t"
int(6)
bool(false)
-resource(18) of type (stream)
+resource(%d) of type (stream)
-- Innerloop iteration 4 of Outerloop Iteration 2 --
-- Testing fgetc() : file opened using r+ mode --
string(1) "t"
int(1)
bool(false)
-resource(19) of type (stream)
+resource(%d) of type (stream)
string(1) "e"
int(2)
bool(false)
-resource(19) of type (stream)
+resource(%d) of type (stream)
string(1) "x"
int(3)
bool(false)
-resource(19) of type (stream)
+resource(%d) of type (stream)
string(1) "t"
int(4)
bool(false)
-resource(19) of type (stream)
+resource(%d) of type (stream)
string(1) " "
int(5)
bool(false)
-resource(19) of type (stream)
+resource(%d) of type (stream)
string(1) "t"
int(6)
bool(false)
-resource(19) of type (stream)
+resource(%d) of type (stream)
-- Innerloop iteration 5 of Outerloop Iteration 2 --
-- Testing fgetc() : file opened using r+b mode --
string(1) "t"
int(1)
bool(false)
-resource(20) of type (stream)
+resource(%d) of type (stream)
string(1) "e"
int(2)
bool(false)
-resource(20) of type (stream)
+resource(%d) of type (stream)
string(1) "x"
int(3)
bool(false)
-resource(20) of type (stream)
+resource(%d) of type (stream)
string(1) "t"
int(4)
bool(false)
-resource(20) of type (stream)
+resource(%d) of type (stream)
string(1) " "
int(5)
bool(false)
-resource(20) of type (stream)
+resource(%d) of type (stream)
string(1) "t"
int(6)
bool(false)
-resource(20) of type (stream)
+resource(%d) of type (stream)
-- Innerloop iteration 6 of Outerloop Iteration 2 --
-- Testing fgetc() : file opened using r+t mode --
string(1) "t"
int(1)
bool(false)
-resource(21) of type (stream)
+resource(%d) of type (stream)
string(1) "e"
int(2)
bool(false)
-resource(21) of type (stream)
+resource(%d) of type (stream)
string(1) "x"
int(3)
bool(false)
-resource(21) of type (stream)
+resource(%d) of type (stream)
string(1) "t"
int(4)
bool(false)
-resource(21) of type (stream)
+resource(%d) of type (stream)
string(1) " "
int(5)
bool(false)
-resource(21) of type (stream)
+resource(%d) of type (stream)
string(1) "t"
int(6)
bool(false)
-resource(21) of type (stream)
+resource(%d) of type (stream)
--- Outerloop iteration 3 ---
-- Innerloop iteration 1 of Outerloop Iteration 3 --
-- Testing fgetc() : file opened using r mode --
string(1) "l"
int(1)
bool(false)
-resource(24) of type (stream)
+resource(%d) of type (stream)
string(1) "i"
int(2)
bool(false)
-resource(24) of type (stream)
+resource(%d) of type (stream)
string(1) "n"
int(3)
bool(false)
-resource(24) of type (stream)
+resource(%d) of type (stream)
string(1) "e"
int(4)
bool(false)
-resource(24) of type (stream)
+resource(%d) of type (stream)
string(1) "
"
int(5)
bool(false)
-resource(24) of type (stream)
+resource(%d) of type (stream)
string(1) "l"
int(6)
bool(false)
-resource(24) of type (stream)
+resource(%d) of type (stream)
-- Innerloop iteration 2 of Outerloop Iteration 3 --
-- Testing fgetc() : file opened using rb mode --
string(1) "l"
int(1)
bool(false)
-resource(25) of type (stream)
+resource(%d) of type (stream)
string(1) "i"
int(2)
bool(false)
-resource(25) of type (stream)
+resource(%d) of type (stream)
string(1) "n"
int(3)
bool(false)
-resource(25) of type (stream)
+resource(%d) of type (stream)
string(1) "e"
int(4)
bool(false)
-resource(25) of type (stream)
+resource(%d) of type (stream)
string(1) "
"
int(5)
bool(false)
-resource(25) of type (stream)
+resource(%d) of type (stream)
string(1) "l"
int(6)
bool(false)
-resource(25) of type (stream)
+resource(%d) of type (stream)
-- Innerloop iteration 3 of Outerloop Iteration 3 --
-- Testing fgetc() : file opened using rt mode --
string(1) "l"
int(1)
bool(false)
-resource(26) of type (stream)
+resource(%d) of type (stream)
string(1) "i"
int(2)
bool(false)
-resource(26) of type (stream)
+resource(%d) of type (stream)
string(1) "n"
int(3)
bool(false)
-resource(26) of type (stream)
+resource(%d) of type (stream)
string(1) "e"
int(4)
bool(false)
-resource(26) of type (stream)
+resource(%d) of type (stream)
string(1) "
"
int(5)
bool(false)
-resource(26) of type (stream)
+resource(%d) of type (stream)
string(1) "l"
int(6)
bool(false)
-resource(26) of type (stream)
+resource(%d) of type (stream)
-- Innerloop iteration 4 of Outerloop Iteration 3 --
-- Testing fgetc() : file opened using r+ mode --
string(1) "l"
int(1)
bool(false)
-resource(27) of type (stream)
+resource(%d) of type (stream)
string(1) "i"
int(2)
bool(false)
-resource(27) of type (stream)
+resource(%d) of type (stream)
string(1) "n"
int(3)
bool(false)
-resource(27) of type (stream)
+resource(%d) of type (stream)
string(1) "e"
int(4)
bool(false)
-resource(27) of type (stream)
+resource(%d) of type (stream)
string(1) "
"
int(5)
bool(false)
-resource(27) of type (stream)
+resource(%d) of type (stream)
string(1) "l"
int(6)
bool(false)
-resource(27) of type (stream)
+resource(%d) of type (stream)
-- Innerloop iteration 5 of Outerloop Iteration 3 --
-- Testing fgetc() : file opened using r+b mode --
string(1) "l"
int(1)
bool(false)
-resource(28) of type (stream)
+resource(%d) of type (stream)
string(1) "i"
int(2)
bool(false)
-resource(28) of type (stream)
+resource(%d) of type (stream)
string(1) "n"
int(3)
bool(false)
-resource(28) of type (stream)
+resource(%d) of type (stream)
string(1) "e"
int(4)
bool(false)
-resource(28) of type (stream)
+resource(%d) of type (stream)
string(1) "
"
int(5)
bool(false)
-resource(28) of type (stream)
+resource(%d) of type (stream)
string(1) "l"
int(6)
bool(false)
-resource(28) of type (stream)
+resource(%d) of type (stream)
-- Innerloop iteration 6 of Outerloop Iteration 3 --
-- Testing fgetc() : file opened using r+t mode --
string(1) "l"
int(1)
bool(false)
-resource(29) of type (stream)
+resource(%d) of type (stream)
string(1) "i"
int(2)
bool(false)
-resource(29) of type (stream)
+resource(%d) of type (stream)
string(1) "n"
int(3)
bool(false)
-resource(29) of type (stream)
+resource(%d) of type (stream)
string(1) "e"
int(4)
bool(false)
-resource(29) of type (stream)
+resource(%d) of type (stream)
string(1) "
"
int(5)
bool(false)
-resource(29) of type (stream)
+resource(%d) of type (stream)
string(1) "l"
int(6)
bool(false)
-resource(29) of type (stream)
+resource(%d) of type (stream)
Done
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
