tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Removed specific removal of temporary directory in ManifestBuilderTest::testThemeRetrieval() and replaced it with Filesystem::replaceFolder() which does the same thing (from r98098)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102593 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-04-13 02:08:35 +00:00
parent 91918ccfe1
commit 9a56e31bfb
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/ManifestBuilderTest.php
View File

@ -130,20 +130,8 @@ class ManifestBuilderTest extends SapphireTest {
function testThemeRetrieval() {
$ds = DIRECTORY_SEPARATOR;
$testThemeBaseDir = TEMP_FOLDER . $ds . 'test-themes';
// If the test directory somehow exists after a failed test, remove all the files and directories inside
if(file_exists($testThemeBaseDir)) {
$handle = opendir($testThemeBaseDir);
while(false !== ($file = readdir($handle))) {
$fullPath = $testThemeBaseDir . $ds . $file;
if(strpos($file, '.') === false) {
if(is_dir($fullPath)) rmdir($fullPath);
else unlink($fullPath);
}
}
closedir($handle);
rmdir($testThemeBaseDir);
}
if(file_exists($testThemeBaseDir)) Filesystem::removeFolder($testThemeBaseDir);
mkdir($testThemeBaseDir);
mkdir($testThemeBaseDir . $ds . 'blackcandy');
@ -164,16 +152,7 @@ class ManifestBuilderTest extends SapphireTest {
), ManifestBuilder::get_themes($testThemeBaseDir, true), 'Our test theme directory contains 2 themes and 2 sub-themes');
// Remove all the test themes we created
$handle = opendir($testThemeBaseDir);
while(false !== ($file = readdir($handle))) {
$fullPath = $testThemeBaseDir . $ds . $file;
if(strpos($file, '.') === false) {
if(is_dir($fullPath)) rmdir($fullPath);
else unlink($fullPath);
}
}
closedir($handle);
rmdir($testThemeBaseDir);
Filesystem::removeFolder($testThemeBaseDir);
}
function tearDown() {