cvs: ZendEngine2(PHP_5_2) /tests 019.phpt bug30162.phpt
wharmby Mon Jul 6 19:34:56 2009 UTC
Modified files: (Branch: PHP_5_2)
/ZendEngine2/tests 019.phpt bug30162.phpt
Log:
Fix test
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/019.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: ZendEngine2/tests/019.phpt
diff -u ZendEngine2/tests/019.phpt:1.2.2.2 ZendEngine2/tests/019.phpt:1.2.2.3
--- ZendEngine2/tests/019.phpt:1.2.2.2 Mon Jun 11 15:55:44 2007
+++ ZendEngine2/tests/019.phpt Mon Jul 6 19:34:56 2009
@@ -359,7 +359,8 @@
//Note: No error conditions relating to passing arugments can be tested
// because these are not functions but statements, it will result in syntax error.
-echo "Done\n";
+?>
+===DONE===
--EXPECTF--
*** Testing unset(), empty() & isset() with scalar variables ***
-- Iteration 1 --
@@ -1185,11 +1186,11 @@
*** Testing unset(), emtpy() & isset() with resource variables ***
-- Iteration 1 --
-resource(5) of type (stream)
+resource(%d) of type (stream)
bool(true)
bool(false)
bool(true)
-resource(5) of type (stream)
+resource(%d) of type (stream)
bool(false)
bool(true)
bool(false)
@@ -1198,11 +1199,11 @@
Notice: Undefined variable: resource in %s on line %d
NULL
-- Iteration 2 --
-resource(6) of type (stream)
+resource(%d) of type (stream)
bool(true)
bool(false)
bool(true)
-resource(6) of type (stream)
+resource(%d) of type (stream)
bool(false)
bool(true)
bool(false)
@@ -1217,7 +1218,7 @@
bool(true)
*** Testing unset(), empty() & isset() with objects ***
-object(Point)#1 (3) {
+object(Point)#%d (3) {
["x"]=>
int(30)
["y"]=>
@@ -1239,7 +1240,7 @@
Notice: Undefined variable: lable in %s on line %d
bool(true)
-object(Point)#1 (3) {
+object(Point)#%d (3) {
["x"]=>
int(30)
["y"]=>
@@ -1247,7 +1248,7 @@
["lable"]=>
string(6) "Point1"
}
-object(Point)#1 (2) {
+object(Point)#%d (2) {
["y"]=>
int(40)
["lable"]=>
@@ -1255,7 +1256,7 @@
}
bool(false)
bool(true)
-object(Point)#1 (0) {
+object(Point)#%d (0) {
}
bool(true)
bool(false)
@@ -1276,7 +1277,7 @@
[2]=>
string(9) "testPoint"
}
-object(Point)#1 (3) {
+object(Point)#%d (3) {
["x"]=>
int(5)
["y"]=>
@@ -1329,4 +1330,4 @@
bool(false)
bool(true)
int(10)
-Done
+===DONE===
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/bug30162.phpt?r1=1.2&r2=1.2.4.1&diff_format=u
Index: ZendEngine2/tests/bug30162.phpt
diff -u ZendEngine2/tests/bug30162.phpt:1.2 ZendEngine2/tests/bug30162.phpt:1.2.4.1
--- ZendEngine2/tests/bug30162.phpt:1.2 Fri Jun 10 10:46:04 2005
+++ ZendEngine2/tests/bug30162.phpt Mon Jul 6 19:34:56 2009
@@ -41,12 +41,14 @@
var_dump($db);
?>
+===DONE===
--EXPECTF--
Notice: Undefined variable: db in %sbug30162.php on line 35
NULL
-object(hariCow)#1 (2) {
+object(hariCow)#%d (2) {
["x"]=>
string(1) "x"
["y"]=>
string(1) "y"
}
+===DONE===
\ No newline at end of file
Thread (1 message)
- andy wharmby