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

test SDK enhancement: be able to compare moduleinstallation

Browse Source 
ci: add log and hopefully fix hub test

ci: fix all test that rely on CustomDataTC
This commit is contained in:
odain
2025-12-30 16:39:25 +01:00
parent 83973d102f
commit f2e682c07c
3 changed files with 75 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
datamodels/2.x/combodo-db-tools/src/Service/DBToolsUtils.php
View File

@@ -10,6 +10,7 @@ namespace Combodo\iTop\DBTools\Service;
use CMDBSource; use CMDBSource;
use DBObjectSearch; use DBObjectSearch;
use DBObjectSet; use DBObjectSet;
use IssueLog;
class DBToolsUtils class DBToolsUtils
{ {
@@ -138,6 +139,49 @@ EOF;
return $aValues; return $aValues;
} }
/**
* Return previous module installation. offset is applied on parent_id.
* @param $iOffset
* @return array
*/
public static function GetPreviousModuleInstallationsByOffset(int $iOffset = 0): array
{
$oFilter = DBObjectSearch::FromOQL('SELECT ModuleInstallation AS mi WHERE mi.parent_id=0 AND mi.name!="datamodel"');
$oSet = new DBObjectSet($oFilter, ['installed' => false]); // Most recent first
$oSet->SetLimit($iOffset + 1);
$iParentId = 0;
/** @var \DBObject $oModuleInstallation */
while ($oModuleInstallation = $oSet->Fetch()) {
if ($iOffset == 0) {
$iParentId = $oModuleInstallation->Get('id');
break;
}
$iOffset--;
}
if ($iParentId === 0) {
IssueLog::Error("no ITOP_APPLICATION ModuleInstallation found", null, ['offset' => $iOffset]);
throw new \Exception("no ITOP_APPLICATION ModuleInstallation found");
}
$oFilter = DBObjectSearch::FromOQL("SELECT ModuleInstallation AS mi WHERE mi.id=$iParentId OR mi.parent_id=$iParentId");
$oSet = new DBObjectSet($oFilter); // Most recent first
$aRawValues = $oSet->ToArrayOfValues();
$aValues = [];
foreach ($aRawValues as $aRawValue) {
$aValue = [];
foreach ($aRawValue as $sAliasAttCode => $sValue) {
// remove 'mi.' from AttCode
$sAttCode = substr($sAliasAttCode, 3);
$aValue[$sAttCode] = $sValue;
}
$aValues[] = $aValue;
}
return $aValues;
}
public static function GetDBTablesInfo() public static function GetDBTablesInfo()
{ {
self::AnalyzeTables(); self::AnalyzeTables();

2
tests/php-unit-tests/integration-tests/itop-hub-connector/HubControllerTest.php
View File

@@ -2,6 +2,7 @@
namespace Combodo\iTop\Test\UnitTest\HubConnector; namespace Combodo\iTop\Test\UnitTest\HubConnector;
use Combodo\iTop\DBTools\Service\DBToolsUtils;
use Combodo\iTop\HubConnector\Controller\HubController; use Combodo\iTop\HubConnector\Controller\HubController;
use Combodo\iTop\Test\UnitTest\ItopDataTestCase; use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
use DOMFormatException; use DOMFormatException;
@@ -45,6 +46,7 @@ class HubControllerTest extends ItopDataTestCase
$this->testLaunchCompile(); $this->testLaunchCompile();
HubController::GetInstance()->LaunchDeploy(); HubController::GetInstance()->LaunchDeploy();
$this->CheckReport('{"code":0,"message":"Compilation successful.","fields":[]}'); $this->CheckReport('{"code":0,"message":"Compilation successful.","fields":[]}');
$this->CompareCurrentAndPreviousModuleInstallations();
} }
private function CheckReport($sExpected) private function CheckReport($sExpected)

29
tests/php-unit-tests/src/BaseTestCase/ItopDataTestCase.php
View File

@@ -17,6 +17,7 @@ namespace Combodo\iTop\Test\UnitTest;
use ArchivedObjectException; use ArchivedObjectException;
use CMDBObject; use CMDBObject;
use CMDBSource; use CMDBSource;
use Combodo\iTop\DBTools\Service\DBToolsUtils;
use Combodo\iTop\Service\Events\EventService; use Combodo\iTop\Service\Events\EventService;
use Config; use Config;
use Contact; use Contact;
@@ -1556,4 +1557,32 @@ abstract class ItopDataTestCase extends ItopTestCase
@chmod($sConfigPath, 0440); @chmod($sConfigPath, 0440);
@unlink($this->sConfigTmpBackupFile); @unlink($this->sConfigTmpBackupFile);
} }
public function CompareCurrentAndPreviousModuleInstallations()
{
$this->RequireOnceItopFile('env-production/combodo-db-tools/src/Service/DBToolsUtils.php');
$aPreviousInstallations = DBToolsUtils::GetPreviousModuleInstallationsByOffset(1);
$aInstallations = DBToolsUtils::GetPreviousModuleInstallationsByOffset();
$this->assertEquals($this->KeepModuleInstallationComparableFields($aPreviousInstallations), $this->KeepModuleInstallationComparableFields($aInstallations));
}
public function KeepModuleInstallationComparableFields($aInstallations): array
{
$aRes = [];
$aIgnoredFields = ['id', 'parent_id', 'installed', 'comment'];
foreach ($aInstallations as $aData) {
$aNewData = [];
foreach ($aData as $sKey => $val) {
if (in_array($sKey, $aIgnoredFields)) {
continue;
}
$aNewData[$sKey] = $val;
}
$sName = $aNewData['name'];
$aRes[$sName] = $aNewData;
}
asort($aRes);
return $aRes;
}
} }