helly Thu May 19 11:49:45 2005 EDT
Modified files:
/php-src/ext/spl/tests iterator_022.phpt iterator_021.phpt
iterator_016.phpt iterator_015.phpt
iterator_014.phpt
Log:
- Update tests after correcting internal order of actions
http://cvs.php.net/diff.php/php-src/ext/spl/tests/iterator_022.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/spl/tests/iterator_022.phpt
diff -u php-src/ext/spl/tests/iterator_022.phpt:1.1
php-src/ext/spl/tests/iterator_022.phpt:1.2
--- php-src/ext/spl/tests/iterator_022.phpt:1.1 Sat Mar 12 18:03:33 2005
+++ php-src/ext/spl/tests/iterator_022.phpt Thu May 19 11:49:44 2005
@@ -132,7 +132,7 @@
?>
===DONE===
<?php exit(0); ?>
---EXPECTF--
+--EXPECT--
RecursiveArrayIteratorIterator::rewind
RecursiveArrayIteratorIterator::callHasChildren(0) = no/no
RecursiveArrayIteratorIterator::valid
@@ -167,7 +167,7 @@
1=>bbb
RecursiveArrayIteratorIterator::next
RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(1)
+RecursiveArrayIteratorIterator::endChildren(2)
RecursiveArrayIteratorIterator::callHasChildren(1) = yes/yes
RecursiveArrayIteratorIterator::callGetChildren(ok:0)
RecursiveArrayIteratorIterator::current
@@ -182,9 +182,9 @@
RecursiveArrayIteratorIterator::valid
RecursiveArrayIteratorIterator::next
RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(1)
+RecursiveArrayIteratorIterator::endChildren(2)
RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(0)
+RecursiveArrayIteratorIterator::endChildren(1)
RecursiveArrayIteratorIterator::callHasChildren(0) = yes/yes
RecursiveArrayIteratorIterator::callGetChildren(skip)
Objects returned by RecursiveIterator::getChildren() must implement
RecursiveIterator
http://cvs.php.net/diff.php/php-src/ext/spl/tests/iterator_021.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/spl/tests/iterator_021.phpt
diff -u php-src/ext/spl/tests/iterator_021.phpt:1.1
php-src/ext/spl/tests/iterator_021.phpt:1.2
--- php-src/ext/spl/tests/iterator_021.phpt:1.1 Sat Mar 12 18:03:33 2005
+++ php-src/ext/spl/tests/iterator_021.phpt Thu May 19 11:49:44 2005
@@ -113,7 +113,7 @@
?>
===DONE===
<?php exit(0); ?>
---EXPECTF--
+--EXPECT--
RecursiveArrayIteratorIterator::rewind
RecursiveArrayIteratorIterator::callHasChildren(0) = no/no
RecursiveArrayIteratorIterator::valid
@@ -146,7 +146,7 @@
1=>bbb
RecursiveArrayIteratorIterator::next
RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(1)
+RecursiveArrayIteratorIterator::endChildren(2)
RecursiveArrayIteratorIterator::callHasChildren(1) = yes/yes
RecursiveArrayIterator::getChildren
RecursiveArrayIteratorIterator::beginChildren(2)
@@ -160,9 +160,9 @@
RecursiveArrayIteratorIterator::valid
RecursiveArrayIteratorIterator::next
RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(1)
+RecursiveArrayIteratorIterator::endChildren(2)
RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(0)
+RecursiveArrayIteratorIterator::endChildren(1)
RecursiveArrayIteratorIterator::callHasChildren(0) = yes/yes
RecursiveArrayIterator::getChildren
RecursiveArrayIteratorIterator::beginChildren(1)
@@ -172,7 +172,7 @@
0=>ca
RecursiveArrayIteratorIterator::next
RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(0)
+RecursiveArrayIteratorIterator::endChildren(1)
RecursiveArrayIteratorIterator::callHasChildren(0) = no/no
RecursiveArrayIteratorIterator::valid
RecursiveArrayIteratorIterator::current
http://cvs.php.net/diff.php/php-src/ext/spl/tests/iterator_016.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/spl/tests/iterator_016.phpt
diff -u php-src/ext/spl/tests/iterator_016.phpt:1.1
php-src/ext/spl/tests/iterator_016.phpt:1.2
--- php-src/ext/spl/tests/iterator_016.phpt:1.1 Wed Nov 10 14:22:26 2004
+++ php-src/ext/spl/tests/iterator_016.phpt Thu May 19 11:49:44 2005
@@ -43,7 +43,7 @@
function endChildren()
{
- echo str_repeat(' ',$this->getDepth()+1)."</ul>\n";
+ echo str_repeat(' ',$this->getDepth())."</ul>\n";
}
function valid()
{
http://cvs.php.net/diff.php/php-src/ext/spl/tests/iterator_015.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/spl/tests/iterator_015.phpt
diff -u php-src/ext/spl/tests/iterator_015.phpt:1.1
php-src/ext/spl/tests/iterator_015.phpt:1.2
--- php-src/ext/spl/tests/iterator_015.phpt:1.1 Thu Nov 4 17:07:18 2004
+++ php-src/ext/spl/tests/iterator_015.phpt Thu May 19 11:49:44 2005
@@ -30,7 +30,7 @@
function endChildren()
{
- echo str_repeat(' ',$this->getDepth()+1)."</ul>\n";
+ echo str_repeat(' ',$this->getDepth())."</ul>\n";
}
function valid()
{
http://cvs.php.net/diff.php/php-src/ext/spl/tests/iterator_014.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/spl/tests/iterator_014.phpt
diff -u php-src/ext/spl/tests/iterator_014.phpt:1.1
php-src/ext/spl/tests/iterator_014.phpt:1.2
--- php-src/ext/spl/tests/iterator_014.phpt:1.1 Mon Nov 1 17:54:12 2004
+++ php-src/ext/spl/tests/iterator_014.phpt Thu May 19 11:49:44 2005
@@ -80,7 +80,7 @@
?>
===DONE===
<?php exit(0); ?>
---EXPECTF--
+--EXPECT--
RecursiveArrayIteratorIterator::rewind
RecursiveArrayIteratorIterator::valid
RecursiveArrayIteratorIterator::current
@@ -107,7 +107,7 @@
1=>bbb
RecursiveArrayIteratorIterator::next
RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(1)
+RecursiveArrayIteratorIterator::endChildren(2)
RecursiveArrayIterator::getChildren
RecursiveArrayIteratorIterator::beginChildren(2)
RecursiveArrayIterator::getChildren
@@ -118,11 +118,11 @@
0=>bcaa
RecursiveArrayIteratorIterator::next
RecursiveArrayIterator::valid = false
+RecursiveArrayIteratorIterator::endChildren(3)
+RecursiveArrayIterator::valid = false
RecursiveArrayIteratorIterator::endChildren(2)
RecursiveArrayIterator::valid = false
RecursiveArrayIteratorIterator::endChildren(1)
-RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(0)
RecursiveArrayIterator::getChildren
RecursiveArrayIteratorIterator::beginChildren(1)
RecursiveArrayIteratorIterator::valid
@@ -131,7 +131,7 @@
0=>ca
RecursiveArrayIteratorIterator::next
RecursiveArrayIterator::valid = false
-RecursiveArrayIteratorIterator::endChildren(0)
+RecursiveArrayIteratorIterator::endChildren(1)
RecursiveArrayIteratorIterator::valid
RecursiveArrayIteratorIterator::current
RecursiveArrayIteratorIterator::key
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
