composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-06-25 17:26:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests for CI with 3.0 sample data and for commit on dev

Browse Source
This commit is contained in:
v-dumas
2026-06-24 11:01:48 +02:00
parent 363d0767d5
commit 5c59fdebaf
2 changed files with 195 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

182
tests/php-unit-tests/unitary-tests/core/DBObject/DBObjectTest.php
View File

@@ -260,34 +260,41 @@ class DBObjectTest extends ItopDataTestCase
*/
public function testAttributeRefresh_ExternalKeysAndFields()
{
$this->assertDBQueryCount(0, function () use (&$oObject) {
$oObject = \MetaModel::NewObject('Person', ['name' => 'Foo', 'first_name' => 'John', 'org_id' => 3, 'location_id' => 2]);
$aFixture = $this->GivenTwoOrganizationsWithLocations();
$this->assertDBQueryCount(0, function () use (&$oObject, $aFixture) {
$oObject = \MetaModel::NewObject('Person', [
'name' => 'Foo',
'first_name' => 'John',
'org_id' => $aFixture['org1_id'],
'location_id' => $aFixture['location1_id'],
]);
});
$this->assertDBQueryCount(2, function () use (&$oObject) {
static::assertEquals('Demo', $oObject->Get('org_id_friendlyname'));
static::assertEquals('Grenoble', $oObject->Get('location_id_friendlyname'));
$this->assertDBQueryCount(2, function () use (&$oObject, $aFixture) {
static::assertEquals($aFixture['org1_name'], $oObject->Get('org_id_friendlyname'));
static::assertEquals($aFixture['location1_name'], $oObject->Get('location_id_friendlyname'));
});
// External key given as an id
$this->assertDBQueryCount(1, function () use (&$oObject) {
$oObject->Set('org_id', 6);
static::assertEquals('IT Department', $oObject->Get('org_id_friendlyname'));
$this->assertDBQueryCount(1, function () use (&$oObject, $aFixture) {
$oObject->Set('org_id', $aFixture['org2_id']);
static::assertEquals($aFixture['org2_name'], $oObject->Get('org_id_friendlyname'));
});
// External key given as an object
$this->assertDBQueryCount(1, function () use (&$oBordeaux) {
$oBordeaux = \MetaModel::GetObject('Location', 1);
$this->assertDBQueryCount(1, function () use (&$oBordeaux, $aFixture) {
$oBordeaux = \MetaModel::GetObject('Location', $aFixture['location2_id']);
});
$this->assertDBQueryCount(0, function () use (&$oBordeaux, &$oObject) {
$this->assertDBQueryCount(0, function () use (&$oBordeaux, &$oObject, $aFixture) {
/** @var DBObject $oObject */
$oObject->Set('location_id', $oBordeaux);
static::assertEquals('IT Department', $oObject->Get('org_id_friendlyname'));
static::assertEquals('IT Department', $oObject->Get('org_name'));
static::assertEquals('Bordeaux', $oObject->Get('location_id_friendlyname'));
static::assertEquals($aFixture['org2_name'], $oObject->Get('org_id_friendlyname'));
static::assertEquals($aFixture['org2_name'], $oObject->Get('org_name'));
static::assertEquals($aFixture['location2_name'], $oObject->Get('location_id_friendlyname'));
});
static::assertEquals('Bordeaux', $oObject->Get('location_id_friendlyname'));
static::assertEquals($aFixture['location2_name'], $oObject->Get('location_id_friendlyname'));
// static::assertEquals('toto', $oObject->EvaluateExpression(\Expression::FromOQL("CONCAT(org_name, '-', location_id_friendlyname)")));
}
@@ -299,9 +306,15 @@ class DBObjectTest extends ItopDataTestCase
public function testInsertNoReloadAttributeRefresh_ExternalKeysAndFields()
{
$this->ResetReloadCount();
$aFixture = $this->GivenTwoOrganizationsWithLocations();
$this->assertDBQueryCount(0, function () use (&$oObject) {
$oObject = \MetaModel::NewObject('Person', ['name' => 'Foo', 'first_name' => 'John', 'org_id' => 3, 'location_id' => 2]);
$this->assertDBQueryCount(0, function () use (&$oObject, $aFixture) {
$oObject = \MetaModel::NewObject('Person', [
'name' => 'Foo',
'first_name' => 'John',
'org_id' => $aFixture['org1_id'],
'location_id' => $aFixture['location1_id'],
]);
});
// The number of queries depends on the installed modules so it varies on CI
$oObject->DBInsertNoReload();
@@ -310,31 +323,31 @@ class DBObjectTest extends ItopDataTestCase
$this->debug("Created $sClass::$sKey");
$this->DebugReloadCount("Person::DBInsertNoReload()");
$this->assertDBQueryCount(0, function () use (&$oObject) {
static::assertEquals('Demo', $oObject->Get('org_id_friendlyname'));
static::assertEquals('Grenoble', $oObject->Get('location_id_friendlyname'));
$this->assertDBQueryCount(0, function () use (&$oObject, $aFixture) {
static::assertEquals($aFixture['org1_name'], $oObject->Get('org_id_friendlyname'));
static::assertEquals($aFixture['location1_name'], $oObject->Get('location_id_friendlyname'));
});
$this->DebugReloadCount("Get('org_id_friendlyname') and Get('location_id_friendlyname')");
// External key given as an id
$this->assertDBQueryCount(1, function () use (&$oObject) {
$oObject->Set('org_id', 6);
static::assertEquals('IT Department', $oObject->Get('org_id_friendlyname'));
$this->assertDBQueryCount(1, function () use (&$oObject, $aFixture) {
$oObject->Set('org_id', $aFixture['org2_id']);
static::assertEquals($aFixture['org2_name'], $oObject->Get('org_id_friendlyname'));
});
$this->assertEquals(0, $this->GetObjectReloadCount($sClass, $sKey));
$this->DebugReloadCount("Set('org_id', 2) and Get('org_id_friendlyname')");
// External key given as an object
$this->assertDBQueryCount(1, function () use (&$oBordeaux) {
$oBordeaux = MetaModel::GetObject('Location', 1);
$this->assertDBQueryCount(1, function () use (&$oBordeaux, $aFixture) {
$oBordeaux = MetaModel::GetObject('Location', $aFixture['location2_id']);
});
$this->DebugReloadCount("GetObject('Location', 1)");
$this->assertDBQueryCount(0, function () use (&$oBordeaux, &$oObject) {
$this->assertDBQueryCount(0, function () use (&$oBordeaux, &$oObject, $aFixture) {
$oObject->Set('location_id', $oBordeaux);
static::assertEquals('IT Department', $oObject->Get('org_id_friendlyname'));
static::assertEquals('IT Department', $oObject->Get('org_name'));
static::assertEquals('Bordeaux', $oObject->Get('location_id_friendlyname'));
static::assertEquals($aFixture['org2_name'], $oObject->Get('org_id_friendlyname'));
static::assertEquals($aFixture['org2_name'], $oObject->Get('org_name'));
static::assertEquals($aFixture['location2_name'], $oObject->Get('location_id_friendlyname'));
});
$this->DebugReloadCount("Set('location_id',...) Get('org_id_friendlyname') Get('org_name') Get('location_id_friendlyname')");
}
@@ -347,9 +360,15 @@ class DBObjectTest extends ItopDataTestCase
public function testInsertNoReloadAttributeLinkSet()
{
$this->ResetReloadCount();
$aFixture = $this->GivenTwoOrganizationsWithLocations();
$this->assertDBQueryCount(0, function () use (&$oPerson) {
$oPerson = MetaModel::NewObject('Person', ['name' => 'Foo', 'first_name' => 'John', 'org_id' => 3, 'location_id' => 2]);
$this->assertDBQueryCount(0, function () use (&$oPerson, $aFixture) {
$oPerson = MetaModel::NewObject('Person', [
'name' => 'Foo',
'first_name' => 'John',
'org_id' => $aFixture['org1_id'],
'location_id' => $aFixture['location1_id'],
]);
});
// The number of queries depends on the installed modules so it varies on CI
$oPerson->DBInsertNoReload();
@@ -358,8 +377,8 @@ class DBObjectTest extends ItopDataTestCase
$this->debug("Created $sPersonClass::$sPersonKey");
$this->DebugReloadCount("Person::DBInsertNoReload()");
$this->assertDBQueryCount(1, function () use (&$oTeam, &$oPerson) {
$oTeam = MetaModel::NewObject('Team', ['name' => 'Team Foo', 'org_id' => 3]);
$this->assertDBQueryCount(1, function () use (&$oTeam, &$oPerson, $aFixture) {
$oTeam = MetaModel::NewObject('Team', ['name' => 'Team Foo', 'org_id' => $aFixture['org1_id']]);
// Add person to team
$oNewLink = new lnkPersonToTeam();
$oNewLink->Set('person_id', $oPerson->GetKey());
@@ -384,9 +403,9 @@ class DBObjectTest extends ItopDataTestCase
$this->assertCount(0, $oTeam->ListChanges());
// External key given as an id
$this->assertDBQueryCount(1, function () use (&$oTeam) {
$oTeam->Set('org_id', 6);
static::assertEquals('IT Department', $oTeam->Get('org_id_friendlyname'));
$this->assertDBQueryCount(1, function () use (&$oTeam, $aFixture) {
$oTeam->Set('org_id', $aFixture['org2_id']);
static::assertEquals($aFixture['org2_name'], $oTeam->Get('org_id_friendlyname'));
});
$this->DebugReloadCount("Set('org_id', 2) and Get('org_id_friendlyname')");
$this->assertCount(1, $oTeam->ListChanges());
@@ -581,15 +600,10 @@ class DBObjectTest extends ItopDataTestCase
{
//--- Preparing data...
$this->bIsUsingSilo = true;
/** @var Organization $oCustomerOrg */
$oCustomerOrg = MetaModel::GetObjectByName(Organization::class, 'Customer');
/** @var Person $oPersonOnItDepartmentOrg */
$oPersonOnItDepartmentOrg = MetaModel::GetObjectByName(Person::class, 'Anna Gavalda');
/** @var Person $oPersonOnCustomerOrg */
$oPersonOnCustomerOrg = MetaModel::GetObjectByName(Person::class, 'Camille Cottin');
$aFixture = $this->GivenAllowedAndDeniedPersonsByOrg();
$sConfigManagerProfileId = 3; // access to Team and Contact objects
$sLogin = $this->GivenUserRestrictedToAnOrganizationInDB($oCustomerOrg->GetKey(), $sConfigManagerProfileId);
$sLogin = $this->GivenUserRestrictedToAnOrganizationInDB($aFixture['allowed_org_id'], $sConfigManagerProfileId);
//--- Now we can do some tests !
UserRights::Login($sLogin);
@@ -597,7 +611,7 @@ class DBObjectTest extends ItopDataTestCase
$oTeam = MetaModel::NewObject(Team::class, [
'name' => 'The A Team',
'org_id' => $oCustomerOrg->GetKey(),
'org_id' => $aFixture['allowed_org_id'],
]);
// Part 1 - Test with an invalid id (non-existing object)
@@ -629,7 +643,7 @@ class DBObjectTest extends ItopDataTestCase
//
$oPersonLinks = \DBObjectSet::FromScratch(lnkPersonToTeam::class);
$oPersonLinks->AddObject(MetaModel::NewObject(lnkPersonToTeam::class, [
'person_id' => $oPersonOnCustomerOrg->GetKey(),
'person_id' => $aFixture['allowed_person_id'],
'team_id' => $oTeam->GetKey(),
]));
$oTeam->Set('persons_list', $oPersonLinks);
@@ -651,7 +665,7 @@ class DBObjectTest extends ItopDataTestCase
//
$oPersonLinks = \DBObjectSet::FromScratch(lnkPersonToTeam::class);
$oPersonLinks->AddObject(MetaModel::NewObject(lnkPersonToTeam::class, [
'person_id' => $oPersonOnItDepartmentOrg->GetKey(),
'person_id' => $aFixture['denied_person_id'],
'team_id' => $oTeam->GetKey(),
]));
$oTeam->Set('persons_list', $oPersonLinks);
@@ -684,15 +698,10 @@ class DBObjectTest extends ItopDataTestCase
{
//--- Preparing data...
$this->bIsUsingSilo = true;
/** @var Organization $oCustomerOrg */
$oCustomerOrg = MetaModel::GetObjectByName(Organization::class, 'Customer');
/** @var Person $oPersonOnItDepartmentOrg */
$oPersonOnItDepartmentOrg = MetaModel::GetObjectByName(Person::class, 'Anna Gavalda');
/** @var Person $oPersonOnCustomerOrg */
$oPersonOnCustomerOrg = MetaModel::GetObjectByName(Person::class, 'Camille Cottin');
$aFixture = $this->GivenAllowedAndDeniedPersonsByOrg();
$sConfigManagerProfileId = 3; // access to Team and Contact objects
$sLogin = $this->GivenUserRestrictedToAnOrganizationInDB($oCustomerOrg->GetKey(), $sConfigManagerProfileId);
$sLogin = $this->GivenUserRestrictedToAnOrganizationInDB($aFixture['allowed_org_id'], $sConfigManagerProfileId);
//--- Now we can do some tests !
UserRights::Login($sLogin);
@@ -700,7 +709,7 @@ class DBObjectTest extends ItopDataTestCase
$oAttachment = MetaModel::NewObject(Attachment::class, [
'item_class' => Person::class,
'item_id' => $oPersonOnCustomerOrg->GetKey(),
'item_id' => $aFixture['allowed_person_id'],
]);
try {
$oAttachment->CheckChangedExtKeysValues();
@@ -710,7 +719,7 @@ class DBObjectTest extends ItopDataTestCase
$oAttachment = MetaModel::NewObject(Attachment::class, [
'item_class' => Person::class,
'item_id' => $oPersonOnItDepartmentOrg->GetKey(),
'item_id' => $aFixture['denied_person_id'],
]);
$this->ResetMetaModelQueyCacheGetObject();
try {
@@ -718,10 +727,71 @@ class DBObjectTest extends ItopDataTestCase
$this->fail('There should be an error on attachment pointing to a non allowed org object');
} catch (InvalidExternalKeyValueException $e) {
$this->assertEquals('item_id', $e->GetAttCode(), 'Should report the object key attribute');
$this->assertEquals($oPersonOnItDepartmentOrg->GetKey(), $e->GetAttValue(), 'Should report the object key value');
$this->assertEquals($aFixture['denied_person_id'], $e->GetAttValue(), 'Should report the object key value');
}
}
private function GivenTwoOrganizationsWithLocations(): array
{
$sSuffix = uniqid('dbobj_', false);
$sOrg1Name = 'DBObject Org 1 '.$sSuffix;
$sOrg2Name = 'DBObject Org 2 '.$sSuffix;
$sLocation1Name = 'DBObject Location 1 '.$sSuffix;
$sLocation2Name = 'DBObject Location 2 '.$sSuffix;
$iOrg1 = (int) $this->GivenObjectInDB(Organization::class, ['name' => $sOrg1Name]);
$iOrg2 = (int) $this->GivenObjectInDB(Organization::class, ['name' => $sOrg2Name]);
$iLocation1 = (int) $this->GivenObjectInDB('Location', ['name' => $sLocation1Name, 'org_id' => $iOrg1]);
$iLocation2 = (int) $this->GivenObjectInDB('Location', ['name' => $sLocation2Name, 'org_id' => $iOrg2]);
return [
'org1_id' => $iOrg1,
'org1_name' => $sOrg1Name,
'org2_id' => $iOrg2,
'org2_name' => $sOrg2Name,
'location1_id' => $iLocation1,
'location1_name' => $sLocation1Name,
'location2_id' => $iLocation2,
'location2_name' => $sLocation2Name,
];
}
private function GivenAllowedAndDeniedPersonsByOrg(): array
{
$sSuffix = uniqid('dbobj_silo_', false);
$iAllowedOrg = (int) $this->GivenObjectInDB(Organization::class, ['name' => 'Allowed Org '.$sSuffix]);
$iDeniedOrg = (int) $this->GivenObjectInDB(Organization::class, ['name' => 'Denied Org '.$sSuffix]);
$iAllowedLocation = (int) $this->GivenObjectInDB('Location', [
'name' => 'Allowed Location '.$sSuffix,
'org_id' => $iAllowedOrg,
]);
$iDeniedLocation = (int) $this->GivenObjectInDB('Location', [
'name' => 'Denied Location '.$sSuffix,
'org_id' => $iDeniedOrg,
]);
$iAllowedPerson = (int) $this->GivenObjectInDB(Person::class, [
'name' => 'Allowed Person '.$sSuffix,
'first_name' => 'Unit',
'org_id' => $iAllowedOrg,
'location_id' => $iAllowedLocation,
]);
$iDeniedPerson = (int) $this->GivenObjectInDB(Person::class, [
'name' => 'Denied Person '.$sSuffix,
'first_name' => 'Unit',
'org_id' => $iDeniedOrg,
'location_id' => $iDeniedLocation,
]);
return [
'allowed_org_id' => $iAllowedOrg,
'denied_org_id' => $iDeniedOrg,
'allowed_person_id' => $iAllowedPerson,
'denied_person_id' => $iDeniedPerson,
];
}
/**
* Test attribute integer incrementation.
*