diff --git a/tests/php-unit-tests/ItopDataTestCase.php b/tests/php-unit-tests/ItopDataTestCase.php index b563e649a..7bc24f57b 100644 --- a/tests/php-unit-tests/ItopDataTestCase.php +++ b/tests/php-unit-tests/ItopDataTestCase.php @@ -80,9 +80,8 @@ class ItopDataTestCase extends ItopTestCase protected function setUp(): void { parent::setUp(); - require_once(APPROOT.'/application/startup.inc.php'); - - require_once(APPROOT.'application/utils.inc.php'); + $this->RequireOnceItopFile('application/startup.inc.php'); + $this->RequireOnceItopFile('application/utils.inc.php'); $sEnv = 'production'; $sConfigFile = APPCONF.$sEnv.'/'.ITOP_CONFIG_FILE; diff --git a/tests/php-unit-tests/integration-tests/iTopModulesPhpVersionChecklistTest.php b/tests/php-unit-tests/integration-tests/iTopModulesPhpVersionChecklistTest.php index 9c66bda8e..e4b7b5e82 100644 --- a/tests/php-unit-tests/integration-tests/iTopModulesPhpVersionChecklistTest.php +++ b/tests/php-unit-tests/integration-tests/iTopModulesPhpVersionChecklistTest.php @@ -64,8 +64,8 @@ class iTopModulesPhpVersionIntegrationTest extends ItopTestCase { parent::setUp(); - require_once APPROOT.'core/config.class.inc.php'; - require_once APPROOT.'application/utils.inc.php'; + $this->RequireOnceItopFile('core/config.class.inc.php'); + $this->RequireOnceItopFile('application/utils.inc.php'); if (is_dir(APPROOT.'datamodels/2.x')) { $DatamodelsPath = APPROOT.'datamodels/2.x'; diff --git a/tests/php-unit-tests/integration-tests/iTopModulesXmlVersionChecklistTest.php b/tests/php-unit-tests/integration-tests/iTopModulesXmlVersionChecklistTest.php index 3cdb3cc25..de9bafa56 100644 --- a/tests/php-unit-tests/integration-tests/iTopModulesXmlVersionChecklistTest.php +++ b/tests/php-unit-tests/integration-tests/iTopModulesXmlVersionChecklistTest.php @@ -31,7 +31,7 @@ class iTopModulesXmlVersionIntegrationTest extends ItopTestCase { parent::setUp(); - require_once APPROOT.'setup/itopdesignformat.class.inc.php'; + $this->RequireOnceItopFile('setup/itopdesignformat.class.inc.php'); } diff --git a/tests/php-unit-tests/post-build-integration-tests/iTopDesignFormatChecklistTest.php b/tests/php-unit-tests/post-build-integration-tests/iTopDesignFormatChecklistTest.php index 20b1063c1..875fd01ec 100644 --- a/tests/php-unit-tests/post-build-integration-tests/iTopDesignFormatChecklistTest.php +++ b/tests/php-unit-tests/post-build-integration-tests/iTopDesignFormatChecklistTest.php @@ -21,8 +21,8 @@ class TestForITopDesignFormatClass extends ItopTestCase { parent::setUp(); - require_once APPROOT.'setup/modelfactory.class.inc.php'; - require_once APPROOT.'setup/itopdesignformat.class.inc.php'; + $this->RequireOnceItopFile('setup/modelfactory.class.inc.php'); + $this->RequireOnceItopFile('setup/itopdesignformat.class.inc.php'); } /** diff --git a/tests/php-unit-tests/unitary-tests/core/BulkChangeTest.inc.php b/tests/php-unit-tests/unitary-tests/core/BulkChangeTest.inc.php index 8fc3c93d0..cdb560b1c 100644 --- a/tests/php-unit-tests/unitary-tests/core/BulkChangeTest.inc.php +++ b/tests/php-unit-tests/unitary-tests/core/BulkChangeTest.inc.php @@ -17,8 +17,8 @@ class BulkChangeTest extends ItopDataTestCase { protected function setUp(): void { parent::setUp(); - require_once(APPROOT.'core/coreexception.class.inc.php'); - require_once(APPROOT.'core/bulkchange.class.inc.php'); + $this->RequireOnceItopFile('core/coreexception.class.inc.php'); + $this->RequireOnceItopFile('core/bulkchange.class.inc.php'); } diff --git a/tests/php-unit-tests/unitary-tests/core/CMDBSource/CMDBSourceTest.php b/tests/php-unit-tests/unitary-tests/core/CMDBSource/CMDBSourceTest.php index 106bbd91d..986a79a49 100644 --- a/tests/php-unit-tests/unitary-tests/core/CMDBSource/CMDBSourceTest.php +++ b/tests/php-unit-tests/unitary-tests/core/CMDBSource/CMDBSourceTest.php @@ -24,7 +24,7 @@ class CMDBSourceTest extends ItopTestCase { parent::setUp(); - require_once(APPROOT.'/core/cmdbsource.class.inc.php'); + $this->RequireOnceItopFile('/core/cmdbsource.class.inc.php'); } /** diff --git a/tests/php-unit-tests/unitary-tests/core/CMDBSource/TransactionsTest.php b/tests/php-unit-tests/unitary-tests/core/CMDBSource/TransactionsTest.php index 55b738cc8..3a9480be5 100644 --- a/tests/php-unit-tests/unitary-tests/core/CMDBSource/TransactionsTest.php +++ b/tests/php-unit-tests/unitary-tests/core/CMDBSource/TransactionsTest.php @@ -31,7 +31,7 @@ class TransactionsTest extends ItopTestCase { parent::setUp(); require_once('DeadLockInjection.php'); - require_once(APPROOT.'/core/cmdbsource.class.inc.php'); + $this->RequireOnceItopFile('/core/cmdbsource.class.inc.php'); $sEnv = 'production'; $sConfigFile = APPCONF.$sEnv.'/config-itop.php'; diff --git a/tests/php-unit-tests/unitary-tests/core/ConfigPlaceholdersResolverTest.php b/tests/php-unit-tests/unitary-tests/core/ConfigPlaceholdersResolverTest.php index a4c6868ea..b4e51ea06 100644 --- a/tests/php-unit-tests/unitary-tests/core/ConfigPlaceholdersResolverTest.php +++ b/tests/php-unit-tests/unitary-tests/core/ConfigPlaceholdersResolverTest.php @@ -34,7 +34,7 @@ class ConfigPlaceholdersResolverTest extends ItopTestCase protected function setUp(): void { parent::setUp(); - require_once(APPROOT.'core/config.class.inc.php'); + $this->RequireOnceItopFile('core/config.class.inc.php'); } /** * @dataProvider providerResolve diff --git a/tests/php-unit-tests/unitary-tests/core/ConfigTest.php b/tests/php-unit-tests/unitary-tests/core/ConfigTest.php index 0088ab374..8ab3febc2 100644 --- a/tests/php-unit-tests/unitary-tests/core/ConfigTest.php +++ b/tests/php-unit-tests/unitary-tests/core/ConfigTest.php @@ -34,7 +34,7 @@ class ConfigTest extends ItopTestCase protected function setUp(): void { parent::setUp(); - require_once(APPROOT.'core/config.class.inc.php'); + $this->RequireOnceItopFile('core/config.class.inc.php'); } /** diff --git a/tests/php-unit-tests/unitary-tests/core/ConfigValidator/iTopConfigAstValidatorTest.php b/tests/php-unit-tests/unitary-tests/core/ConfigValidator/iTopConfigAstValidatorTest.php index b30b67f14..5c64b2ea2 100644 --- a/tests/php-unit-tests/unitary-tests/core/ConfigValidator/iTopConfigAstValidatorTest.php +++ b/tests/php-unit-tests/unitary-tests/core/ConfigValidator/iTopConfigAstValidatorTest.php @@ -15,8 +15,8 @@ class iTopConfigAstValidatorTest extends ItopTestCase protected function setUp(): void { parent::setUp(); - require_once APPROOT.'env-production/itop-config/src/Validator/iTopConfigAstValidator.php'; - require_once APPROOT.'env-production/itop-config/src/Validator/ConfigNodesVisitor.php'; + $this->RequireOnceItopFile('env-production/itop-config/src/Validator/iTopConfigAstValidator.php'); + $this->RequireOnceItopFile('env-production/itop-config/src/Validator/ConfigNodesVisitor.php'); } public function testValidateFileValid() diff --git a/tests/php-unit-tests/unitary-tests/core/DBObjectTest.php b/tests/php-unit-tests/unitary-tests/core/DBObjectTest.php index 50d47d67f..3f5630ec3 100644 --- a/tests/php-unit-tests/unitary-tests/core/DBObjectTest.php +++ b/tests/php-unit-tests/unitary-tests/core/DBObjectTest.php @@ -43,8 +43,8 @@ class DBObjectTest extends ItopDataTestCase protected function setUp(): void { parent::setUp(); - require_once(APPROOT.'core/coreexception.class.inc.php'); - require_once(APPROOT.'core/dbobject.class.php'); + $this->RequireOnceItopFile('core/coreexception.class.inc.php'); + $this->RequireOnceItopFile('core/dbobject.class.php'); } /** diff --git a/tests/php-unit-tests/unitary-tests/core/DBSearchIntersectTest.php b/tests/php-unit-tests/unitary-tests/core/DBSearchIntersectTest.php index a4d4c4b5b..3fd2d12d9 100644 --- a/tests/php-unit-tests/unitary-tests/core/DBSearchIntersectTest.php +++ b/tests/php-unit-tests/unitary-tests/core/DBSearchIntersectTest.php @@ -21,7 +21,7 @@ class DBSearchIntersectTest extends ItopTestCase protected function setUp(): void { parent::setUp(); - require_once(APPROOT.'application/startup.inc.php'); + $this->RequireOnceItopFile('application/startup.inc.php'); } /** diff --git a/tests/php-unit-tests/unitary-tests/core/DBSearchJoinTest.php b/tests/php-unit-tests/unitary-tests/core/DBSearchJoinTest.php index e590eaa53..6790a3010 100644 --- a/tests/php-unit-tests/unitary-tests/core/DBSearchJoinTest.php +++ b/tests/php-unit-tests/unitary-tests/core/DBSearchJoinTest.php @@ -22,7 +22,7 @@ class DBSearchJoinTest extends ItopDataTestCase { protected function setUp(): void { parent::setUp(); - require_once(APPROOT.'application/startup.inc.php'); + $this->RequireOnceItopFile('application/startup.inc.php'); } /** diff --git a/tests/php-unit-tests/unitary-tests/core/DBSearchTest.php b/tests/php-unit-tests/unitary-tests/core/DBSearchTest.php index 8d29bfc99..19c53b186 100644 --- a/tests/php-unit-tests/unitary-tests/core/DBSearchTest.php +++ b/tests/php-unit-tests/unitary-tests/core/DBSearchTest.php @@ -57,8 +57,8 @@ class DBSearchTest extends ItopDataTestCase { parent::setUp(); - require_once(APPROOT.'application/itopwebpage.class.inc.php'); - require_once(APPROOT.'application/displayblock.class.inc.php'); + $this->RequireOnceItopFile('application/itopwebpage.class.inc.php'); + $this->RequireOnceItopFile('application/displayblock.class.inc.php'); } /** diff --git a/tests/php-unit-tests/unitary-tests/core/DBSearchUpdateRealiasingMapTest.php b/tests/php-unit-tests/unitary-tests/core/DBSearchUpdateRealiasingMapTest.php index 7187e466d..4fd6a3ace 100644 --- a/tests/php-unit-tests/unitary-tests/core/DBSearchUpdateRealiasingMapTest.php +++ b/tests/php-unit-tests/unitary-tests/core/DBSearchUpdateRealiasingMapTest.php @@ -22,7 +22,7 @@ class DBSearchUpdateRealiasingMapTest extends ItopDataTestCase protected function setUp(): void { parent::setUp(); - require_once(APPROOT.'application/startup.inc.php'); + $this->RequireOnceItopFile('application/startup.inc.php'); } /** diff --git a/tests/php-unit-tests/unitary-tests/core/LogFileNameBuilderTest.php b/tests/php-unit-tests/unitary-tests/core/LogFileNameBuilderTest.php index 09f91e61c..882b04296 100644 --- a/tests/php-unit-tests/unitary-tests/core/LogFileNameBuilderTest.php +++ b/tests/php-unit-tests/unitary-tests/core/LogFileNameBuilderTest.php @@ -29,7 +29,7 @@ class LogFileNameBuilderTest extends ItopTestCase { parent::setUp(); - require_once APPROOT.'core/log.class.inc.php'; + $this->RequireOnceItopFile('core/log.class.inc.php'); } protected function tearDown(): void diff --git a/tests/php-unit-tests/unitary-tests/core/MetaModelTest.php b/tests/php-unit-tests/unitary-tests/core/MetaModelTest.php index 58b406043..9ce9c27c9 100644 --- a/tests/php-unit-tests/unitary-tests/core/MetaModelTest.php +++ b/tests/php-unit-tests/unitary-tests/core/MetaModelTest.php @@ -26,8 +26,8 @@ class MetaModelTest extends ItopDataTestCase protected function setUp(): void { parent::setUp(); - require_once APPROOT.'/core/metamodel.class.php'; - require_once APPROOT.'/core/coreexception.class.inc.php'; + $this->RequireOnceItopFile('/core/metamodel.class.php'); + $this->RequireOnceItopFile('/core/coreexception.class.inc.php'); } /** diff --git a/tests/php-unit-tests/unitary-tests/core/UniquenessConstraintTest.php b/tests/php-unit-tests/unitary-tests/core/UniquenessConstraintTest.php index 1b724c749..6c3373454 100644 --- a/tests/php-unit-tests/unitary-tests/core/UniquenessConstraintTest.php +++ b/tests/php-unit-tests/unitary-tests/core/UniquenessConstraintTest.php @@ -19,8 +19,8 @@ class UniquenessConstraintTest extends ItopTestCase protected function setUp(): void { parent::setUp(); - require_once(APPROOT.'/core/metamodel.class.php'); - require_once(APPROOT.'/core/coreexception.class.inc.php'); + $this->RequireOnceItopFile('core/metamodel.class.php'); + $this->RequireOnceItopFile('core/coreexception.class.inc.php'); } /** diff --git a/tests/php-unit-tests/unitary-tests/core/WeeklyScheduledProcessTest.php b/tests/php-unit-tests/unitary-tests/core/WeeklyScheduledProcessTest.php index 031a016c1..100de4f77 100644 --- a/tests/php-unit-tests/unitary-tests/core/WeeklyScheduledProcessTest.php +++ b/tests/php-unit-tests/unitary-tests/core/WeeklyScheduledProcessTest.php @@ -10,8 +10,8 @@ class WeeklyScheduledProcessTest extends ItopTestCase protected function setUp(): void { parent::setUp(); - require_once(APPROOT.'core/backgroundprocess.inc.php'); - require_once(APPROOT.'tests/php-unit-tests/unitary-tests/core/WeeklyScheduledProcessMockConfig.php'); + $this->RequireOnceItopFile('core/backgroundprocess.inc.php'); + $this->RequireOnceUnitTestFile('./WeeklyScheduledProcessMockConfig.php'); } diff --git a/tests/php-unit-tests/unitary-tests/core/apcEmulationTest.php b/tests/php-unit-tests/unitary-tests/core/apcEmulationTest.php index ac088f5a6..a25df610c 100644 --- a/tests/php-unit-tests/unitary-tests/core/apcEmulationTest.php +++ b/tests/php-unit-tests/unitary-tests/core/apcEmulationTest.php @@ -42,7 +42,7 @@ class apcEmulationTest extends ItopTestCase protected function setUp(): void { parent::setUp(); - require_once(APPROOT.'core/apc-emulation.php'); + $this->RequireOnceItopFile('core/apc-emulation.php'); require_once 'mockApcEmulation.incphp'; apc_clear_cache(); } diff --git a/tests/php-unit-tests/unitary-tests/core/dictApcuTest.php b/tests/php-unit-tests/unitary-tests/core/dictApcuTest.php index 3207c12ca..fa8e4d19d 100644 --- a/tests/php-unit-tests/unitary-tests/core/dictApcuTest.php +++ b/tests/php-unit-tests/unitary-tests/core/dictApcuTest.php @@ -44,9 +44,9 @@ class dictApcuTest extends ItopTestCase protected function setUp(): void { parent::setUp(); - 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->RequireOnceItopFile('core'.DIRECTORY_SEPARATOR.'coreexception.class.inc.php'); + $this->RequireOnceItopFile('core'.DIRECTORY_SEPARATOR.'dict.class.inc.php'); + $this->RequireOnceItopFile('core'.DIRECTORY_SEPARATOR.'apc-service.class.inc.php'); $this->sEnvName = time(); $_SESSION['itop_env'] = $this->sEnvName; diff --git a/tests/php-unit-tests/unitary-tests/core/dictTest.php b/tests/php-unit-tests/unitary-tests/core/dictTest.php index f27473eff..81d49d91b 100644 --- a/tests/php-unit-tests/unitary-tests/core/dictTest.php +++ b/tests/php-unit-tests/unitary-tests/core/dictTest.php @@ -42,9 +42,9 @@ class dictTest extends ItopTestCase protected function setUp(): void { parent::setUp(); - 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->RequireOnceItopFile('core'.DIRECTORY_SEPARATOR.'coreexception.class.inc.php'); + $this->RequireOnceItopFile('core'.DIRECTORY_SEPARATOR.'dict.class.inc.php'); + $this->RequireOnceItopFile('core'.DIRECTORY_SEPARATOR.'apc-service.class.inc.php'); $this->sEnvName = time(); $sDictionaryFolder = APPROOT."env-$this->sEnvName".DIRECTORY_SEPARATOR."dictionaries"; @mkdir($sDictionaryFolder, 0777, true); diff --git a/tests/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php b/tests/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php index e7772ec6c..78addc558 100644 --- a/tests/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php +++ b/tests/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php @@ -16,8 +16,8 @@ class iTopConfigParserTest extends ItopTestCase public function setUp(): void { parent::setUp(); - require_once APPROOT.'/core/iTopConfigParser.php'; - require_once APPROOT.'/setup/runtimeenv.class.inc.php'; + $this->RequireOnceItopFile('/core/iTopConfigParser.php'); + $this->RequireOnceItopFile('/setup/runtimeenv.class.inc.php'); clearstatcache(); $this->sConfigPath = utils::GetConfigFilePath(); diff --git a/tests/php-unit-tests/unitary-tests/core/sanitizer/AbstractDOMSanitizerTest.php b/tests/php-unit-tests/unitary-tests/core/sanitizer/AbstractDOMSanitizerTest.php index a9fb5d945..f09378dc7 100644 --- a/tests/php-unit-tests/unitary-tests/core/sanitizer/AbstractDOMSanitizerTest.php +++ b/tests/php-unit-tests/unitary-tests/core/sanitizer/AbstractDOMSanitizerTest.php @@ -12,8 +12,8 @@ abstract class AbstractDOMSanitizerTest extends ItopTestCase protected function setUp(): void { parent::setUp(); - require_once(APPROOT.'application/utils.inc.php'); - require_once(APPROOT.'core/htmlsanitizer.class.inc.php'); + $this->RequireOnceItopFile('application/utils.inc.php'); + $this->RequireOnceItopFile('core/htmlsanitizer.class.inc.php'); } protected function ReadTestFile($sFileToTest, $sFolderName) diff --git a/tests/php-unit-tests/unitary-tests/core/sanitizer/HTMLDOMSanitizerTest.php b/tests/php-unit-tests/unitary-tests/core/sanitizer/HTMLDOMSanitizerTest.php index 76c30434a..72581c827 100644 --- a/tests/php-unit-tests/unitary-tests/core/sanitizer/HTMLDOMSanitizerTest.php +++ b/tests/php-unit-tests/unitary-tests/core/sanitizer/HTMLDOMSanitizerTest.php @@ -222,7 +222,7 @@ class HTMLDOMSanitizerTest extends AbstractDOMSanitizerTest */ public function testDoSanitizeCallInlineImageProcessImageTag($sHtml, $iExpectedCount) { - require_once APPROOT.'tests/php-unit-tests/unitary-tests/core/sanitizer/InlineImageMock.php'; + $this->RequireOnceUnitTestFile('./InlineImageMock.php'); InlineImageMock::ResetCallCounter(); $oSanitizer = new HTMLDOMSanitizer(InlineImageMock::class); diff --git a/tests/php-unit-tests/unitary-tests/datamodels/2.x/authent-local/UserLocalTest.php b/tests/php-unit-tests/unitary-tests/datamodels/2.x/authent-local/UserLocalTest.php index 867a28ed5..e49ae24e6 100644 --- a/tests/php-unit-tests/unitary-tests/datamodels/2.x/authent-local/UserLocalTest.php +++ b/tests/php-unit-tests/unitary-tests/datamodels/2.x/authent-local/UserLocalTest.php @@ -25,8 +25,8 @@ class UserLocalTest extends ItopDataTestCase { parent::setUp(); - require_once(APPROOT.'tests/php-unit-tests/unitary-tests/datamodels/2.x/authent-local/UserLocalTest/UserLocalPasswordPolicyMock.php'); - require_once(APPROOT.'env-production/authent-local/model.authent-local.php'); + $this->RequireOnceUnitTestFile('./UserLocalTest/UserLocalPasswordPolicyMock.php'); + $this->RequireOnceItopFile('env-production/authent-local/model.authent-local.php'); } /** diff --git a/tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigAstValidatorTest.php b/tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigAstValidatorTest.php index 68eb076e1..c94292bee 100644 --- a/tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigAstValidatorTest.php +++ b/tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigAstValidatorTest.php @@ -19,8 +19,8 @@ class iTopConfigAstValidatorTest extends ItopTestCase { parent::setUp(); - require_once APPROOT.'env-production/itop-config/src/Validator/ConfigNodesVisitor.php'; - require_once APPROOT.'env-production/itop-config/src/Validator/iTopConfigAstValidator.php'; + $this->RequireOnceItopFile('env-production/itop-config/src/Validator/ConfigNodesVisitor.php'); + $this->RequireOnceItopFile('env-production/itop-config/src/Validator/iTopConfigAstValidator.php'); } diff --git a/tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigSyntaxValidatorTest.php b/tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigSyntaxValidatorTest.php index c4a5aaa1e..fc361a503 100644 --- a/tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigSyntaxValidatorTest.php +++ b/tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigSyntaxValidatorTest.php @@ -20,8 +20,8 @@ class iTopConfigSyntaxValidatorTest extends ItopTestCase { parent::setUp(); - require_once APPROOT.'env-production/itop-config/src/Validator/ConfigNodesVisitor.php'; - require_once APPROOT.'env-production/itop-config/src/Validator/iTopConfigSyntaxValidator.php'; + $this->RequireOnceItopFile('env-production/itop-config/src/Validator/ConfigNodesVisitor.php'); + $this->RequireOnceItopFile('env-production/itop-config/src/Validator/iTopConfigSyntaxValidator.php'); } diff --git a/tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php b/tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php index 3ad7a2115..390082d16 100644 --- a/tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php +++ b/tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php @@ -22,7 +22,7 @@ class DBBackupTest extends ItopTestCase protected function setUp(): void { parent::setUp(); - require_once(APPROOT.'setup/backup.class.inc.php'); + $this->RequireOnceItopFile('setup/backup.class.inc.php'); // We need a connection to the DB, so let's open it ! // We are using the default config file... as the server might not be configured for all the combination we are testing diff --git a/tests/php-unit-tests/unitary-tests/setup/SetupUtilsTest.php b/tests/php-unit-tests/unitary-tests/setup/SetupUtilsTest.php index b93a9a5f0..d38488bf6 100644 --- a/tests/php-unit-tests/unitary-tests/setup/SetupUtilsTest.php +++ b/tests/php-unit-tests/unitary-tests/setup/SetupUtilsTest.php @@ -21,8 +21,8 @@ class SetupUtilsTest extends ItopTestCase { parent::setUp(); - require_once APPROOT.'setup/setuputils.class.inc.php'; - require_once APPROOT.'setup/setuppage.class.inc.php'; + $this->RequireOnceItopFile('setup/setuputils.class.inc.php'); + $this->RequireOnceItopFile('setup/setuppage.class.inc.php'); } /** diff --git a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/iTopDesignFormatTest.php b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/iTopDesignFormatTest.php index 2d9b83605..cf13231af 100644 --- a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/iTopDesignFormatTest.php +++ b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/iTopDesignFormatTest.php @@ -19,8 +19,8 @@ class iTopDesignFormatTest extends ItopTestCase { parent::setUp(); - require_once APPROOT.'setup/modelfactory.class.inc.php'; - require_once APPROOT.'setup/itopdesignformat.class.inc.php'; + $this->RequireOnceItopFile('setup/modelfactory.class.inc.php'); + $this->RequireOnceItopFile('setup/itopdesignformat.class.inc.php'); } /** diff --git a/tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/TwigTest.php b/tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/TwigTest.php index 5924d0960..c01ad8606 100644 --- a/tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/TwigTest.php +++ b/tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/TwigTest.php @@ -15,7 +15,7 @@ class TwigTest extends ItopDataTestCase protected function setUp(): void { parent::setUp(); - require_once __DIR__.'/../../core/config.class.inc.php'; + $this->RequireOnceItopFile('core/config.class.inc.php'); } /** @@ -43,6 +43,7 @@ class TwigTest extends ItopDataTestCase { $oTwig->addFunction($oFunction); } + } public static function testTemplateProvider() { diff --git a/tests/php-unit-tests/unitary-tests/sources/application/status/StatusIncTest.php b/tests/php-unit-tests/unitary-tests/sources/application/status/StatusIncTest.php index 4dc6a559a..70c002ce7 100644 --- a/tests/php-unit-tests/unitary-tests/sources/application/status/StatusIncTest.php +++ b/tests/php-unit-tests/unitary-tests/sources/application/status/StatusIncTest.php @@ -92,9 +92,9 @@ class StatusIncTest extends TestCase { include_once($this->sAppRoot . '/status.inc.php'); StatusCheckConfigFile(); - require_once(APPROOT . '/core/cmdbobject.class.inc.php'); - require_once(APPROOT . '/application/utils.inc.php'); - require_once(APPROOT . '/core/contexttag.class.inc.php'); + require_once(APPROOT . '/core/cmdbobject.class.inc.php'); + require_once(APPROOT . '/application/utils.inc.php'); + require_once(APPROOT . '/core/contexttag.class.inc.php'); $oConfigWrong = new Config(ITOP_DEFAULT_CONFIG_FILE); $oConfigWrong->Set('db_pwd', $oConfigWrong->Get('db_pwd') . '_unittest');