composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-06-24 16:56: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:57:58 +02:00
parent 5c59fdebaf
commit 01f32086ec
2 changed files with 69 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
tests/php-unit-tests/unitary-tests/core/DBUnionSearchTest.php
View File

@@ -9,6 +9,9 @@ use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
class DBUnionSearchTest extends ItopDataTestCase
{
/** @var array<string, int>|null */
private ?array $aUnionSearchFixtureIds = null;
/**
* @dataProvider UnionSearchProvider
*
@@ -20,6 +23,7 @@ class DBUnionSearchTest extends ItopDataTestCase
*/
public function testUnionSearch($sOQL)
{
$sOQL = $this->ResolveUnionSearchFixtureOql($sOQL);
$oSearch = DBSearch::FromOQL($sOQL);
$oSet = new DBObjectSet($oSearch);
@@ -50,11 +54,72 @@ class DBUnionSearchTest extends ItopDataTestCase
'Same class' => ["SELECT Server UNION SELECT Server"],
'different class same alias' => ['SELECT Server AS fci UNION SELECT VirtualMachine AS fci'],
'different class no alias' => ['SELECT Server UNION SELECT VirtualMachine'],
'multiple classes same alias' => ['SELECT `L`, `P` FROM Location AS `L` JOIN Person AS `P` ON `P`.location_id = `L`.id WHERE (`L`.`org_id` = 7) UNION SELECT `L`, `P` FROM Location AS `L` JOIN Person AS `P` ON `P`.location_id = `L`.id WHERE (`L`.`org_id` = 2)'],
'multiple classes' => ['SELECT `L`, `P` FROM Location AS `L` JOIN Person AS `P` ON `P`.location_id = `L`.id WHERE (`L`.`org_id` = 7) UNION SELECT `L1`, `P1` FROM Person AS `P1` JOIN Location AS `L1` ON `P1`.location_id = `L1`.id WHERE (`P1`.`org_id` = 2)'],
'multiple classes same alias' => [
'SELECT `L`, `P` FROM Location AS `L` JOIN Person AS `P` ON `P`.location_id = `L`.id WHERE (`L`.`org_id` = {{ORG1_ID}}) UNION SELECT `L`, `P` FROM Location AS `L` JOIN Person AS `P` ON `P`.location_id = `L`.id WHERE (`L`.`org_id` = {{ORG2_ID}})',
],
'multiple classes' => [
'SELECT `L`, `P` FROM Location AS `L` JOIN Person AS `P` ON `P`.location_id = `L`.id WHERE (`L`.`org_id` = {{ORG1_ID}}) UNION SELECT `L1`, `P1` FROM Person AS `P1` JOIN Location AS `L1` ON `P1`.location_id = `L1`.id WHERE (`P1`.`org_id` = {{ORG2_ID}})',
],
];
}
private function ResolveUnionSearchFixtureOql(string $sOQL): string
{
if (strpos($sOQL, '{{ORG') === false) {
return $sOQL;
}
$aFixtures = $this->GetUnionSearchFixtureIds();
return strtr($sOQL, [
'{{ORG1_ID}}' => (string) $aFixtures['org1_id'],
'{{ORG2_ID}}' => (string) $aFixtures['org2_id'],
]);
}
/**
* Create the minimum fixture set for UNION tests once per test instance.
*/
private function GetUnionSearchFixtureIds(): array
{
if ($this->aUnionSearchFixtureIds !== null) {
return $this->aUnionSearchFixtureIds;
}
$sSuffix = uniqid('dbunion_', false);
$iOrg1 = (int) $this->GivenObjectInDB('Organization', ['name' => 'Union Org 1 '.$sSuffix]);
$iOrg2 = (int) $this->GivenObjectInDB('Organization', ['name' => 'Union Org 2 '.$sSuffix]);
$iLocation1 = (int) $this->GivenObjectInDB('Location', [
'name' => 'Union Location 1 '.$sSuffix,
'org_id' => $iOrg1,
]);
$iLocation2 = (int) $this->GivenObjectInDB('Location', [
'name' => 'Union Location 2 '.$sSuffix,
'org_id' => $iOrg2,
]);
$this->GivenObjectInDB('Person', [
'name' => 'Union Person 1 '.$sSuffix,
'first_name' => 'Test',
'org_id' => $iOrg1,
'location_id' => $iLocation1,
]);
$this->GivenObjectInDB('Person', [
'name' => 'Union Person 2 '.$sSuffix,
'first_name' => 'Test',
'org_id' => $iOrg2,
'location_id' => $iLocation2,
]);
$this->aUnionSearchFixtureIds = [
'org1_id' => $iOrg1,
'org2_id' => $iOrg2,
];
return $this->aUnionSearchFixtureIds;
}
public function testFilterOnFirstSelectedClass()
{
$sSourceOQL = 'SELECT `Person`, `Location` FROM Person AS `Person` JOIN Location AS `Location` ON `Person`.location_id = `Location`.id WHERE (`Location`.`id` = 1)';

3
tests/php-unit-tests/unitary-tests/core/ExpressionEvaluateTest.php
View File

@@ -315,7 +315,8 @@ class ExpressionEvaluateTest extends ItopDataTestCase
['URP_UserProfile', ['profileid' => 2], 'friendlyname', ''],
['Location', ['name' => 'Grenoble', 'org_id' => 2], 'name', 'Grenoble'],
['Location', ['name' => 'Grenoble', 'org_id' => 2], 'friendlyname', ''],
['Location', ['name' => 'Grenoble', 'org_id' => 6], 'org_name', 'IT Department'],
// ['Location', ['name' => 'Grenoble', 'org_id' => 6], 'org_name', 'IT Department'], // Compatible with 3.3 sample data
// ['Location', ['name' => 'Grenoble', 'org_id' => 2], 'org_name', 'Demo'], // Compatible with sample data before 3.3.0
['Location', ['name' => 'Grenoble', 'org_id' => 2], 'org_id_friendlyname', ''],
['Location', ['name' => 'Grenoble', 'org_id' => 2], 'org_id', 2],
['Location', ['name' => 'Grenoble', 'org_id' => 2], 'CONCAT(SUBSTR(name, 4), " cause")', 'noble cause'],