mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-28 21:18:46 +02:00
N°4305 - n-n links to same class - Be more robust on original search given to ormLinkSet
This commit is contained in:
@@ -47,201 +47,194 @@ class ormLinkSetTest extends ItopDataTestCase
|
||||
const CREATE_TEST_ORG = true;
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
protected function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
}
|
||||
* @throws Exception
|
||||
*/
|
||||
protected function setUp()
|
||||
{
|
||||
parent::setUp();
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function testConstruct()
|
||||
{
|
||||
$oOrmLink = new ormLinkSet('UserRequest', 'contacts_list');
|
||||
static::assertNotNull($oOrmLink);
|
||||
}
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function testConstruct()
|
||||
{
|
||||
$oOrmLink = new ormLinkSet('UserRequest', 'contacts_list');
|
||||
static::assertNotNull($oOrmLink);
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function testConstruct2()
|
||||
{
|
||||
$this->expectException('Exception');
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function testConstruct2()
|
||||
{
|
||||
$this->expectException('Exception');
|
||||
|
||||
new ormLinkSet('UserRequest', 'ref');
|
||||
}
|
||||
new ormLinkSet('UserRequest', 'ref');
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function testBasic()
|
||||
{
|
||||
$oServer = $this->CreateServer(1);
|
||||
$aPersons = array();
|
||||
for ($i = 0; $i < 3; $i++)
|
||||
{
|
||||
$oPerson = $this->CreatePerson($i);
|
||||
$aPersons[] = $oPerson;
|
||||
$this->AddContactToCI($oPerson, $oServer);
|
||||
}
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function testBasic()
|
||||
{
|
||||
$oServer = $this->CreateServer(1);
|
||||
$aPersons = array();
|
||||
for ($i = 0; $i < 3; $i++) {
|
||||
$oPerson = $this->CreatePerson($i);
|
||||
$aPersons[] = $oPerson;
|
||||
$this->AddContactToCI($oPerson, $oServer);
|
||||
}
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(3, $oContactsSet->Count());
|
||||
}
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(3, $oContactsSet->Count());
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function testSuccesiveAdds()
|
||||
{
|
||||
$oServer = $this->CreateServer(1);
|
||||
$aPersons = array();
|
||||
for ($i = 0; $i < 3; $i++)
|
||||
{
|
||||
$oPerson = $this->CreatePerson($i);
|
||||
$aPersons[] = $oPerson;
|
||||
$this->AddContactToCI($oPerson, $oServer);
|
||||
}
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function testSuccesiveAdds()
|
||||
{
|
||||
$oServer = $this->CreateServer(1);
|
||||
$aPersons = array();
|
||||
for ($i = 0; $i < 3; $i++) {
|
||||
$oPerson = $this->CreatePerson($i);
|
||||
$aPersons[] = $oPerson;
|
||||
$this->AddContactToCI($oPerson, $oServer);
|
||||
}
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(3, $oContactsSet->Count());
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(3, $oContactsSet->Count());
|
||||
|
||||
$this->AddContactToCI($this->CreatePerson($i), $oServer);
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(4, $oContactsSet->Count());
|
||||
$this->AddContactToCI($this->CreatePerson($i), $oServer);
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(4, $oContactsSet->Count());
|
||||
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(4, $oContactsSet->Count());
|
||||
}
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(4, $oContactsSet->Count());
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function testRemove()
|
||||
{
|
||||
$oServer = $this->CreateServer(1);
|
||||
$aPersons = array();
|
||||
for ($i = 0; $i < 3; $i++)
|
||||
{
|
||||
$oPerson = $this->CreatePerson($i);
|
||||
$aPersons[] = $oPerson;
|
||||
$this->AddContactToCI($oPerson, $oServer);
|
||||
}
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function testRemove()
|
||||
{
|
||||
$oServer = $this->CreateServer(1);
|
||||
$aPersons = array();
|
||||
for ($i = 0; $i < 3; $i++) {
|
||||
$oPerson = $this->CreatePerson($i);
|
||||
$aPersons[] = $oPerson;
|
||||
$this->AddContactToCI($oPerson, $oServer);
|
||||
}
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(3, $oContactsSet->Count());
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(3, $oContactsSet->Count());
|
||||
|
||||
for ($i = 0; $i < 3; $i++)
|
||||
{
|
||||
$this->RemoveContactFromCI($aPersons[$i], $oServer);
|
||||
}
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(0, $oContactsSet->Count());
|
||||
for ($i = 0; $i < 3; $i++) {
|
||||
$this->RemoveContactFromCI($aPersons[$i], $oServer);
|
||||
}
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(0, $oContactsSet->Count());
|
||||
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(0, $oContactsSet->Count());
|
||||
}
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(0, $oContactsSet->Count());
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function testAddThenRemove()
|
||||
{
|
||||
$oServer = $this->CreateServer(1);
|
||||
for ($i = 0; $i < 3; $i++)
|
||||
{
|
||||
$oPerson = $this->CreatePerson($i);
|
||||
$this->AddContactToCI($oPerson, $oServer);
|
||||
$this->RemoveContactFromCI($oPerson, $oServer);
|
||||
}
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(0, $oContactsSet->Count());
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function testAddThenRemove()
|
||||
{
|
||||
$oServer = $this->CreateServer(1);
|
||||
for ($i = 0; $i < 3; $i++) {
|
||||
$oPerson = $this->CreatePerson($i);
|
||||
$this->AddContactToCI($oPerson, $oServer);
|
||||
$this->RemoveContactFromCI($oPerson, $oServer);
|
||||
}
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(0, $oContactsSet->Count());
|
||||
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(0, $oContactsSet->Count());
|
||||
}
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(0, $oContactsSet->Count());
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function testRemoveThenAdd()
|
||||
{
|
||||
$oServer = $this->CreateServer(1);
|
||||
$aPersons = array();
|
||||
for ($i = 0; $i < 3; $i++) {
|
||||
$oPerson = $this->CreatePerson($i);
|
||||
$aPersons[] = $oPerson;
|
||||
$this->AddContactToCI($oPerson, $oServer);
|
||||
}
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function testRemoveThenAdd()
|
||||
{
|
||||
$oServer = $this->CreateServer(1);
|
||||
$aPersons = array();
|
||||
for ($i = 0; $i < 3; $i++) {
|
||||
$oPerson = $this->CreatePerson($i);
|
||||
$aPersons[] = $oPerson;
|
||||
$this->AddContactToCI($oPerson, $oServer);
|
||||
}
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(3, $oContactsSet->Count());
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(3, $oContactsSet->Count());
|
||||
|
||||
for ($i = 0; $i < 3; $i++) {
|
||||
$this->RemoveContactFromCI($aPersons[$i], $oServer);
|
||||
$this->AddContactToCI($aPersons[$i], $oServer);
|
||||
}
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(3, $oContactsSet->Count());
|
||||
for ($i = 0; $i < 3; $i++) {
|
||||
$this->RemoveContactFromCI($aPersons[$i], $oServer);
|
||||
$this->AddContactToCI($aPersons[$i], $oServer);
|
||||
}
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(3, $oContactsSet->Count());
|
||||
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(3, $oContactsSet->Count());
|
||||
}
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(3, $oContactsSet->Count());
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function testAddDuplicate()
|
||||
{
|
||||
$oServer = $this->CreateServer(1);
|
||||
$aPersons = array();
|
||||
for ($i = 0; $i < 3; $i++)
|
||||
{
|
||||
$oPerson = $this->CreatePerson($i);
|
||||
$aPersons[] = $oPerson;
|
||||
$this->AddContactToCI($oPerson, $oServer);
|
||||
}
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
/**
|
||||
* @throws Exception
|
||||
*/
|
||||
public function testAddDuplicate()
|
||||
{
|
||||
$oServer = $this->CreateServer(1);
|
||||
$aPersons = array();
|
||||
for ($i = 0; $i < 3; $i++) {
|
||||
$oPerson = $this->CreatePerson($i);
|
||||
$aPersons[] = $oPerson;
|
||||
$this->AddContactToCI($oPerson, $oServer);
|
||||
}
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(3, $oContactsSet->Count());
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(3, $oContactsSet->Count());
|
||||
|
||||
for ($i = 0; $i < 3; $i++)
|
||||
{
|
||||
$this->AddContactToCI($aPersons[$i], $oServer);
|
||||
}
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(6, $oContactsSet->Count());
|
||||
for ($i = 0; $i < 3; $i++) {
|
||||
$this->AddContactToCI($aPersons[$i], $oServer);
|
||||
}
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(6, $oContactsSet->Count());
|
||||
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(3, $oContactsSet->Count());
|
||||
}
|
||||
$oContactsSet = $oServer->Get('contacts_list');
|
||||
static::assertEquals(3, $oContactsSet->Count());
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws Exception
|
||||
@@ -250,8 +243,7 @@ class ormLinkSetTest extends ItopDataTestCase
|
||||
{
|
||||
$oServer = $this->CreateServer(1);
|
||||
$aPersons = array();
|
||||
for ($i = 0; $i < 3; $i++)
|
||||
{
|
||||
for ($i = 0; $i < 3; $i++) {
|
||||
$oPerson = $this->CreatePerson($i);
|
||||
$aPersons[] = $oPerson;
|
||||
$this->AddContactToCI($oPerson, $oServer);
|
||||
@@ -260,14 +252,12 @@ class ormLinkSetTest extends ItopDataTestCase
|
||||
$oServer->DBUpdate();
|
||||
$this->ReloadObject($oServer);
|
||||
|
||||
for ($i = 3; $i < 6; $i++)
|
||||
{
|
||||
for ($i = 3; $i < 6; $i++) {
|
||||
$oPerson = $this->CreatePerson($i);
|
||||
$this->AddContactToCI($oPerson, $oServer);
|
||||
}
|
||||
|
||||
for ($i = 0; $i < 3; $i++)
|
||||
{
|
||||
for ($i = 0; $i < 3; $i++) {
|
||||
$this->RemoveContactFromCI($aPersons[$i], $oServer);
|
||||
}
|
||||
|
||||
@@ -277,11 +267,17 @@ class ormLinkSetTest extends ItopDataTestCase
|
||||
|
||||
/**
|
||||
* @dataProvider ToDBObjectSetProvider
|
||||
*
|
||||
* @param $sHostClass
|
||||
* @param $sAttCode
|
||||
* @param $sOriginalFilter
|
||||
* @param $bShowObsolete
|
||||
* @param $sExpectedFilter
|
||||
*
|
||||
* @throws \CoreException
|
||||
* @throws \CoreWarning
|
||||
* @throws \MySQLException
|
||||
* @throws \OQLException
|
||||
*/
|
||||
public function testToDBObjectSet($sHostClass, $sAttCode, $sOriginalFilter, $bShowObsolete, $sExpectedFilter)
|
||||
{
|
||||
@@ -296,19 +292,19 @@ class ormLinkSetTest extends ItopDataTestCase
|
||||
{
|
||||
return [
|
||||
'lnkContactToFunctionalCI' => [
|
||||
'sHostClass' => 'ApplicationSolution',
|
||||
'sAttCode' => 'contacts_list',
|
||||
'sHostClass' => 'ApplicationSolution',
|
||||
'sAttCode' => 'contacts_list',
|
||||
'sOriginalFilter' => 'SELECT `lnkContactToFunctionalCI` FROM lnkContactToFunctionalCI AS `lnkContactToFunctionalCI` JOIN FunctionalCI AS `FunctionalCI` ON `lnkContactToFunctionalCI`.functionalci_id = `FunctionalCI`.id WHERE (`FunctionalCI`.`id` = :id)',
|
||||
'bShowObsolete' => false,
|
||||
'bShowObsolete' => false,
|
||||
'sExpectedFilter' => 'SELECT `Link`, `Remote` FROM lnkContactToFunctionalCI AS `Link` JOIN FunctionalCI AS `FunctionalCI` ON `Link`.functionalci_id = `FunctionalCI`.id JOIN Contact AS `Remote` ON `Link`.contact_id = `Remote`.id WHERE ((`FunctionalCI`.`id` = :id) AND (`Remote`.`obsolescence_flag` = 0))',
|
||||
],
|
||||
// 'lnkFAQToFAQ' => [
|
||||
// 'sHostClass' => 'FAQ',
|
||||
// 'sAttCode' => 'contacts_list',
|
||||
// 'sOriginalFilter' => '',
|
||||
// 'bShowObsolete' => true,
|
||||
// 'sExpectedFilter' => '',
|
||||
// ],
|
||||
],
|
||||
'lnkContactToTicket' => [
|
||||
'sHostClass' => 'Ticket',
|
||||
'sAttCode' => 'contacts_list',
|
||||
'sOriginalFilter' => 'SELECT `lnkContactToTicket` FROM lnkContactToTicket AS `lnkContactToTicket` JOIN Ticket AS `Ticket` ON `lnkContactToTicket`.ticket_id = `Ticket`.id JOIN Contact AS `Contact1` ON `lnkContactToTicket`.contact_id = `Contact1`.id WHERE (`Ticket`.`id` = :id)',
|
||||
'bShowObsolete' => false,
|
||||
'sExpectedFilter' => 'SELECT `Link`, `Remote` FROM lnkContactToTicket AS `Link` JOIN Ticket AS `Ticket` ON `Link`.ticket_id = `Ticket`.id JOIN Contact AS `Remote` ON `Link`.contact_id = `Remote`.id WHERE ((`Ticket`.`id` = :id) AND (`Remote`.`obsolescence_flag` = 0))',
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user