composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-21 17:48:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°931 fix PhpUnit tests for TagSets (default datamodel doesn't have anymore Ticket.tagfield, but FAQ.domains)

Browse Source
This commit is contained in:
Pierre Goiffon
2018-10-02 18:06:23 +02:00
parent 7281bd4a1a
commit c66b0bea41
5 changed files with 436 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/core/DBSearchCommitTest.php
View File

@@ -41,18 +41,18 @@ class DBSearchCommitTest extends ItopDataTestCase
$this->CreateTagData(TAG_CLASS, TAG_ATTCODE, 'tag1', 'UNIT First');
$this->CreateTagData(TAG_CLASS, TAG_ATTCODE, 'tag2', 'UNIT Second');
//Use it
$oTicket = $this->CreateTicket(1);
$oTicket->Set(TAG_ATTCODE, 'tag1');
$oTicket->DBWrite();
$oObjWithTagSet = $this->CreateObjectWithTagSet();
$oObjWithTagSet->Set(TAG_ATTCODE, 'tag1');
$oObjWithTagSet->DBWrite();
$oSearch = DBSearch::FromOQL("SELECT UserRequest");
$oSearch = DBSearch::FromOQL("SELECT ".TAG_CLASS);
$oSearch->AddCondition(TAG_ATTCODE, 'tag1', 'MATCHES');
$oSet = new \DBObjectSet($oSearch);
static::assertEquals(1, $oSet->Count());
$oTicket->Set(TAG_ATTCODE, 'tag1 tag2');
$oTicket->DBWrite();
$oObjWithTagSet->Set(TAG_ATTCODE, 'tag1 tag2');
$oObjWithTagSet->DBWrite();
$oSet = new \DBObjectSet($oSearch);
static::assertEquals(1, $oSet->Count());
@@ -73,18 +73,18 @@ class DBSearchCommitTest extends ItopDataTestCase
$this->CreateTagData(TAG_CLASS, TAG_ATTCODE, 'tag1', 'UNIT First');
$this->CreateTagData(TAG_CLASS, TAG_ATTCODE, 'tag2', 'UNIT Second');
//Use it
$oTicket = $this->CreateTicket(1);
$oTicket->Set(TAG_ATTCODE, 'tag1');
$oTicket->DBWrite();
$oObjWithTagSet = $this->CreateObjectWithTagSet();
$oObjWithTagSet->Set(TAG_ATTCODE, 'tag1');
$oObjWithTagSet->DBWrite();
$oSearch = DBSearch::FromOQL("SELECT UserRequest");
$oSearch = DBSearch::FromOQL("SELECT ".TAG_CLASS);
$oSearch->AddCondition(TAG_ATTCODE, 'tag1');
$oSet = new \DBObjectSet($oSearch);
static::assertEquals(1, $oSet->Count());
$oTicket->Set(TAG_ATTCODE, 'tag1 tag2');
$oTicket->DBWrite();
$oObjWithTagSet->Set(TAG_ATTCODE, 'tag1 tag2');
$oObjWithTagSet->DBWrite();
$oSet = new \DBObjectSet($oSearch);
static::assertEquals(0, $oSet->Count());

18
test/core/TagSetFieldDataTest.php
View File

@@ -105,9 +105,9 @@ class TagSetFieldDataTest extends ItopDataTestCase
// Create a tag
$oTagData = $this->CreateTagData(TAG_CLASS, TAG_ATTCODE, 'tag1', 'First');
//Use it
$oTicket = $this->CreateTicket(1);
$oTicket->Set(TAG_ATTCODE, 'tag1');
$oTicket->DBWrite();
$oObjWithTagSet = $this->CreateObjectWithTagSet();
$oObjWithTagSet->Set(TAG_ATTCODE, 'tag1');
$oObjWithTagSet->DBWrite();
// Try to delete the tag, must complain !
try
@@ -203,9 +203,9 @@ class TagSetFieldDataTest extends ItopDataTestCase
$oTagData->DBWrite();
//Use it
$oTicket = $this->CreateTicket(1);
$oTicket->Set(TAG_ATTCODE, 'tag2');
$oTicket->DBWrite();
$oObjWithTagSet = $this->CreateObjectWithTagSet();
$oObjWithTagSet->Set(TAG_ATTCODE, 'tag2');
$oObjWithTagSet->DBWrite();
// Try to change the code of the tag, must complain !
try
@@ -264,7 +264,7 @@ class TagSetFieldDataTest extends ItopDataTestCase
$sTagCode = 'MaxTag'.$i;
$this->CreateTagData(TAG_CLASS, TAG_ATTCODE, $sTagCode, $sTagCode);
}
$oTicket = $this->CreateTicket(1);
$oObjWithTagSet = $this->CreateObjectWithTagSet();
$this->debug("Max number of tags is $iMaxTags");
$sValue = '';
for ($i = 0; $i < ($iMaxTags + 1); $i++)
@@ -273,8 +273,8 @@ class TagSetFieldDataTest extends ItopDataTestCase
{
$sTagCode = 'MaxTag'.$i;
$sValue .= "$sTagCode ";
$oTicket->Set(TAG_ATTCODE, $sValue);
$oTicket->DBWrite();
$oObjWithTagSet->Set(TAG_ATTCODE, $sValue);
$oObjWithTagSet->DBWrite();
} catch (\Exception $e)
{
// Should fail on the last iteration

2
test/core/ormTagSetTest.php
View File

@@ -60,7 +60,7 @@ class ormTagSetTest extends ItopDataTestCase
public function testGetTagDataClass()
{
$oTagSet = new ormTagSet(TAG_CLASS, TAG_ATTCODE, MAX_TAGS);
static::assertEquals($oTagSet->GetTagDataClass(), 'TagSetFieldDataFor_Ticket__tagfield');
static::assertEquals($oTagSet->GetTagDataClass(), 'TagSetFieldDataFor_'.TAG_CLASS.'__'.TAG_ATTCODE);
}
public function testGetValue()