From d7c7ef83328713b89cd6dbbb4ad84fc2d0900488 Mon Sep 17 00:00:00 2001
From: odain <olivier.dain@combodo.com>
Date: Thu, 4 Feb 2021 15:07:44 +0100
Subject: [PATCH] ci/testing work: categorize tests via phpunit @group tags

---
 test/ItopDataTestCase.php                           | 1 -
 test/OQL/DataLocalizerTest.php                      | 3 +++
 test/OQL/OQLToSQLGroupByTest.php                    | 1 +
 test/OQL/OQLToSQLNestedSelectTest.php               | 2 ++
 test/OQL/OQLToSQLTest.php                           | 3 +++
 test/application/search/CriterionConversionTest.php | 2 ++
 test/application/search/CriterionParserTest.php     | 1 +
 test/application/search/SearchFormTest.php          | 1 +
 test/core/DBObjectTest.php                          | 1 +
 test/core/DBSearchCommitTest.php                    | 2 ++
 test/core/DBSearchIntersectTest.php                 | 1 +
 test/core/DBSearchJoinTest.php                      | 1 +
 test/core/DBSearchTest.php                          | 4 ++++
 test/core/MetaModelTest.php                         | 1 +
 test/core/OQLParserTest.php                         | 3 +++
 test/core/OQLTest.php                               | 9 +++++++++
 test/core/TagSetFieldDataTest.php                   | 6 ++++++
 test/core/UserRightsTest.php                        | 1 +
 test/core/ormLinkSetTest.php                        | 2 ++
 test/core/ormTagSetTest.php                         | 1 +
 test/itop-tickets/itopTicketTest.php                | 3 +++
 test/webservices/RestTest.php                       | 1 +
 22 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/test/ItopDataTestCase.php b/test/ItopDataTestCase.php
index 36326540c..609881a94 100644
--- a/test/ItopDataTestCase.php
+++ b/test/ItopDataTestCase.php
@@ -73,7 +73,6 @@ class ItopDataTestCase extends ItopTestCase
 	protected function setUp()
 	{
 		parent::setUp();
-		//require_once(APPROOT.'/application/startup.inc.php');
 		require_once(APPROOT.'application/utils.inc.php');
 
 		$sEnv = 'production';
diff --git a/test/OQL/DataLocalizerTest.php b/test/OQL/DataLocalizerTest.php
index e2a7f8370..09f1d8af5 100644
--- a/test/OQL/DataLocalizerTest.php
+++ b/test/OQL/DataLocalizerTest.php
@@ -8,6 +8,9 @@ define('NUM_PRECISION', 2);
 use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
 
 /**
+ * @group itopRequestMgmt
+ * @group itopVirtualizationMgmt
+ * @group itopServiceMgmt
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/OQL/OQLToSQLGroupByTest.php b/test/OQL/OQLToSQLGroupByTest.php
index 62c279f5a..cf6f713dc 100644
--- a/test/OQL/OQLToSQLGroupByTest.php
+++ b/test/OQL/OQLToSQLGroupByTest.php
@@ -8,6 +8,7 @@ define('NUM_PRECISION', 2);
 use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
 
 /**
+ * @group itopRequestMgmt
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/OQL/OQLToSQLNestedSelectTest.php b/test/OQL/OQLToSQLNestedSelectTest.php
index 38383b351..2cbd1a076 100644
--- a/test/OQL/OQLToSQLNestedSelectTest.php
+++ b/test/OQL/OQLToSQLNestedSelectTest.php
@@ -13,6 +13,7 @@ use SetupUtils;
 use utils;
 
 /**
+ * @group itopRequestMgmt
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
@@ -50,6 +51,7 @@ class OQLToSQLNestedSelectTest extends ItopDataTestCase
 	}
 
 	/**
+	 * @group itopConfigMgmt
 	 * @dataProvider OQLSelectProvider
 	 * @depends testOQLSetup
 	 *
diff --git a/test/OQL/OQLToSQLTest.php b/test/OQL/OQLToSQLTest.php
index dec00c31e..0f578c6fe 100644
--- a/test/OQL/OQLToSQLTest.php
+++ b/test/OQL/OQLToSQLTest.php
@@ -13,6 +13,9 @@ use SetupUtils;
 use utils;
 
 /**
+ * @group itopRequestMgmt
+ * @group itopVirtualizationMgmt
+ * @group itopServiceMgmt
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/application/search/CriterionConversionTest.php b/test/application/search/CriterionConversionTest.php
index fa76123d3..cd37a1c15 100644
--- a/test/application/search/CriterionConversionTest.php
+++ b/test/application/search/CriterionConversionTest.php
@@ -42,6 +42,8 @@ use DBSearch;
 use Dict;
 
 /**
+ * @group itopRequestMgmt
+ * @group itopServiceMgmt
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/application/search/CriterionParserTest.php b/test/application/search/CriterionParserTest.php
index 8bc6bfd23..bd8ebe0e9 100644
--- a/test/application/search/CriterionParserTest.php
+++ b/test/application/search/CriterionParserTest.php
@@ -32,6 +32,7 @@ use Combodo\iTop\Application\Search\CriterionParser;
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
 
 /**
+ * @group itopRequestMgmt
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/application/search/SearchFormTest.php b/test/application/search/SearchFormTest.php
index aac17df86..8e4c64e8b 100644
--- a/test/application/search/SearchFormTest.php
+++ b/test/application/search/SearchFormTest.php
@@ -28,6 +28,7 @@ use DBObjectSearch;
 use Exception;
 
 /**
+ * @group itopRequestMgmt
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/core/DBObjectTest.php b/test/core/DBObjectTest.php
index dbe422945..c32c5d431 100644
--- a/test/core/DBObjectTest.php
+++ b/test/core/DBObjectTest.php
@@ -82,6 +82,7 @@ class DBObjectTest extends ItopDataTestCase
 	}
 
 	/**
+	 * @group itopRequestMgmt
 	 * @covers DBObject::GetOriginal
 	 */
 	public function testGetOriginal()
diff --git a/test/core/DBSearchCommitTest.php b/test/core/DBSearchCommitTest.php
index 8154ee030..30088c513 100644
--- a/test/core/DBSearchCommitTest.php
+++ b/test/core/DBSearchCommitTest.php
@@ -28,6 +28,7 @@ class DBSearchCommitTest extends ItopDataTestCase
 	const USE_TRANSACTION = false;
 
 	/**
+	 * @group itopFaqLight
 	 * @throws \CoreException
 	 * @throws \MissingQueryArgument
 	 * @throws \MySQLException
@@ -59,6 +60,7 @@ class DBSearchCommitTest extends ItopDataTestCase
 	}
 
 	/**
+	 * @group itopFaqLight
 	 * @throws \CoreException
 	 * @throws \CoreUnexpectedValue
 	 * @throws \MissingQueryArgument
diff --git a/test/core/DBSearchIntersectTest.php b/test/core/DBSearchIntersectTest.php
index daa3f4929..ed65813c0 100644
--- a/test/core/DBSearchIntersectTest.php
+++ b/test/core/DBSearchIntersectTest.php
@@ -7,6 +7,7 @@ use Combodo\iTop\Test\UnitTest\ItopTestCase;
 use DBSearch;
 
 /**
+ * @group itopRequestMgmt
  * Class DBSearchIntersectTest
  *
  * @package Combodo\iTop\Test\UnitTest\Core
diff --git a/test/core/DBSearchJoinTest.php b/test/core/DBSearchJoinTest.php
index e71c9ee92..d2f81e515 100644
--- a/test/core/DBSearchJoinTest.php
+++ b/test/core/DBSearchJoinTest.php
@@ -7,6 +7,7 @@ use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
 use DBSearch;
 
 /**
+ * @group itopServiceMgmt
  * Class DBSearchIntersectTest
  *
  * @package Combodo\iTop\Test\UnitTest\Core
diff --git a/test/core/DBSearchTest.php b/test/core/DBSearchTest.php
index e70b87b03..57ff389cb 100644
--- a/test/core/DBSearchTest.php
+++ b/test/core/DBSearchTest.php
@@ -37,6 +37,7 @@ use FunctionExpression;
 
 
 /**
+ * @group itopStorageMgmt
  * Tests of the DBSearch class.
  * <ul>
  * <li>MakeGroupByQuery</li>
@@ -62,6 +63,7 @@ class DBSearchTest extends ItopDataTestCase
 	}
 
 	/**
+	 * @group itopRequestMgmt
 	 * @dataProvider UReqProvider
 	 * @param $iOrgNb
 	 * @param $iPersonNb
@@ -485,6 +487,7 @@ class DBSearchTest extends ItopDataTestCase
 	}
 
 	/**
+	 * @group itopRequestMgmt
 	 * @throws \MySQLException
 	 * @throws \OQLException
 	 */
@@ -660,6 +663,7 @@ class DBSearchTest extends ItopDataTestCase
 	}
 
 	/**
+	 * @group itopRequestMgmt
 	 * @throws \CoreException
 	 * @throws \MissingQueryArgument
 	 * @throws \MySQLException
diff --git a/test/core/MetaModelTest.php b/test/core/MetaModelTest.php
index d79b77625..ecfc1c437 100644
--- a/test/core/MetaModelTest.php
+++ b/test/core/MetaModelTest.php
@@ -31,6 +31,7 @@ class MetaModelTest extends ItopDataTestCase
 	}
 
     /**
+     * @group itopRequestMgmt
      * @covers       MetaModel::ApplyParams()
      * @dataProvider ApplyParamsProvider
      *
diff --git a/test/core/OQLParserTest.php b/test/core/OQLParserTest.php
index a6807e8b0..91faa660b 100644
--- a/test/core/OQLParserTest.php
+++ b/test/core/OQLParserTest.php
@@ -23,6 +23,9 @@ class OQLParserTest extends ItopDataTestCase
 	const USE_TRANSACTION = false;
 
 	/**
+	 * @group iTopChangeMgt
+	 * @group itopConfigMgmt
+	 * @group itopRequestMgmt
 	 * @dataProvider NestedQueryProvider
 	 *
 	 * @param $sQuery
diff --git a/test/core/OQLTest.php b/test/core/OQLTest.php
index d3501efac..4476f56e9 100644
--- a/test/core/OQLTest.php
+++ b/test/core/OQLTest.php
@@ -19,6 +19,7 @@ use OqlInterpreter;
 use utils;
 
 /**
+ * @group itopStructure
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
@@ -46,6 +47,9 @@ class OQLTest extends ItopDataTestCase
 	}
 
 	/**
+     * @group iTopChangeMgt
+	 * @group itopConfigMgmt
+	 * @group itopRequestMgmt
 	 * @dataProvider NestedQueryProvider
 	 *
 	 * @param $sQuery
@@ -74,6 +78,7 @@ class OQLTest extends ItopDataTestCase
 	}
 
     /**
+     * @group itopRequestMgmt
      * @dataProvider GoodQueryProvider
      * @depends testOQLSetup
      *
@@ -213,6 +218,7 @@ class OQLTest extends ItopDataTestCase
     }
 
     /**
+     * @group itopRequestMgmt
      * Needs actual datamodel
      * @depends testOQLSetup
      *
@@ -363,6 +369,9 @@ class OQLTest extends ItopDataTestCase
 	}
 
 	/**
+     * @group iTopChangeMgt
+	 * @group itopConfigMgmt
+	 * @group itopRequestMgmt
 	 * @dataProvider MakeSelectQueryProvider
 	 * @param $sOQL
 	 * @param $sExpectedExceptionClass
diff --git a/test/core/TagSetFieldDataTest.php b/test/core/TagSetFieldDataTest.php
index 9c55a8d00..b8c7cc6d1 100644
--- a/test/core/TagSetFieldDataTest.php
+++ b/test/core/TagSetFieldDataTest.php
@@ -17,6 +17,7 @@ use MetaModel;
 use TagSetFieldData;
 
 /**
+ * @group itopFaqLight
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
@@ -102,6 +103,7 @@ class TagSetFieldDataTest extends ItopDataTestCase
 	}
 
 	/**
+	 * @group itopFaqLight
 	 * @throws \CoreException
 	 * @throws \CoreUnexpectedValue
 	 * @throws \Exception
@@ -190,6 +192,7 @@ class TagSetFieldDataTest extends ItopDataTestCase
 	}
 
 	/**
+	 * @group itopFaqLight
 	 * Test that tag code cannot be modified if used
 	 *
 	 * @throws \CoreException
@@ -244,6 +247,9 @@ class TagSetFieldDataTest extends ItopDataTestCase
 		static::assertFalse(true);
 	}
 
+	/**
+	 * @group itopFaqLight
+	 */
 	public function testMaxTagsAllowed()
 	{
 		/** @var \AttributeTagSet $oAttDef */
diff --git a/test/core/UserRightsTest.php b/test/core/UserRightsTest.php
index ef38e1e68..fd2102114 100644
--- a/test/core/UserRightsTest.php
+++ b/test/core/UserRightsTest.php
@@ -30,6 +30,7 @@ use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
 use UserRights;
 
 /**
+ * @group itopRequestMgmt
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/core/ormLinkSetTest.php b/test/core/ormLinkSetTest.php
index e72a8442d..fbaa42545 100644
--- a/test/core/ormLinkSetTest.php
+++ b/test/core/ormLinkSetTest.php
@@ -34,6 +34,8 @@ use ormLinkSet;
 
 
 /**
+ * @group itopRequestMgmt
+ * @group itopConfigMgmt
  * Tests of the ormLinkSet class using N-N links between FunctionalCI and Contact
  *
  * @runTestsInSeparateProcesses
diff --git a/test/core/ormTagSetTest.php b/test/core/ormTagSetTest.php
index 1cdc0f49a..99529adf0 100644
--- a/test/core/ormTagSetTest.php
+++ b/test/core/ormTagSetTest.php
@@ -36,6 +36,7 @@ use ormTagSet;
 define('MAX_TAGS', 12);
 
 /**
+ * @group itopFaqLight
  * Tests of the ormTagSet class
  *
  * @runTestsInSeparateProcesses
diff --git a/test/itop-tickets/itopTicketTest.php b/test/itop-tickets/itopTicketTest.php
index fbddcca04..ad03bade7 100644
--- a/test/itop-tickets/itopTicketTest.php
+++ b/test/itop-tickets/itopTicketTest.php
@@ -31,6 +31,9 @@ use Exception;
 
 
 /**
+ * @group itopVirtualizationMgmt
+ * @group itopConfigMgmt
+ * @group itopTickets
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled
diff --git a/test/webservices/RestTest.php b/test/webservices/RestTest.php
index d9e98f8a7..91ce5a277 100644
--- a/test/webservices/RestTest.php
+++ b/test/webservices/RestTest.php
@@ -7,6 +7,7 @@ use Exception;
 
 
 /**
+ * @group itopRequestMgmt
  * @runTestsInSeparateProcesses
  * @preserveGlobalState disabled
  * @backupGlobals disabled