From b7c3fbb17650f856538fc38ff7b73a9c03a5bb00 Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 23 Oct 2019 16:41:28 +0200 Subject: [PATCH] :green_heart: Refactor unit tests --- test/ItopDataTestCase.php | 2 +- .../application/search/CriterionConversionTest.php | 14 +++++++++----- test/application/search/CriterionParserTest.php | 5 +++-- test/application/search/SearchFormTest.php | 1 + test/core/DBObjectTest.php | 2 ++ test/core/DBSearchIntersectTest.php | 2 -- test/core/DBSearchTest.php | 1 + test/core/MetaModelTest.php | 2 +- test/core/OQLToSQLAllClassesTest.php | 1 - test/core/OQLToSQLGroupByTest.php | 1 - test/core/OQLToSQLTest.php | 1 - test/core/ormLinkSetTest.php | 3 ++- test/core/ormTagSetTest.php | 1 + test/itop-tickets/itopTicketTest.php | 4 +++- 14 files changed, 24 insertions(+), 16 deletions(-) diff --git a/test/ItopDataTestCase.php b/test/ItopDataTestCase.php index adc300e05..eddbffcc6 100644 --- a/test/ItopDataTestCase.php +++ b/test/ItopDataTestCase.php @@ -65,7 +65,7 @@ class ItopDataTestCase extends ItopTestCase private $aCreatedObjects = array(); const USE_TRANSACTION = true; - const CREATE_TEST_ORG = true; + const CREATE_TEST_ORG = false; /** * @throws Exception diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php index 59c724e49..0d66b2012 100644 --- a/test/application/search/CriterionConversionTest.php +++ b/test/application/search/CriterionConversionTest.php @@ -37,7 +37,9 @@ use Combodo\iTop\Application\Search\CriterionParser; use Combodo\iTop\Application\Search\SearchForm; use Combodo\iTop\Test\UnitTest\ItopDataTestCase; use DBObjectSearch; +use DBObjectSet; use DBSearch; +use Dict; /** * @runTestsInSeparateProcesses @@ -46,6 +48,8 @@ use DBSearch; */ class CriterionConversionTest extends ItopDataTestCase { + const CREATE_TEST_ORG = true; + /** * @throws \Exception */ @@ -186,7 +190,7 @@ class CriterionConversionTest extends ItopDataTestCase $oSearchForm = new SearchForm(); /** @var \DBObjectSearch $oSearch */ $oSearch = DBSearch::FromOQL("SELECT Contact"); - $aFields = $oSearchForm->GetFields(new \DBObjectSet($oSearch)); + $aFields = $oSearchForm->GetFields(new DBObjectSet($oSearch)); $aRes = CriterionToSearchForm::Convert($aCriterion, $aFields, $oSearch->GetJoinedClasses()); $this->debug($aRes); $this->assertEquals($sExpectedOperator, $aRes[0]['operator']); @@ -634,12 +638,12 @@ class CriterionConversionTest extends ItopDataTestCase $this->debug($sOQL); - \Dict::SetUserLanguage($sLanguageCode); + Dict::SetUserLanguage($sLanguageCode); $oSearchForm = new SearchForm(); - $oSearch = \DBSearch::FromOQL($sOQL); - $aFields = $oSearchForm->GetFields(new \DBObjectSet($oSearch)); + $oSearch = DBSearch::FromOQL($sOQL); + $aFields = $oSearchForm->GetFields(new DBObjectSet($oSearch)); /** @var \DBObjectSearch $oSearch */ $aCriterion = $oSearchForm->GetCriterion($oSearch, $aFields); @@ -648,7 +652,7 @@ class CriterionConversionTest extends ItopDataTestCase $aNewCriterion = array(); foreach($aAndCriterion as $aCriteria) { - if ($aCriteria['widget'] != \AttributeDefinition::SEARCH_WIDGET_TYPE_RAW) + if ($aCriteria['widget'] != AttributeDefinition::SEARCH_WIDGET_TYPE_RAW) { unset($aCriteria['oql']); foreach($aFields as $aCatFields) diff --git a/test/application/search/CriterionParserTest.php b/test/application/search/CriterionParserTest.php index 972684c1c..8bc6bfd23 100644 --- a/test/application/search/CriterionParserTest.php +++ b/test/application/search/CriterionParserTest.php @@ -29,19 +29,20 @@ namespace Combodo\iTop\Test\UnitTest\Application\Search; use Combodo\iTop\Application\Search\CriterionParser; -use Combodo\iTop\Test\UnitTest\ItopDataTestCase; +use Combodo\iTop\Test\UnitTest\ItopTestCase; /** * @runTestsInSeparateProcesses * @preserveGlobalState disabled * @backupGlobals disabled */ -class CriterionParserTest extends ItopDataTestCase +class CriterionParserTest extends ItopTestCase { protected function setUp() { parent::setUp(); + require_once(APPROOT."application/startup.inc.php"); require_once(APPROOT."sources/application/search/criterionparser.class.inc.php"); } diff --git a/test/application/search/SearchFormTest.php b/test/application/search/SearchFormTest.php index 1b0378070..aac17df86 100644 --- a/test/application/search/SearchFormTest.php +++ b/test/application/search/SearchFormTest.php @@ -34,6 +34,7 @@ use Exception; */ class SearchFormTest extends ItopDataTestCase { + const CREATE_TEST_ORG = true; /** * @throws Exception diff --git a/test/core/DBObjectTest.php b/test/core/DBObjectTest.php index da44178e0..6c514f72a 100644 --- a/test/core/DBObjectTest.php +++ b/test/core/DBObjectTest.php @@ -37,6 +37,8 @@ use DBObject; */ class DBObjectTest extends ItopDataTestCase { + const CREATE_TEST_ORG = true; + protected function setUp() { parent::setUp(); diff --git a/test/core/DBSearchIntersectTest.php b/test/core/DBSearchIntersectTest.php index be9e06730..cd9f64356 100644 --- a/test/core/DBSearchIntersectTest.php +++ b/test/core/DBSearchIntersectTest.php @@ -17,8 +17,6 @@ use DBSearch; */ class DBSearchIntersectTest extends ItopDataTestCase { - const CREATE_TEST_ORG = false; - protected function setUp() { parent::setUp(); diff --git a/test/core/DBSearchTest.php b/test/core/DBSearchTest.php index 4464db005..2b49f116b 100644 --- a/test/core/DBSearchTest.php +++ b/test/core/DBSearchTest.php @@ -47,6 +47,7 @@ use FunctionExpression; */ class DBSearchTest extends ItopDataTestCase { + const CREATE_TEST_ORG = true; /** * @throws \Exception diff --git a/test/core/MetaModelTest.php b/test/core/MetaModelTest.php index 07e413f24..cfef62313 100644 --- a/test/core/MetaModelTest.php +++ b/test/core/MetaModelTest.php @@ -83,4 +83,4 @@ class MetaModelTest extends ItopDataTestCase ), ); } -} \ No newline at end of file +} diff --git a/test/core/OQLToSQLAllClassesTest.php b/test/core/OQLToSQLAllClassesTest.php index afa3796b3..a09fe0399 100644 --- a/test/core/OQLToSQLAllClassesTest.php +++ b/test/core/OQLToSQLAllClassesTest.php @@ -21,7 +21,6 @@ use utils; class OQLToSQLAllCLassesTest extends ItopDataTestCase { const USE_TRANSACTION = false; - const CREATE_TEST_ORG = false; public function setUp() { diff --git a/test/core/OQLToSQLGroupByTest.php b/test/core/OQLToSQLGroupByTest.php index fa0dcc89d..62c279f5a 100644 --- a/test/core/OQLToSQLGroupByTest.php +++ b/test/core/OQLToSQLGroupByTest.php @@ -15,7 +15,6 @@ use Combodo\iTop\Test\UnitTest\ItopDataTestCase; class OQLToSQLTest extends ItopDataTestCase { const USE_TRANSACTION = false; - const CREATE_TEST_ORG = false; const TEST_CSV_RESULT = 'OQLToSQLTest.csv'; public function setUp() diff --git a/test/core/OQLToSQLTest.php b/test/core/OQLToSQLTest.php index b7b9b637a..d69fc0b86 100644 --- a/test/core/OQLToSQLTest.php +++ b/test/core/OQLToSQLTest.php @@ -20,7 +20,6 @@ use utils; class OQLToSQLTest extends ItopDataTestCase { const USE_TRANSACTION = false; - const CREATE_TEST_ORG = false; const TEST_CSV_RESULT = 'OQLToSQLTest.csv'; public function setUp() diff --git a/test/core/ormLinkSetTest.php b/test/core/ormLinkSetTest.php index aa1194bc9..e72a8442d 100644 --- a/test/core/ormLinkSetTest.php +++ b/test/core/ormLinkSetTest.php @@ -42,8 +42,9 @@ use ormLinkSet; */ class ormLinkSetTest extends ItopDataTestCase { + const CREATE_TEST_ORG = true; - /** + /** * @throws Exception */ protected function setUp() diff --git a/test/core/ormTagSetTest.php b/test/core/ormTagSetTest.php index b8e1d4737..1cdc0f49a 100644 --- a/test/core/ormTagSetTest.php +++ b/test/core/ormTagSetTest.php @@ -44,6 +44,7 @@ define('MAX_TAGS', 12); */ class ormTagSetTest extends ItopDataTestCase { + const CREATE_TEST_ORG = true; /** * @throws Exception diff --git a/test/itop-tickets/itopTicketTest.php b/test/itop-tickets/itopTicketTest.php index 3c8c66041..fbddcca04 100644 --- a/test/itop-tickets/itopTicketTest.php +++ b/test/itop-tickets/itopTicketTest.php @@ -37,7 +37,9 @@ use Exception; */ class ItopTicketTest extends ItopDataTestCase { - /** + const CREATE_TEST_ORG = true; + + /** * @throws Exception */ protected function setUp()