From 6aa9aa283138826abd9f5f4d473c7fcb47570b34 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Tue, 10 Jan 2023 18:15:53 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B05608=20-=20Fix=20unit=20tests=20followin?=
 =?UTF-8?q?g=20restructuring=20Part=20I?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unitary-tests/setup/MFCompilerTest.php    |  2 +-
 .../application/status/StatusIncTest.php      | 47 +++++++++----------
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/tests/php-unit-tests/unitary-tests/setup/MFCompilerTest.php b/tests/php-unit-tests/unitary-tests/setup/MFCompilerTest.php
index 4857b9914..f970ae38f 100644
--- a/tests/php-unit-tests/unitary-tests/setup/MFCompilerTest.php
+++ b/tests/php-unit-tests/unitary-tests/setup/MFCompilerTest.php
@@ -41,7 +41,7 @@ class MFCompilerTest extends ItopTestCase {
 		}
 		clearstatcache();
 		$sPrefix = 'scsstest_';
-		$sAppRootForProvider = dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR;
+		$sAppRootForProvider = dirname(dirname(dirname(dirname(dirname(__FILE__))))) . DIRECTORY_SEPARATOR;
 		$sTempTargetDir = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'UseLatestPrecompiledFileProvider';
 		$sExtensionTargetDir = $sAppRootForProvider . 'extensions/UseLatestPrecompiledFileProvider';
 		$sSourceDir = $sAppRootForProvider . 'datamodels' . DIRECTORY_SEPARATOR . '2.x';
diff --git a/tests/php-unit-tests/unitary-tests/sources/application/status/StatusIncTest.php b/tests/php-unit-tests/unitary-tests/sources/application/status/StatusIncTest.php
index e23b986cc..c53240572 100644
--- a/tests/php-unit-tests/unitary-tests/sources/application/status/StatusIncTest.php
+++ b/tests/php-unit-tests/unitary-tests/sources/application/status/StatusIncTest.php
@@ -12,6 +12,8 @@ namespace Combodo\iTop\Test\UnitTest\Status;
  * Date: 25/01/2019
  */
 
+use Combodo\iTop\Application\Status\Status;
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
 use Config;
 use PHPUnit\Framework\TestCase;
 use function Combodo\iTop\Application\Status\StatusCheckConfigFile;
@@ -27,7 +29,7 @@ if (!defined('DEBUG_UNIT_TEST')) {
  * @preserveGlobalState disabled
  * @backupGlobals disabled
  */
-class StatusIncTest extends TestCase {
+class StatusIncTest extends ItopTestCase {
 
     /**
      * @var string
@@ -36,29 +38,26 @@ class StatusIncTest extends TestCase {
 
 	protected function setUp(): void
 	{
-		//AppRoot is the directory containing the directory
-		//Assume getcwd() is runned inside APPROOT/test
-		$this->sAppRoot = __DIR__.'/../../../../../../sources/application/status';
+		parent::setUp();
+		$this->RequireOnceItopFile('sources/application/status/Status.php');
 	}
 
     /**
      * @expectedException \Exception
      */
     public function testStatusGetAppRootWrongPath() {
-        include_once($this->sAppRoot . '/Status.php');
-
         $sAppRootFilenamewrong = 'approot.inc.php_wrong';
 
-        StatusGetAppRoot($sAppRootFilenamewrong);
+		$oStatus = new Status();
+		$this->InvokeNonPublicMethod("Combodo\iTop\Application\Status\Status", "StatusGetAppRoot", $oStatus, [$sAppRootFilenamewrong]);
     }
 
     /**
      * 
      */
     public function testStatusGetAppRootGood() {
-        include_once($this->sAppRoot . '/Status.php');
-
-        StatusGetAppRoot();
+	    $oStatus = new Status();
+	    $this->InvokeNonPublicMethod("Combodo\iTop\Application\Status\Status", "StatusGetAppRoot", $oStatus, []);
 
         $this->assertNotEmpty(APPROOT);
     }
@@ -67,20 +66,18 @@ class StatusIncTest extends TestCase {
      * @expectedException \Exception
      */
     public function testStatusCheckConfigFileWrongPath() {
-        include_once($this->sAppRoot . '/Status.php');
-
         $sConfigFilenamewrong = 'config-itop.php_wrong';
 
-        StatusCheckConfigFile($sConfigFilenamewrong);
+	    $oStatus = new Status();
+	    $this->InvokeNonPublicMethod("Combodo\iTop\Application\Status\Status", "StatusCheckConfigFile", $oStatus, [$sConfigFilenamewrong]);
     }
 
     /**
      * 
      */
     public function testStatusCheckConfigFileGood() {
-        include_once($this->sAppRoot . '/Status.php');
-
-        StatusCheckConfigFile();
+	    $oStatus = new Status();
+	    $this->InvokeNonPublicMethod("Combodo\iTop\Application\Status\Status", "StatusCheckConfigFile", $oStatus, []);
 
         $this->assertTrue(true);
     }
@@ -89,26 +86,24 @@ class StatusIncTest extends TestCase {
      * @expectedException \MySQLException
      */
     public function testStatusStartupWrongDbPwd() {
-        include_once($this->sAppRoot . '/Status.php');
+	    $oStatus = new Status();
+	    $this->InvokeNonPublicMethod("Combodo\iTop\Application\Status\Status", "StatusCheckConfigFile", $oStatus, []);
 
-        StatusCheckConfigFile();
-	    require_once(APPROOT . '/core/cmdbobject.class.inc.php');
-	    require_once(APPROOT . '/application/utils.inc.php');
-	    require_once(APPROOT . '/core/contexttag.class.inc.php');
+	    $this->RequireOnceItopFile('core/cmdbobject.class.inc.php');
+	    $this->RequireOnceItopFile('application/utils.inc.php');
+	    $this->RequireOnceItopFile('core/contexttag.class.inc.php');
 
         $oConfigWrong = new Config(ITOP_DEFAULT_CONFIG_FILE);
         $oConfigWrong->Set('db_pwd', $oConfigWrong->Get('db_pwd') . '_unittest');
-
-        StatusStartup($oConfigWrong);
+	    $this->InvokeNonPublicMethod("Combodo\iTop\Application\Status\Status", "StatusStartup", $oStatus, [$oConfigWrong]);
     }
 
     /**
      * 
      */
     public function testStatusStartupGood() {
-        include_once($this->sAppRoot . '/Status.php');
-
-        StatusStartup();
+	    $oStatus = new Status();
+	    $this->InvokeNonPublicMethod("Combodo\iTop\Application\Status\Status", "StatusStartup", $oStatus, []);
 
         $this->assertTrue(true);
     }