composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°5608 - Use new ItopTestCase::RequireOnceXXX in unit tests

Browse Source
This commit is contained in:
Molkobain
2023-01-06 18:22:52 +01:00
parent 6a7dbb06b0
commit 36f8e58e25
33 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/php-unit-tests/ItopDataTestCase.php
View File

@@ -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;

4
tests/php-unit-tests/integration-tests/iTopModulesPhpVersionChecklistTest.php
View File

@@ -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';

2
tests/php-unit-tests/integration-tests/iTopModulesXmlVersionChecklistTest.php
View File

@@ -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');
}

4
tests/php-unit-tests/post-build-integration-tests/iTopDesignFormatChecklistTest.php
View File

@@ -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');
}
/**

4
tests/php-unit-tests/unitary-tests/core/BulkChangeTest.inc.php
View File

@@ -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');
}

2
tests/php-unit-tests/unitary-tests/core/CMDBSource/CMDBSourceTest.php
View File

@@ -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');
}
/**

2
tests/php-unit-tests/unitary-tests/core/CMDBSource/TransactionsTest.php
View File

@@ -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';

2
tests/php-unit-tests/unitary-tests/core/ConfigPlaceholdersResolverTest.php
View File

@@ -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

2
tests/php-unit-tests/unitary-tests/core/ConfigTest.php
View File

@@ -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');
}
/**

4
tests/php-unit-tests/unitary-tests/core/ConfigValidator/iTopConfigAstValidatorTest.php
View File

@@ -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()

4
tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
View File

@@ -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');
}
/**

2
tests/php-unit-tests/unitary-tests/core/DBSearchIntersectTest.php
View File

@@ -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');
}
/**

2
tests/php-unit-tests/unitary-tests/core/DBSearchJoinTest.php
View File

@@ -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');
}
/**

4
tests/php-unit-tests/unitary-tests/core/DBSearchTest.php
View File

@@ -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');
}
/**

2
tests/php-unit-tests/unitary-tests/core/DBSearchUpdateRealiasingMapTest.php
View File

@@ -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');
}
/**

2
tests/php-unit-tests/unitary-tests/core/LogFileNameBuilderTest.php
View File

@@ -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

4
tests/php-unit-tests/unitary-tests/core/MetaModelTest.php
View File

@@ -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');
}
/**

4
tests/php-unit-tests/unitary-tests/core/UniquenessConstraintTest.php
View File

@@ -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');
}
/**

4
tests/php-unit-tests/unitary-tests/core/WeeklyScheduledProcessTest.php
View File

@@ -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');
}

2
tests/php-unit-tests/unitary-tests/core/apcEmulationTest.php
View File

@@ -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();
}

6
tests/php-unit-tests/unitary-tests/core/dictApcuTest.php
View File

@@ -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;

6
tests/php-unit-tests/unitary-tests/core/dictTest.php
View File

@@ -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);

4
tests/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php
View File

@@ -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();

4
tests/php-unit-tests/unitary-tests/core/sanitizer/AbstractDOMSanitizerTest.php
View File

@@ -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)

2
tests/php-unit-tests/unitary-tests/core/sanitizer/HTMLDOMSanitizerTest.php
View File

@@ -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);

4
tests/php-unit-tests/unitary-tests/datamodels/2.x/authent-local/UserLocalTest.php
View File

@@ -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');
}
/**

4
tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigAstValidatorTest.php
View File

@@ -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');
}

4
tests/php-unit-tests/unitary-tests/datamodels/2.x/itop-config/Validator/iTopConfigSyntaxValidatorTest.php
View File

@@ -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');
}

2
tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php
View File

@@ -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

4
tests/php-unit-tests/unitary-tests/setup/SetupUtilsTest.php
View File

@@ -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');
}
/**

4
tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/iTopDesignFormatTest.php
View File

@@ -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');
}
/**

3
tests/php-unit-tests/unitary-tests/sources/application/TwigBase/Twig/TwigTest.php
View File

@@ -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()
{

6
tests/php-unit-tests/unitary-tests/sources/application/status/StatusIncTest.php
View File

@@ -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');