diff --git a/test/core/dictApcuTest.php b/test/core/dictApcuTest.php index 1aada7ca77..0c48427d2d 100644 --- a/test/core/dictApcuTest.php +++ b/test/core/dictApcuTest.php @@ -45,9 +45,9 @@ class dictApcuTest extends ItopTestCase protected function setUp() { parent::setUp(); - require_once (APPROOT.'core/coreexception.class.inc.php'); - require_once (APPROOT.'core/dict.class.inc.php'); - require_once (APPROOT.'core/apc-service.class.inc.php'); + require_once (APPROOT.'core' . DIRECTORY_SEPARATOR . 'coreexception.class.inc.php'); + require_once (APPROOT.'core' . DIRECTORY_SEPARATOR . 'dict.class.inc.php'); + require_once (APPROOT.'core' . DIRECTORY_SEPARATOR . 'apc-service.class.inc.php'); $this->sEnvName = date("c"); $_SESSION['itop_env'] = $this->sEnvName; @@ -63,7 +63,7 @@ class dictApcuTest extends ItopTestCase private function InitDictionnaries(){ clearstatcache(); - $this->sDictionaryFolder = APPROOT."env-$this->sEnvName/dictionaries"; + $this->sDictionaryFolder = APPROOT."env-$this->sEnvName" . DIRECTORY_SEPARATOR . "dictionaries"; @mkdir($this->sDictionaryFolder, 0777, true); $sLabels = <<sEnvName/dictionaries/*") as $sFile){ + foreach (glob(APPROOT."env-$this->sEnvName" . DIRECTORY_SEPARATOR . "dictionaries" . DIRECTORY_SEPARATOR . "*") as $sFile){ unlink($sFile); } - rmdir(APPROOT."env-$this->sEnvName/dictionaries"); + rmdir(APPROOT."env-$this->sEnvName" . DIRECTORY_SEPARATOR . "dictionaries"); rmdir(APPROOT."env-$this->sEnvName"); } diff --git a/test/core/dictTest.php b/test/core/dictTest.php index bd2179947b..f57b48d5b5 100644 --- a/test/core/dictTest.php +++ b/test/core/dictTest.php @@ -42,11 +42,11 @@ class dictTest extends ItopTestCase protected function setUp() { parent::setUp(); - require_once (APPROOT.'core/coreexception.class.inc.php'); - require_once (APPROOT.'core/dict.class.inc.php'); - require_once (APPROOT.'core/apc-service.class.inc.php'); + require_once (APPROOT.'core'. DIRECTORY_SEPARATOR . 'coreexception.class.inc.php'); + require_once (APPROOT.'core'. DIRECTORY_SEPARATOR . 'dict.class.inc.php'); + require_once (APPROOT.'core'. DIRECTORY_SEPARATOR . 'apc-service.class.inc.php'); $this->sEnvName = date("c"); - $sDictionaryFolder = APPROOT."env-$this->sEnvName/dictionaries"; + $sDictionaryFolder = APPROOT."env-$this->sEnvName" . DIRECTORY_SEPARATOR . "dictionaries"; @mkdir($sDictionaryFolder, 0777, true); $sContent = << 'gabu', )); PHP; - file_put_contents("$sDictionaryFolder/fr-fr.dict.php", $sContent); + file_put_contents($sDictionaryFolder . DIRECTORY_SEPARATOR . "fr-fr.dict.php", $sContent); $sContent = << 'zomeu', )); PHP; - file_put_contents("$sDictionaryFolder/en-en.dict.php", $sContent); + file_put_contents($sDictionaryFolder . DIRECTORY_SEPARATOR . "en-en.dict.php", $sContent); $_SESSION['itop_env'] = $this->sEnvName; //require_once 'mockDict.incphp'; @@ -76,10 +76,10 @@ PHP; protected function tearDown() { - foreach (glob(APPROOT."env-$this->sEnvName/dictionaries/*") as $sFile){ + foreach (glob(APPROOT."env-$this->sEnvName" . DIRECTORY_SEPARATOR . "dictionaries" . DIRECTORY_SEPARATOR . "*") as $sFile){ unlink($sFile); } - rmdir(APPROOT."env-$this->sEnvName/dictionaries"); + rmdir(APPROOT."env-$this->sEnvName" . DIRECTORY_SEPARATOR . "dictionaries"); rmdir(APPROOT."env-$this->sEnvName"); }