composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-18 16:18:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/2.7' into support/3.0

Browse Source 
# Conflicts:
#	tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php
#	tests/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php
This commit is contained in:
Romain Quetiez
2024-05-16 10:09:11 +02:00
parent 46738d4ba4 53dc452d61
commit c6f3e36451
9 changed files with 159 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php
View File

@@ -51,7 +51,7 @@ abstract class ItopTestCase extends TestCase
static::$DEBUG_UNIT_TEST = getenv('DEBUG_UNIT_TEST');
require_once static::GetAppRoot() . 'approot.inc.php';
require_once __DIR__.'/../../../../approot.inc.php';
if ((static::DISABLE_DEPRECATEDCALLSLOG_ERRORHANDLER)
&& (false === defined(ITOP_PHPUNIT_RUNNING_CONSTANT_NAME))) {
@@ -78,12 +78,8 @@ abstract class ItopTestCase extends TestCase
\Dict::SetUserLanguage();
}
}
protected function setUp(): void {
parent::setUp();
$this->debug("\n----------\n---------- ".$this->getName()."\n----------\n");
protected function setUp(): void
{
$this->LoadRequiredItopFiles();
$this->LoadRequiredTestFiles();
}
@@ -132,8 +128,9 @@ abstract class ItopTestCase extends TestCase
*/
protected function LoadRequiredItopFiles(): void
{
// Empty until we actually need to require some files in the class
}
// At least make sure that the autoloader will be loaded, and that the APPROOT constant is defined
require_once __DIR__.'/../../../../approot.inc.php';
}
/**
* Overload this method to require necessary files through {@see \Combodo\iTop\Test\UnitTest\ItopTestCase::RequireOnceUnitTestFile()}