From 6becd73ac2a83375b0c75ebc3adcae9bd2fb416b Mon Sep 17 00:00:00 2001
From: jf-cbd <jimmy.fayolle@combodo.com>
Date: Tue, 22 Oct 2024 11:47:25 +0200
Subject: [PATCH] :white_check_mark: Update tests to be minimal and removed
 hard-coded ITOP_DESIGN_LATEST_VERSION VERSION

---
 .../unitary-tests/setup/ModelFactoryTest.php          | 11 +++++++----
 .../Convert-samples/3.3_to_3.2.expected.xml           |  1 -
 .../Convert-samples/3.3_to_3.2.input.xml              |  1 -
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/php-unit-tests/unitary-tests/setup/ModelFactoryTest.php b/tests/php-unit-tests/unitary-tests/setup/ModelFactoryTest.php
index 84d1addba..7378b892b 100644
--- a/tests/php-unit-tests/unitary-tests/setup/ModelFactoryTest.php
+++ b/tests/php-unit-tests/unitary-tests/setup/ModelFactoryTest.php
@@ -100,6 +100,9 @@ class ModelFactoryTest extends ItopTestCase
 	 */
 	protected function AssertEqualModels(string $sExpectedXML, ModelFactory $oFactory, $sMessage = '')
 	{
+		// constants aren't accessible in the data provider :(
+		$sExpectedXML = str_replace('##ITOP_DESIGN_LATEST_VERSION##', ITOP_DESIGN_LATEST_VERSION, $sExpectedXML);
+
 		$this->AssertEqualiTopXML($sExpectedXML, $oFactory->Dump(null, true), $sMessage);
 	}
 
@@ -3236,7 +3239,7 @@ XML
 				'aClasses'                 => [
 					['name' => 'A', 'module' => 'M', 'parent' => 'cmdbAbstractObject'],
 				],
-				'sExpectedXML'             => '<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
+				'sExpectedXML'             => '<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="##ITOP_DESIGN_LATEST_VERSION##">
   <loaded_modules/>
   <classes>
     <class id="DBObject"/>
@@ -3266,7 +3269,7 @@ XML
 					['name' => 'A', 'module' => 'M', 'parent' => 'cmdbAbstractObject'],
 					['name' => 'B', 'module' => 'M2', 'parent' => 'cmdbAbstractObject'],
 				],
-				'sExpectedXML'             => '<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
+				'sExpectedXML'             => '<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="##ITOP_DESIGN_LATEST_VERSION##">
   <loaded_modules/>
   <classes>
     <class id="DBObject"/>
@@ -3303,7 +3306,7 @@ XML
 					['name' => 'A', 'module' => 'M', 'parent' => 'cmdbAbstractObject'],
 					['name' => 'B', 'module' => 'M2', 'parent' => 'A'],
 				],
-				'sExpectedXML'             => '<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
+				'sExpectedXML'             => '<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="##ITOP_DESIGN_LATEST_VERSION##">
   <loaded_modules/>
   <classes>
     <class id="DBObject"/>
@@ -3342,7 +3345,7 @@ XML
 					['name' => 'C', 'module' => 'M3', 'parent' => 'cmdbAbstractObject'],
 					['name' => 'D', 'module' => 'M3', 'parent' => 'B'],
 				],
-				'sExpectedXML'             => '<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
+				'sExpectedXML'             => '<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="##ITOP_DESIGN_LATEST_VERSION##">
   <loaded_modules/>
   <classes>
     <class id="DBObject"/>
diff --git a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.3_to_3.2.expected.xml b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.3_to_3.2.expected.xml
index 55ffaf199..da9755d33 100644
--- a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.3_to_3.2.expected.xml
+++ b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.3_to_3.2.expected.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
-  <branding/>
 </itop_design>
diff --git a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.3_to_3.2.input.xml b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.3_to_3.2.input.xml
index 55ffaf199..da9755d33 100644
--- a/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.3_to_3.2.input.xml
+++ b/tests/php-unit-tests/unitary-tests/setup/iTopDesignFormat/Convert-samples/3.3_to_3.2.input.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
-  <branding/>
 </itop_design>