From 11d8547cefd3160dec3ba66b4795043f19102749 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Thu, 13 Oct 2022 22:12:14 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B05608=20-=20Move/rename=20unit=20tests=20?=
 =?UTF-8?q?to=20match=20their=20counterpart=20location/name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/php-unit-tests/phpunit.xml.dist                     | 7 +++++++
 .../application/{UtilsTest.php => utilsTest.php}         | 2 +-
 .../composer => sources/Composer}/iTopComposerTest.php   | 9 +++------
 .../application/search/CriterionConversionTest.php       | 0
 .../application/search/CriterionParserTest.php           | 0
 .../{ => sources}/application/search/SearchFormTest.php  | 0
 6 files changed, 11 insertions(+), 7 deletions(-)
 rename test/php-unit-tests/unitary-tests/application/{UtilsTest.php => utilsTest.php} (99%)
 rename test/php-unit-tests/unitary-tests/{application/composer => sources/Composer}/iTopComposerTest.php (94%)
 rename test/php-unit-tests/unitary-tests/{ => sources}/application/search/CriterionConversionTest.php (100%)
 rename test/php-unit-tests/unitary-tests/{ => sources}/application/search/CriterionParserTest.php (100%)
 rename test/php-unit-tests/unitary-tests/{ => sources}/application/search/SearchFormTest.php (100%)

diff --git a/test/php-unit-tests/phpunit.xml.dist b/test/php-unit-tests/phpunit.xml.dist
index ea11c8160..099fb9406 100644
--- a/test/php-unit-tests/phpunit.xml.dist
+++ b/test/php-unit-tests/phpunit.xml.dist
@@ -50,6 +50,13 @@
     <testsuite name="Setup">
       <directory>unitary-tests/setup</directory>
     </testsuite>
+    <!-- Note: The unitary-tests/sources/application/TwigBase is omitted for now as the test is not working -->
+    <testsuite name="SourcesApplicationSearch">
+      <directory>unitary-tests/sources/application/search</directory>
+    </testsuite>
+    <testsuite name="SourcesComposer">
+      <directory>unitary-tests/sources/Composer</directory>
+    </testsuite>
     <testsuite name="Status">
       <directory>unitary-tests/status</directory>
     </testsuite>
diff --git a/test/php-unit-tests/unitary-tests/application/UtilsTest.php b/test/php-unit-tests/unitary-tests/application/utilsTest.php
similarity index 99%
rename from test/php-unit-tests/unitary-tests/application/UtilsTest.php
rename to test/php-unit-tests/unitary-tests/application/utilsTest.php
index e09b7d25c..354146b7c 100644
--- a/test/php-unit-tests/unitary-tests/application/UtilsTest.php
+++ b/test/php-unit-tests/unitary-tests/application/utilsTest.php
@@ -24,7 +24,7 @@ use Combodo\iTop\Test\UnitTest\ItopTestCase;
 /**
  * @covers utils
  */
-class UtilsTest extends ItopTestCase
+class utilsTest extends ItopTestCase
 {
 	public function testEndsWith()
 	{
diff --git a/test/php-unit-tests/unitary-tests/application/composer/iTopComposerTest.php b/test/php-unit-tests/unitary-tests/sources/Composer/iTopComposerTest.php
similarity index 94%
rename from test/php-unit-tests/unitary-tests/application/composer/iTopComposerTest.php
rename to test/php-unit-tests/unitary-tests/sources/Composer/iTopComposerTest.php
index e103360aa..6fe8e08e5 100644
--- a/test/php-unit-tests/unitary-tests/application/composer/iTopComposerTest.php
+++ b/test/php-unit-tests/unitary-tests/sources/Composer/iTopComposerTest.php
@@ -22,8 +22,6 @@ use Combodo\iTop\Test\UnitTest\ItopTestCase;
  *   along with iTop. If not, see <http: *www.gnu.org/licenses/>
  *
  */
-
-
 class iTopComposerTest extends ItopTestCase
 {
 
@@ -84,8 +82,7 @@ class iTopComposerTest extends ItopTestCase
 		$this->assertTrue(is_array($aDirs));
 
 		$aDeniedDirWrongFormat = [];
-		foreach ($aDirs as $sDir)
-		{
+		foreach ($aDirs as $sDir) {
 			if (false === iTopComposer::IsTestDir($sDir)) {
 				$aDeniedDirWrongFormat[] = $sDir;
 			}
@@ -138,8 +135,8 @@ class iTopComposerTest extends ItopTestCase
 		$this->assertEmpty(
 			$aMissing,
 			'Test dirs exists in /lib !'."\n"
-				.'  They must be declared either in the allowed or denied list in '.iTopComposer::class." (see N°2651).\n"
-				.'  List of dirs:'."\n".var_export($aMissing, true)
+			.'  They must be declared either in the allowed or denied list in '.iTopComposer::class." (see N°2651).\n"
+			.'  List of dirs:'."\n".var_export($aMissing, true)
 		);
 	}
 }
diff --git a/test/php-unit-tests/unitary-tests/application/search/CriterionConversionTest.php b/test/php-unit-tests/unitary-tests/sources/application/search/CriterionConversionTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/application/search/CriterionConversionTest.php
rename to test/php-unit-tests/unitary-tests/sources/application/search/CriterionConversionTest.php
diff --git a/test/php-unit-tests/unitary-tests/application/search/CriterionParserTest.php b/test/php-unit-tests/unitary-tests/sources/application/search/CriterionParserTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/application/search/CriterionParserTest.php
rename to test/php-unit-tests/unitary-tests/sources/application/search/CriterionParserTest.php
diff --git a/test/php-unit-tests/unitary-tests/application/search/SearchFormTest.php b/test/php-unit-tests/unitary-tests/sources/application/search/SearchFormTest.php
similarity index 100%
rename from test/php-unit-tests/unitary-tests/application/search/SearchFormTest.php
rename to test/php-unit-tests/unitary-tests/sources/application/search/SearchFormTest.php