From 4a3070757b2abf40deaa6db0df627ac8b5ba46da Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Mon, 16 Apr 2012 12:18:17 +1200 Subject: [PATCH] MINOR Fixed tests --- tests/core/CoreTest.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/core/CoreTest.php b/tests/core/CoreTest.php index ce45407a4..c3a1e44d7 100644 --- a/tests/core/CoreTest.php +++ b/tests/core/CoreTest.php @@ -20,26 +20,26 @@ class CoreTest extends SapphireTest { $this->assertEquals(getTempFolder(), $this->tempPath); } else { // A typical Windows location for where sites are stored on IIS - $this->assertEquals(getTempFolder('C:\\inetpub\\wwwroot\\silverstripe-test-project'), getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe-test-project'); + $this->assertEquals(getTempFolder('C:\\inetpub\\wwwroot\\silverstripe-test-project'), sys_get_temp_dir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe-test-project'); // A typical Mac OS X location for where sites are stored - $this->assertEquals(getTempFolder('/Users/joebloggs/Sites/silverstripe-test-project'), getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe-test-project'); + $this->assertEquals(getTempFolder('/Users/joebloggs/Sites/silverstripe-test-project'), sys_get_temp_dir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe-test-project'); // A typical Linux location for where sites are stored - $this->assertEquals(getTempFolder('/var/www/silverstripe-test-project'), getSysTempDir() . '/silverstripe-cache-var-www-silverstripe-test-project'); + $this->assertEquals(getTempFolder('/var/www/silverstripe-test-project'), sys_get_temp_dir() . '/silverstripe-cache-var-www-silverstripe-test-project'); } } public function tearDown() { parent::tearDown(); - if(file_exists(getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe-test-project')) { - rmdir(getSysTempDir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe-test-project'); + if(file_exists(sys_get_temp_dir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe-test-project')) { + rmdir(sys_get_temp_dir() . '/silverstripe-cacheC--inetpub-wwwroot-silverstripe-test-project'); } - if(file_exists(getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe-test-project')) { - rmdir(getSysTempDir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe-test-project'); + if(file_exists(sys_get_temp_dir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe-test-project')) { + rmdir(sys_get_temp_dir() . '/silverstripe-cache-Users-joebloggs-Sites-silverstripe-test-project'); } - if(file_exists(getSysTempDir() . '/silverstripe-cache-var-www-silverstripe-test-project')) { - rmdir(getSysTempDir() . '/silverstripe-cache-var-www-silverstripe-test-project'); + if(file_exists(sys_get_temp_dir() . '/silverstripe-cache-var-www-silverstripe-test-project')) { + rmdir(sys_get_temp_dir() . '/silverstripe-cache-var-www-silverstripe-test-project'); } }