From: Marcus Boerger Date: Mon, 10 Nov 2003 18:09:07 +0000 (+0000) Subject: Update test expectations X-Git-Tag: php-5.0.0b3RC1~728 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec9ea44f5902b46af1d8a9fbfa2ca231a29af1d0;p=php Update test expectations --- diff --git a/tests/classes/iterators_001.phpt b/tests/classes/iterators_001.phpt index bef359dd1f..a759b947bb 100755 --- a/tests/classes/iterators_001.phpt +++ b/tests/classes/iterators_001.phpt @@ -111,18 +111,18 @@ c_iter::__construct c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next object:0 +c_iter::next c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next object:1 +c_iter::next c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next object:2 +c_iter::next c_iter::hasMore = false ===foreach/rec=== c::getIterator @@ -130,69 +130,69 @@ c_iter::__construct c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next c::getIterator c_iter::__construct c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next double:0:0 +c_iter::next c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next double:0:1 +c_iter::next c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next double:0:2 +c_iter::next c_iter::hasMore = false +c_iter::next c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next c::getIterator c_iter::__construct c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next double:1:0 +c_iter::next c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next double:1:1 +c_iter::next c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next double:1:2 +c_iter::next c_iter::hasMore = false +c_iter::next c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next c::getIterator c_iter::__construct c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next double:2:0 +c_iter::next c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next double:2:1 +c_iter::next c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next double:2:2 +c_iter::next c_iter::hasMore = false +c_iter::next c_iter::hasMore = false ===foreach/key=== c::getIterator @@ -200,17 +200,17 @@ c_iter::__construct c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next object:1st=>0 +c_iter::next c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next object:2nd=>1 +c_iter::next c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next object:3rd=>2 +c_iter::next c_iter::hasMore = false -Done \ No newline at end of file +Done diff --git a/tests/classes/iterators_002.phpt b/tests/classes/iterators_002.phpt index 54bb1a3c14..537b2138bf 100755 --- a/tests/classes/iterators_002.phpt +++ b/tests/classes/iterators_002.phpt @@ -78,42 +78,39 @@ c_iter::rewind c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next c::getIterator c_iter::__construct c_iter::rewind c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next double:0:0 c_iter::__destruct +c_iter::next c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next c::getIterator c_iter::__construct c_iter::rewind c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next double:1:0 c_iter::__destruct +c_iter::next c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next c::getIterator c_iter::__construct c_iter::rewind c_iter::hasMore = true c_iter::current c_iter::key -c_iter::next double:2:0 c_iter::__destruct +c_iter::next c_iter::hasMore = false c_iter::__destruct c::__destruct diff --git a/tests/classes/iterators_003.phpt b/tests/classes/iterators_003.phpt index 707458af6d..dd27753ad0 100755 --- a/tests/classes/iterators_003.phpt +++ b/tests/classes/iterators_003.phpt @@ -77,43 +77,40 @@ c_iter::__construct c_iter::rewind c_iter::hasMore = true c_iter::current -c_iter::next continue outer +c_iter::next c_iter::hasMore = true c_iter::current -c_iter::next c::getIterator c_iter::__construct c_iter::rewind c_iter::hasMore = true c_iter::current -c_iter::next double:1:0 +c_iter::next c_iter::hasMore = true c_iter::current -c_iter::next continue inner +c_iter::next c_iter::hasMore = true c_iter::current -c_iter::next break inner +c_iter::next c_iter::hasMore = true c_iter::current -c_iter::next c::getIterator c_iter::__construct c_iter::rewind c_iter::hasMore = true c_iter::current -c_iter::next double:2:0 +c_iter::next c_iter::hasMore = true c_iter::current -c_iter::next continue inner +c_iter::next c_iter::hasMore = true c_iter::current -c_iter::next break inner break outer Done