tony2001 Wed Dec 27 15:26:13 2006 UTC
Modified files:
/php-src/ext/standard/tests/file fscanf.phpt
/php-src/ext/standard/tests/strings bug21730.phpt
Log:
fix *scanf() tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/fscanf.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/file/fscanf.phpt
diff -u php-src/ext/standard/tests/file/fscanf.phpt:1.1
php-src/ext/standard/tests/file/fscanf.phpt:1.2
--- php-src/ext/standard/tests/file/fscanf.phpt:1.1 Tue Nov 14 21:59:02 2006
+++ php-src/ext/standard/tests/file/fscanf.phpt Wed Dec 27 15:26:13 2006
@@ -11,17 +11,17 @@
file_put_contents($filename, "data");
-$fp = fopen($filename, "r");
+$fp = fopen($filename, "rt");
var_dump(fscanf($fp, "%d", $v));
var_dump($v);
fclose($fp);
-$fp = fopen($filename, "r");
+$fp = fopen($filename, "rt");
var_dump(fscanf($fp, "%s", $v));
var_dump($v);
fclose($fp);
-$fp = fopen($filename, "r");
+$fp = fopen($filename, "rt");
var_dump(fscanf($fp, "%s", $v, $v1));
var_dump($v);
var_dump($v1);
@@ -29,7 +29,7 @@
$v = array();
$v1 = array();
-$fp = fopen($filename, "r");
+$fp = fopen($filename, "rt");
var_dump(fscanf($fp, "", $v, $v1));
var_dump($v);
var_dump($v1);
@@ -37,7 +37,7 @@
$v = array();
$v1 = array();
-$fp = fopen($filename, "r");
+$fp = fopen($filename, "rt");
var_dump(fscanf($fp, "%.a", $v, $v1));
var_dump($v);
var_dump($v1);
@@ -46,14 +46,14 @@
@unlink($filename);
touch($filename);
-$fp = fopen($filename, "r");
+$fp = fopen($filename, "rt");
var_dump(fscanf($fp, "%s", $v));
var_dump($v);
fclose($fp);
file_put_contents($filename, "data");
-$fp = fopen($filename, "r");
+$fp = fopen($filename, "rt");
var_dump(fscanf($fp, "%s%d", $v));
@unlink($filename);
@@ -98,3 +98,42 @@
Warning: fscanf(): Different numbers of variable names and field specifiers in
%s on line %d
int(-1)
Done
+--UEXPECTF--
+Warning: Wrong parameter count for fscanf() in %s on line %d
+NULL
+
+Warning: Wrong parameter count for fscanf() in %s on line %d
+NULL
+
+Warning: fscanf(): supplied argument is not a valid File-Handle resource in %s
on line %d
+bool(false)
+int(0)
+NULL
+int(1)
+unicode(4) "data"
+
+Warning: fscanf(): Variable is not assigned by any conversion specifiers in %s
on line %d
+int(-1)
+unicode(4) "data"
+NULL
+
+Warning: fscanf(): Variable is not assigned by any conversion specifiers in %s
on line %d
+int(-1)
+array(0) {
+}
+array(0) {
+}
+
+Warning: fscanf(): Bad scan conversion character "." in %s on line %d
+int(-1)
+array(0) {
+}
+array(0) {
+}
+bool(false)
+array(0) {
+}
+
+Warning: fscanf(): Different numbers of variable names and field specifiers in
%s on line %d
+int(-1)
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug21730.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/strings/bug21730.phpt
diff -u php-src/ext/standard/tests/strings/bug21730.phpt:1.2
php-src/ext/standard/tests/strings/bug21730.phpt:1.3
--- php-src/ext/standard/tests/strings/bug21730.phpt:1.2 Sat Jan 18
19:02:21 2003
+++ php-src/ext/standard/tests/strings/bug21730.phpt Wed Dec 27 15:26:13 2006
@@ -33,3 +33,20 @@
[2]=>
int(9)
}
+--UEXPECT--
+array(3) {
+ [0]=>
+ unicode(3) "ABC"
+ [1]=>
+ unicode(3) "DEF"
+ [2]=>
+ int(9)
+}
+array(3) {
+ [0]=>
+ unicode(3) "ABC"
+ [1]=>
+ unicode(3) "DEF"
+ [2]=>
+ int(9)
+}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
