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

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

Browse Source 
# Conflicts:
#	tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
#	tests/php-unit-tests/src/BaseTestCase/ItopTestCase.php
#	tests/php-unit-tests/unitary-tests/core/CMDBSource/TransactionsTest.php
#	tests/php-unit-tests/unitary-tests/sources/Application/TwigBase/Twig/TwigTest.php
This commit is contained in:
Romain Quetiez
2023-10-27 14:12:06 +02:00
parent 44e826543d 8fa9336568
commit 73fd0b06b2
23 changed files with 315 additions and 198 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