فهرست منبع

[Finder] Fixed Finder tests without explicit sorting across different operating systems

Bernhard Schussek 15 سال پیش
والد
کامیت
fd3243a943

+ 10 - 0
tests/Symfony/Tests/Components/Finder/Iterator/IteratorTestCase.php

@@ -19,6 +19,16 @@ class IteratorTestCase extends \PHPUnit_Framework_TestCase
     {
         $values = array_map(function (\SplFileInfo $fileinfo) { return $fileinfo->getPathname(); }, iterator_to_array($iterator));
 
+        sort($values);
+        sort($expected);
+
+        $this->assertEquals($expected, array_values($values));
+    }
+
+    protected function assertOrderedIterator($expected, \Iterator $iterator)
+    {
+        $values = array_map(function (\SplFileInfo $fileinfo) { return $fileinfo->getPathname(); }, iterator_to_array($iterator));
+
         $this->assertEquals($expected, array_values($values));
     }
 }

+ 1 - 1
tests/Symfony/Tests/Components/Finder/Iterator/SortableIteratorTest.php

@@ -36,7 +36,7 @@ class SortableIteratorTest extends RealIteratorTestCase
 
         $iterator = new SortableIterator($inner, $mode);
 
-        $this->assertIterator($expected, $iterator);
+        $this->assertOrderedIterator($expected, $iterator);
     }
 
     public function getAcceptData()