summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaghubansh Kumar <kraghuba@php.net>2007-12-24 04:27:55 +0000
committerRaghubansh Kumar <kraghuba@php.net>2007-12-24 04:27:55 +0000
commit8204525427c73bb418d50d92bf69b3aa85a1fa2e (patch)
tree0966c0ce73d36cf0426b014152134517da573c8b
parente54a85595591d669cbe17a1b3ce31f5db12e4f38 (diff)
downloadphp-git-8204525427c73bb418d50d92bf69b3aa85a1fa2e.tar.gz
fix tests
-rw-r--r--ext/standard/tests/strings/sprintf_variation48.phpt34
-rw-r--r--ext/standard/tests/strings/sprintf_variation5.phpt17
2 files changed, 27 insertions, 24 deletions
diff --git a/ext/standard/tests/strings/sprintf_variation48.phpt b/ext/standard/tests/strings/sprintf_variation48.phpt
index df28784eb2..91cd7e04b7 100644
--- a/ext/standard/tests/strings/sprintf_variation48.phpt
+++ b/ext/standard/tests/strings/sprintf_variation48.phpt
@@ -39,7 +39,7 @@ foreach($resource_values as $resource_value) {
// closing the resources
fclose($fp);
-fclose($dfp);
+closedir($dfp);
echo "Done";
@@ -48,32 +48,32 @@ echo "Done";
*** Testing sprintf() : scientific formats with resource values ***
-- Iteration 1 --
-string(%d) "%d.000000e+0"
+string(%d) "%f"
string(1) "e"
-string(%d) "%d.000000e+0"
+string(%d) "%f"
string(1) "e"
-string(%d) " %d.000000e+0"
-string(%d) "%d.000000e+0 "
-string(%d) " %d.000000e+0"
+string(%d) " %f"
+string(%d) "%f "
+string(%d) " %f"
string(%d) "
-%d.000000e+0"
-string(%d) "%d.000000e+0"
-string(%d) " %d.000000e+0"
+%f"
+string(%d) "%f"
+string(%d) "%s%f"
string(4) "0-1]"
string(1) "e"
-- Iteration 2 --
-string(%d) "%d.000000e+0"
+string(%d) "%f"
string(1) "e"
-string(%d) "%d.000000e+0"
+string(%d) "%f"
string(1) "e"
-string(%d) " %d.000000e+0"
-string(%d) "%d.000000e+0 "
-string(%d) " %d.000000e+0"
+string(%d) " %f"
+string(%d) "%f "
+string(%d) " %f"
string(%d) "
-%d.000000e+0"
-string(%d) "%d.000000e+0"
-string(%d) " %d.000000e+0"
+%f"
+string(%d) "%f"
+string(30) "%s%f"
string(4) "0-1]"
string(1) "e"
Done
diff --git a/ext/standard/tests/strings/sprintf_variation5.phpt b/ext/standard/tests/strings/sprintf_variation5.phpt
index b703d749fb..ee13d3d64b 100644
--- a/ext/standard/tests/strings/sprintf_variation5.phpt
+++ b/ext/standard/tests/strings/sprintf_variation5.phpt
@@ -12,11 +12,14 @@ echo "*** Testing sprintf() : integer formats with resource values ***\n";
// resource type variable
$fp = fopen (__FILE__, "r");
$dfp = opendir ( dirname(__FILE__) );
+
+$fp_copy = $fp;
+$dfp_copy = $dfp;
// array of resource types
$resource_types = array (
- $fp,
- $dfp
+ $fp_copy,
+ $dfp_copy
);
// various integer formats
@@ -38,7 +41,7 @@ foreach($resource_types as $res) {
// closing the resources
fclose($fp);
-fclose($dfp);
+closedir($dfp);
echo "Done";
@@ -53,8 +56,8 @@ string(%d) " %d"
string(%d) " %d"
string(%d) "
%d"
-string(%d) " %d"
-string(4) "0-9]"
+string(%d) "%s%d"
+string(%d) "0-9]"
string(1) "d"
-- Iteration 2 --
@@ -64,7 +67,7 @@ string(%d) " %d"
string(%d) " %d"
string(%d) "
%d"
-string(%d) " %d"
-string(4) "0-9]"
+string(%d) "%s%d"
+string(%d) "0-9]"
string(1) "d"
Done