From 264a8cd70adba2e074f57506b418d84ca66cd15a Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Thu, 6 Jul 2023 15:28:32 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B06494=20-=20Some=20tests=20are=20run=20tw?=
 =?UTF-8?q?ice,=20some=20never?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit a2a0b2cd0b8f109d2f2e454c2ac73db1bc36a8b5)

(cherry picked from commit 4c9ea0c9d4792ca6ba9901b47413837f996fc2d3)

# Conflicts:
#	tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
---
 .../integration-tests/DictionariesConsistencyTest.php       | 3 +++
 .../iTopDesignFormatChecklistTest.php                       | 6 +++---
 tests/php-unit-tests/postbuild_integration.xml.dist         | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php b/tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
index e52500237..a3c95b8e2 100644
--- a/tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
+++ b/tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
@@ -18,6 +18,9 @@ namespace Combodo\iTop\Test\UnitTest\Integration;
 use Combodo\iTop\Test\UnitTest\ItopTestCase;
 
 
+/**
+ * @group beforeSetup
+ */
 class DictionariesConsistencyTest extends ItopTestCase
 {
 	/**
diff --git a/tests/php-unit-tests/post-build-integration-tests/iTopDesignFormatChecklistTest.php b/tests/php-unit-tests/post-build-integration-tests/iTopDesignFormatChecklistTest.php
index 875fd01ec..d707ace63 100644
--- a/tests/php-unit-tests/post-build-integration-tests/iTopDesignFormatChecklistTest.php
+++ b/tests/php-unit-tests/post-build-integration-tests/iTopDesignFormatChecklistTest.php
@@ -15,7 +15,7 @@ use PHPUnit\Exception;
  *
  * @package Combodo\iTop\Test\UnitTest\Setup
  */
-class TestForITopDesignFormatClass extends ItopTestCase
+class iTopDesignFormatChecklistTest extends ItopTestCase
 {
 	protected function setUp(): void
 	{
@@ -47,7 +47,7 @@ class TestForITopDesignFormatClass extends ItopTestCase
 						$aErrors[] = "cannot retrieve itop_design datamodel version in $sDataModelFile:1";
 						continue;
 					}
-					
+
 					$aDatamodelCurrentVersions[$sVersion] = $sVersion;
 				}
 			}
@@ -159,4 +159,4 @@ class TestForITopDesignFormatClass extends ItopTestCase
 		}
 		return $aDataModelFiles;
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/php-unit-tests/postbuild_integration.xml.dist b/tests/php-unit-tests/postbuild_integration.xml.dist
index b45e634bb..444df800f 100644
--- a/tests/php-unit-tests/postbuild_integration.xml.dist
+++ b/tests/php-unit-tests/postbuild_integration.xml.dist
@@ -16,6 +16,7 @@
         stopOnRisky="false"
         stopOnSkipped="false"
         verbose="true"
+        printerClass="Sempro\PHPUnitPrettyPrinter\PrettyPrinter"
 >
 
     <php>
@@ -23,6 +24,7 @@
         <ini name="display_errors" value="On"/>
         <ini name="log_errors" value="On"/>
         <ini name="html_errors" value="Off"/>
+        <env name="PHPUNIT_PRETTY_PRINT_PROGRESS" value="true"/>
     </php>
 
     <testsuites>