- Move tests to proper location now that the tested classes are hardcoded

diff --git a/ext/spl/examples/tests/iterators_001.phpt b/ext/spl/tests/iterator_017.phpt
similarity index 88%
rename from ext/spl/examples/tests/iterators_001.phpt
rename to ext/spl/tests/iterator_017.phpt
index 5b4a6ffd0f42c7e9a43a263ea21357de4013dbcd..39d1000f62d6317533a38696906c3b622c06045e 100755 (executable)
--- a/ext/spl/examples/tests/iterators_001.phpt
+++ b/ext/spl/tests/iterator_017.phpt
@@ -3,8 +3,6 @@ SPL: EmptyIterator
 --FILE--
 <?php
 
-require_once('examples.inc');
-
 echo "===EmptyIterator===\n";
 
 foreach(new LimitIterator(new EmptyIterator(), 0, 3) as $key => $val)

diff --git a/ext/spl/examples/tests/iterators_002.phpt b/ext/spl/tests/iterator_018.phpt
similarity index 96%
rename from ext/spl/examples/tests/iterators_002.phpt
rename to ext/spl/tests/iterator_018.phpt
index dcbaa9c875554cabc29f355aa871e4a5a29174a5..9c234bb11d2a1829814a1d412e1a0b928c7c75ad 100755 (executable)
--- a/ext/spl/examples/tests/iterators_002.phpt
+++ b/ext/spl/tests/iterator_018.phpt
@@ -3,8 +3,6 @@ SPL: InfiniteIterator
 --FILE--
 <?php
 
-require_once('examples.inc');
-
 echo "===EmptyIterator===\n";
 
 foreach(new LimitIterator(new InfiniteIterator(new EmptyIterator()), 0, 3) as $key=>$val)

diff --git a/ext/spl/examples/tests/iterators_003.phpt b/ext/spl/tests/iterator_019.phpt
similarity index 93%
rename from ext/spl/examples/tests/iterators_003.phpt
rename to ext/spl/tests/iterator_019.phpt
index f6d047de754902bdb68fff7f1cca4b05be9d99be..09842b0988e6672717cb31c045fb8a8d25028f8e 100755 (executable)
--- a/ext/spl/examples/tests/iterators_003.phpt
+++ b/ext/spl/tests/iterator_019.phpt
@@ -3,8 +3,6 @@ SPL: NoRweindIterator
 --FILE--
 <?php
 
-require_once('examples.inc');
-
 echo "===Current===\n";
 
 $it = new NoRewindIterator(new ArrayIterator(array(0 => 'A', 1 => 'B', 2 => 'C')));

diff --git a/ext/spl/examples/tests/iterators_004.phpt b/ext/spl/tests/iterator_020.phpt
similarity index 96%
rename from ext/spl/examples/tests/iterators_004.phpt
rename to ext/spl/tests/iterator_020.phpt
index 83827e29ba45ce836a5f93727efb573978646f8b..119631c00038a07e7b31b61a97f02bbaf2af7dea 100755 (executable)
--- a/ext/spl/examples/tests/iterators_004.phpt
+++ b/ext/spl/tests/iterator_020.phpt
@@ -3,8 +3,6 @@ SPL: AppendIterator
 --FILE--
 <?php
 
-require_once('examples.inc');
-
 echo "===Empty===\n";
 
 $it = new AppendIterator;