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

Advanced Search: External keys to hierarchical class selects sub-classes as in previous version

Browse Source 
SVN:trunk[5675]
This commit is contained in:
Eric Espié
2018-04-16 16:35:20 +00:00
parent bd8e44f835
commit c485286114
15 changed files with 232 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
test/application/search/CriterionConversionTest.php
View File

@@ -33,6 +33,8 @@ use Combodo\iTop\Application\Search\CriterionConversion\CriterionToSearchForm;
use Combodo\iTop\Application\Search\CriterionParser;
use Combodo\iTop\Application\Search\SearchForm;
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
use DBObjectSearch;
use DBSearch;
class CriterionConversionTest extends ItopDataTestCase
{
@@ -49,13 +51,17 @@ class CriterionConversionTest extends ItopDataTestCase
/**
* @dataProvider ToOqlProvider
*
* @param $sClass
* @param $sJSONCriterion
* @param $sExpectedOQL
*
* @throws \Exception
*/
public function testToOql($sJSONCriterion, $sExpectedOQL)
public function testToOql($sClass, $sJSONCriterion, $sExpectedOQL)
{
$oSearch = new DBObjectSearch($sClass);
$sOql = CriterionToOQL::Convert(
json_decode($sJSONCriterion, true)
$oSearch, json_decode($sJSONCriterion, true)
);
$this->debug($sOql);
@@ -66,6 +72,7 @@ class CriterionConversionTest extends ItopDataTestCase
{
return array(
'>' => array(
'UserRequest',
'{
"ref": "UserRequest.start_date",
"values": [
@@ -80,6 +87,7 @@ class CriterionConversionTest extends ItopDataTestCase
"(`UserRequest`.`start_date` > '2017-01-01')"
),
'contains' => array(
'Contact',
'{
"ref": "Contact.name",
"values": [
@@ -94,6 +102,7 @@ class CriterionConversionTest extends ItopDataTestCase
"(`Contact`.`name` LIKE '%toto%')"
),
'starts_with' => array(
'Contact',
'{
"ref": "Contact.name",
"values": [
@@ -108,6 +117,7 @@ class CriterionConversionTest extends ItopDataTestCase
"(`Contact`.`name` LIKE 'toto%')"
),
'ends_with' => array(
'Contact',
'{
"ref": "Contact.name",
"values": [
@@ -122,6 +132,7 @@ class CriterionConversionTest extends ItopDataTestCase
"(`Contact`.`name` LIKE '%toto')"
),
'empty' => array(
'Contact',
'{
"ref": "Contact.name",
"values": [
@@ -136,6 +147,7 @@ class CriterionConversionTest extends ItopDataTestCase
"(`Contact`.`name` = '')"
),
'not_empty' => array(
'Contact',
'{
"ref": "Contact.name",
"values": [
@@ -163,7 +175,8 @@ class CriterionConversionTest extends ItopDataTestCase
function testToSearchForm($aCriterion, $sExpectedOperator)
{
$oSearchForm = new SearchForm();
$oSearch = \DBSearch::FromOQL("SELECT Contact");
/** @var \DBObjectSearch $oSearch */
$oSearch = DBSearch::FromOQL("SELECT Contact");
$aFields = $oSearchForm->GetFields(new \DBObjectSet($oSearch));
$aRes = CriterionToSearchForm::Convert($aCriterion, $aFields, $oSearch->GetJoinedClasses());
$this->debug($aRes);
@@ -530,8 +543,8 @@ class CriterionConversionTest extends ItopDataTestCase
),
'Hierarchical below' => array(
'OQL' => "SELECT Person AS P JOIN Organization AS Node ON P.org_id = Node.id JOIN Organization AS Root ON Node.parent_id BELOW Root.id WHERE Root.id=1",
'ExpectedOQL' => "SELECT `P` FROM Person AS `P` JOIN Organization AS `Node` ON `P`.org_id = `Node`.id JOIN Organization AS `Root` ON `Node`.parent_id BELOW `Root`.id WHERE (`Root`.`id` = 1)",
'ExpectedCriterion' => array(array('widget' => 'raw')),
'ExpectedOQL' => "SELECT `P` FROM Person AS `P` JOIN Organization AS `Node` ON `P`.org_id = `Node`.id JOIN Organization AS `Root` ON `Node`.parent_id BELOW `Root`.id WHERE (`Root`.`id` = '1')",
'ExpectedCriterion' => array(array('widget' => 'hierarchical_key')),
),
'IP range' => array(
'OQL' => "SELECT DatacenterDevice AS dev WHERE INET_ATON(dev.managementip) > INET_ATON('10.22.32.224') AND INET_ATON(dev.managementip) < INET_ATON('10.22.32.255')",

16
test/application/search/SearchFormTest.php
View File

@@ -24,6 +24,7 @@ namespace Combodo\iTop\Test\UnitTest\Application\Search;
use Combodo\iTop\Application\Search\SearchForm;
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
use DBObjectSearch;
use Exception;
class SearchFormTest extends ItopDataTestCase
@@ -43,27 +44,25 @@ class SearchFormTest extends ItopDataTestCase
* @dataProvider GetFieldsProvider
* @throws \OQLException
*/
public function testGetFields($sOQL, $iNum, $sList)
public function testGetFields($sOQL)
{
$oSearchForm = new SearchForm();
$oSearch = \DBSearch::FromOQL($sOQL);
$aFields = $oSearchForm->GetFields(new \DBObjectSet($oSearch));
$this->debug($sOQL);
$this->debug(json_encode($aFields, JSON_PRETTY_PRINT));
$this->assertCount($iNum, $aFields[$sList]);
$this->assertTrue(count($aFields['zlist']) > 0);
$this->assertTrue(count($aFields['others']) > 0);
}
public function GetFieldsProvider()
{
return array(
array("SELECT Contact", 8, 'zlist'),
array("SELECT Contact AS C WHERE C.status = 'active'", 3, 'others'),
array("SELECT Person", 12, 'zlist'),
array("SELECT Contact"),
array("SELECT Contact AS C WHERE C.status = 'active'"),
array("SELECT Person"),
array(
"SELECT Person AS p JOIN UserRequest AS u ON u.agent_id = p.id WHERE u.status != 'closed'",
12,
'zlist'
),
);
}
@@ -83,6 +82,7 @@ class SearchFormTest extends ItopDataTestCase
{
$oSearch = \DBSearch::FromOQL($sOQL);
$aFields = $oSearchForm->GetFields(new \DBObjectSet($oSearch));
/** @var DBObjectSearch $oSearch */
$aCriterion = $oSearchForm->GetCriterion($oSearch, $aFields);
} catch (\OQLException $e)
{