Skip to content

Commit

Permalink
Merge pull request #76 from sebkrueger/issue73_directory_iteration_te…
Browse files Browse the repository at this point in the history 
…st_case

Fix recursiveDirectoryIteration testcases on windows systems
  • Loading branch information
@mikey179
mikey179 committed Apr 11, 2014
2 parents 545e3fb + e2dd5a2 commit 5d97488
Showing 1 changed file with 27 additions and 27 deletions.
54 changes: 27 additions & 27 deletions src/test/php/org/bovigo/vfs/DirectoryIterationTestCase.php
View file
Expand Up @@ -251,25 +251,25 @@ public function recursiveDirectoryIterationWithDotsEnabled()
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($rootPath),
\RecursiveIteratorIterator::CHILD_FIRST);
$pathes = array();
foreach ($iterator as $path) {
$pathes[] = $path;
foreach ($iterator as $fullFileName => $fileSPLObject) {
$pathes[] = $fullFileName;
}

$this->assertEquals(array('vfs://root/.',
'vfs://root/..',
'vfs://root/Core/.',
'vfs://root/Core/..',
'vfs://root/Core/AbstractFactory/.',
'vfs://root/Core/AbstractFactory/..',
'vfs://root/Core/AbstractFactory/test.php',
'vfs://root/Core/AbstractFactory/other.php',
'vfs://root/Core/AbstractFactory/Invalid.csv',
'vfs://root/Core/AbstractFactory',
'vfs://root/Core/AnEmptyFolder/.',
'vfs://root/Core/AnEmptyFolder/..',
'vfs://root/Core/AnEmptyFolder',
'vfs://root/Core/badlocation.php',
'vfs://root/Core'
$this->assertEquals(array('vfs://root'.DIRECTORY_SEPARATOR.'.',
'vfs://root'.DIRECTORY_SEPARATOR.'..',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'.',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'..',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'AbstractFactory'.DIRECTORY_SEPARATOR.'.',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'AbstractFactory'.DIRECTORY_SEPARATOR.'..',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'AbstractFactory'.DIRECTORY_SEPARATOR.'test.php',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'AbstractFactory'.DIRECTORY_SEPARATOR.'other.php',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'AbstractFactory'.DIRECTORY_SEPARATOR.'Invalid.csv',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'AbstractFactory',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'AnEmptyFolder'.DIRECTORY_SEPARATOR.'.',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'AnEmptyFolder'.DIRECTORY_SEPARATOR.'..',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'AnEmptyFolder',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'badlocation.php',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'
),
$pathes
);
Expand Down Expand Up @@ -300,19 +300,19 @@ public function recursiveDirectoryIterationWithDotsDisabled()
$iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($rootPath),
\RecursiveIteratorIterator::CHILD_FIRST);
$pathes = array();
foreach ($iterator as $path) {
$pathes[] = $path;
foreach ($iterator as $fullFileName => $fileSPLObject) {
$pathes[] = $fullFileName;
}

$this->assertEquals(array('vfs://root/Core/AbstractFactory/test.php',
'vfs://root/Core/AbstractFactory/other.php',
'vfs://root/Core/AbstractFactory/Invalid.csv',
'vfs://root/Core/AbstractFactory',
'vfs://root/Core/AnEmptyFolder',
'vfs://root/Core/badlocation.php',
'vfs://root/Core'
$this->assertEquals(array('vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'AbstractFactory'.DIRECTORY_SEPARATOR.'test.php',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'AbstractFactory'.DIRECTORY_SEPARATOR.'other.php',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'AbstractFactory'.DIRECTORY_SEPARATOR.'Invalid.csv',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'AbstractFactory',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'AnEmptyFolder',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'badlocation.php',
'vfs://root'.DIRECTORY_SEPARATOR.'Core'
),
$pathes
);
}
}
}

0 comments on commit 5d97488

Please sign in to comment.