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

Merge remote-tracking branch 'origin/support/3.1' into develop

Browse Source
This commit is contained in:
Romain Quetiez
2023-10-27 19:41:01 +02:00
parent e3c26c97f2 5264a1f10d
commit e7d11e4bec
34 changed files with 483 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/php-unit-tests/unitary-tests/sources/Application/Status/StatusIncTest.php
View File

@@ -63,7 +63,7 @@ class StatusIncTest extends ItopTestCase {
}
/**
* @runInSeparateProcess
* @runInSeparateProcess Required because Status constructor invokes MetaModel::Startup... which does nothing when already loaded
*/
public function testStatusStartupWrongDbPwd()
{

23
tests/php-unit-tests/unitary-tests/sources/Application/Status/StatusTest.php
View File

@@ -18,14 +18,6 @@ class StatusTest extends ItopTestCase
require_once APPROOT.'core/config.class.inc.php'; // for constants
}
public function testStatusWrongUrl() {
$sPath = APPROOT.'/status_wrong.php';
exec("php $sPath", $aOutput, $iRet);
$this->assertNotEquals(0, $iRet, "Problem executing status page: $sPath, $iRet, aOutput:\n" . var_export($aOutput, true));
}
protected function GetPHPCommand()
{
$this->RequireOnceItopFile('application/utils.inc.php');
@@ -33,23 +25,14 @@ class StatusTest extends ItopTestCase
return $oConfig->Get('php_path');
}
public function testStatusGood() {
$sPath = APPROOT.'/webservices/status.php';
$sPHP = $this->GetPHPCommand();
exec("$sPHP $sPath", $aOutput, $iRet);
$this->assertEquals(0, $iRet, "Problem executing status page: $sPath, $iRet, aOutput:\n".var_export($aOutput, true));
}
/**
*
*/
public function testStatusGoodWithJson()
public function testStatusPageRepliesAsExpected()
{
$sPath = APPROOT.'/webservices/status.php';
$sPHP = $this->GetPHPCommand();
exec("$sPHP $sPath", $aOutput, $iRet);
$this->assertEquals(0, $iRet, "Problem executing status page: $sPath, $iRet, aOutput:\n".var_export($aOutput, true));
$sAdditionalInfo = "aOutput:\n".var_export($aOutput, true).'.';
//Check response

13
tests/php-unit-tests/unitary-tests/sources/Service/Router/RouterTest.php
View File

@@ -28,6 +28,10 @@ class RouterTest extends ItopDataTestCase
parent::setUp();
$this->RequireOnceItopFile('setup/setuputils.class.inc.php');
// Speedup test by forcing the use of the cache, even on a development environment
$oRouter = Router::GetInstance();
$oRouter->SetUseCache(true);
}
/**
@@ -203,12 +207,9 @@ class RouterTest extends ItopDataTestCase
$this->fail("Cache file was not generated ($sRoutesCacheFilePath)");
}
clearstatcache();
$iFirstModificationTimestamp = filemtime($sRoutesCacheFilePath);
$this->debug("Initial timestamp: $iFirstModificationTimestamp");
// Wait for just 1s to ensure timestamps would be different is the file is re-generated
sleep(1);
// Set its modification date in the past so that regenerating it will result in a new modification date without any doubt
$iFirstModificationTimestamp = time() - 2;
touch($sRoutesCacheFilePath, $iFirstModificationTimestamp);
// Call GetRoutes() again to see if cache gets re-generated or not
$this->InvokeNonPublicMethod(Router::class, 'GetRoutes', $oRouter, []);

3
tests/php-unit-tests/unitary-tests/sources/Service/TemporaryObjects/TemporaryObjectManagerTest.php
View File

@@ -12,9 +12,6 @@ use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectManager;
use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectRepository;
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
/**
* @runTestsInSeparateProcesses
*/
class TemporaryObjectManagerTest extends ItopDataTestCase
{
const USE_TRANSACTION = true;

3
tests/php-unit-tests/unitary-tests/sources/Service/TemporaryObjects/TemporaryObjectRepositoryTest.php
View File

@@ -13,9 +13,6 @@ use Combodo\iTop\Service\TemporaryObjects\TemporaryObjectRepository;
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
use DBObject;
/**
* @runTestsInSeparateProcesses
*/
class TemporaryObjectRepositoryTest extends ItopDataTestCase
{
const USE_TRANSACTION = true;