✅ Fix PHPunit errors with InlineImageMock.php and UtilsTest

HTMLDOMSanitizerTest : fix "Fatal error: Cannot declare class InlineImage, because the name is already in use in /var/www/html/iTop/test/core/sanitizer/InlineImageMock.php"
We are now injecting the class to mock, instead of declaring another class with the same name (was working before but why ?!???)

\UtilsTest::testSanitizer : no more testing the "class" filter, because it is a simple indirection, and we need to load datamodel which is causing multiple problems (see the comment in the test method dataprovider)

test/application/UtilsTest.php

@@ -19,10 +19,12 @@
  *
  */
 
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+
 /**
  * @covers utils
  */
-class UtilsTest extends \Combodo\iTop\Test\UnitTest\ItopDataTestCase
+class UtilsTest extends ItopTestCase
 {
 	public function testEndsWith()
 	{
@@ -466,20 +468,27 @@ class UtilsTest extends \Combodo\iTop\Test\UnitTest\ItopDataTestCase
 	public function sanitizerDataProvider()
 	{
 		return [
-			'good integer' => ['integer', '2565', '2565'],
-			'bad integer' => ['integer', 'a2656', '2656'],
-			'good class' => ['class', 'UserRequest', 'UserRequest'],
-			'bad class' => ['class', 'MyUserRequest',null],
-			'good string' => ['string', 'Is Peter smart and funny?', 'Is Peter smart and funny?'],
-			'bad string' => ['string', 'Is Peter <smart> & funny?', 'Is Peter &#60;smart&#62; &#38; funny?'],
-			'good transaction_id' => ['transaction_id', '8965.-dd', '8965.-dd'],
-			'bad transaction_id' => ['transaction_id', '8965.-dd+', null],
-			'good parameter' => ['parameter', 'JU8965-dd=_', 'JU8965-dd=_'],
-			'bad parameter' => ['parameter', '8965.-dd+', null],
-			'good field_name' => ['field_name', 'Name->bUzz38', 'Name->bUzz38'],
-			'bad field_name' => ['field_name', 'name-buzz', null],
-			'good context_param' => ['context_param', '%dssD25_=%:+-', '%dssD25_=%:+-'],
-			'bad context_param' => ['context_param', '%dssD,25_=%:+-', null],
+			'good integer'            => ['integer', '2565', '2565'],
+			'bad integer'             => ['integer', 'a2656', '2656'],
+			/**
+			 * 'class' filter needs a loaded datamodel... and is only an indirection to \MetaModel::IsValidClass so might very important to test !
+			 * If we switch this class to ItopDataTestCase then we are seeing :
+			 *   - the class now takes 18s to process instead of... 459ms when using ItopTestCase !!!
+			 *   - multiple errors are thrown in testGetAbsoluteUrlAppRootPersistency :(
+			 * We decided it wasn't worse the effort to test the 'class' filter !
+			 */
+			//			'good class' => ['class', 'UserRequest', 'UserRequest'],
+			//			'bad class' => ['class', 'MyUserRequest',null],
+			'good string'             => ['string', 'Is Peter smart and funny?', 'Is Peter smart and funny?'],
+			'bad string'              => ['string', 'Is Peter <smart> & funny?', 'Is Peter &#60;smart&#62; &#38; funny?'],
+			'good transaction_id'     => ['transaction_id', '8965.-dd', '8965.-dd'],
+			'bad transaction_id'      => ['transaction_id', '8965.-dd+', null],
+			'good parameter'          => ['parameter', 'JU8965-dd=_', 'JU8965-dd=_'],
+			'bad parameter'           => ['parameter', '8965.-dd+', null],
+			'good field_name'         => ['field_name', 'Name->bUzz38', 'Name->bUzz38'],
+			'bad field_name'          => ['field_name', 'name-buzz', null],
+			'good context_param'      => ['context_param', '%dssD25_=%:+-', '%dssD25_=%:+-'],
+			'bad context_param'       => ['context_param', '%dssD,25_=%:+-', null],
 			'good element_identifier' => ['element_identifier', 'AD05nb', 'AD05nb'],
 			'bad element_identifier' => ['element_identifier', 'AD05nb+', 'AD05nb'],
 			'good url' => ['url', 'https://www.w3schools.com', 'https://www.w3schools.com'],

test/core/sanitizer/AbstractDOMSanitizerTest.php

@@ -14,7 +14,6 @@ abstract class AbstractDOMSanitizerTest extends ItopTestCase
 		parent::setUp();
 		require_once(APPROOT.'application/utils.inc.php');
 		require_once(APPROOT.'core/htmlsanitizer.class.inc.php');
-		require_once(APPROOT.'test/core/sanitizer/InlineImageMock.php');
 	}
 
 	protected function ReadTestFile($sFileToTest, $sFolderName)

test/core/sanitizer/HTMLDOMSanitizerTest.php

@@ -2,16 +2,12 @@
 namespace Combodo\iTop\Test\UnitTest\Core\Sanitizer;
 
 use HTMLDOMSanitizer;
+use InlineImageMock;
 
 
 require_once __DIR__.'/AbstractDOMSanitizerTest.php';
 
 
-/**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- * @backupGlobals disabled
- */
 class HTMLDOMSanitizerTest extends AbstractDOMSanitizerTest
 {
 	/**
@@ -222,15 +218,17 @@ class HTMLDOMSanitizerTest extends AbstractDOMSanitizerTest
 
 	/**
 	 * @dataProvider CallInlineImageProcessImageTagProvider
+	 * @uses         \InlineImageMock
 	 */
 	public function testDoSanitizeCallInlineImageProcessImageTag($sHtml, $iExpectedCount)
 	{
 		require_once APPROOT.'test/core/sanitizer/InlineImageMock.php';
+		InlineImageMock::ResetCallCounter();
 
-		$oSanitizer = new HTMLDOMSanitizer();
+		$oSanitizer = new HTMLDOMSanitizer(InlineImageMock::class);
 		$oSanitizer->DoSanitize($sHtml);
 
-		$iCalledCount = \InlineImage::GetCallCounter();
+		$iCalledCount = \InlineImageMock::GetCallCounter();
 		$this->assertEquals($iExpectedCount, $iCalledCount);
 	}
 

test/core/sanitizer/InlineImageMock.php

@@ -1,4 +1,6 @@
 <?php
+/** @noinspection PhpUnused */
+/** @noinspection PhpIllegalPsrClassPathInspection */
 /**
  * Copyright (C) 2010-2021 Combodo SARL
  *
@@ -20,10 +22,11 @@
  */
 
 /**
- * Mock class used by @see \Combodo\iTop\Test\UnitTest\Core\HTMLDOMSanitizerTest
+ * Mock class used to count number of calls for the ProcessImage static method
  *
+ * @used-by \Combodo\iTop\Test\UnitTest\Core\Sanitizer\HTMLDOMSanitizerTest::testDoSanitizeCallInlineImageProcessImageTag()
  */
-class InlineImage
+class InlineImageMock
 {
 	private static $iCallCounter = 0;
 
@@ -32,6 +35,11 @@ class InlineImage
 		self::$iCallCounter++;
 	}
 
+	public static function ResetCallCounter()
+	{
+		self::$iCallCounter = 0;
+	}
+
 	public static function GetCallCounter()
 	{
 		return self::$iCallCounter;