From e6bab46854490babdbe6b871c7ceaec02dd4269c Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Wed, 19 Aug 2020 11:36:40 +0200
Subject: [PATCH] Add unit tests for XML migration from 1.8 > 1.7 and 1.7 > 1.6

---
 .../iTopDesignFormat/1.7_to_1.6.expected.xml  |  1 +
 .../iTopDesignFormat/1.7_to_1.6.input.xml     |  9 ++++++++
 .../iTopDesignFormat/1.8_to_1.7.expected.xml  | 18 +++++++++++++++
 .../iTopDesignFormat/1.8_to_1.7.input.xml     | 22 +++++++++++++++++++
 .../iTopDesignFormat/iTopDesignFormatTest.php |  5 +++--
 5 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 test/setup/iTopDesignFormat/1.8_to_1.7.expected.xml
 create mode 100644 test/setup/iTopDesignFormat/1.8_to_1.7.input.xml

diff --git a/test/setup/iTopDesignFormat/1.7_to_1.6.expected.xml b/test/setup/iTopDesignFormat/1.7_to_1.6.expected.xml
index 280019cad..7e6f64070 100644
--- a/test/setup/iTopDesignFormat/1.7_to_1.6.expected.xml
+++ b/test/setup/iTopDesignFormat/1.7_to_1.6.expected.xml
@@ -12,4 +12,5 @@
       <url>$$http://fr.wikipedia.org/</url>
     </menu>
   </menus>
+  <branding/>
 </itop_design>
diff --git a/test/setup/iTopDesignFormat/1.7_to_1.6.input.xml b/test/setup/iTopDesignFormat/1.7_to_1.6.input.xml
index ec041ae93..edf2e0cc5 100644
--- a/test/setup/iTopDesignFormat/1.7_to_1.6.input.xml
+++ b/test/setup/iTopDesignFormat/1.7_to_1.6.input.xml
@@ -13,4 +13,13 @@
 			<url>$$http://fr.wikipedia.org/</url>
 		</menu>
 	</menus>
+	<branding>
+		<themes>
+			<theme id="light-grey">
+				<variables>
+					<variable id="foo" _delta="define">bar</variable>
+        </variables>
+			</theme>
+		</themes>
+	</branding>
 </itop_design>
diff --git a/test/setup/iTopDesignFormat/1.8_to_1.7.expected.xml b/test/setup/iTopDesignFormat/1.8_to_1.7.expected.xml
new file mode 100644
index 000000000..d169b121f
--- /dev/null
+++ b/test/setup/iTopDesignFormat/1.8_to_1.7.expected.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.7">
+  <menus>
+    <menu id="WelcomeMenuLink1" xsi:type="WebPageMenuNode" _delta="define">
+      <rank>100</rank>
+      <parent>WelcomeMenu</parent>
+      <url>$$http://fr.wikipedia.org/</url>
+      <in_new_window>true</in_new_window>
+    </menu>
+    <menu id="RequestManagement" xsi:type="MenuGroup" _delta="define">
+      <rank>30</rank>
+      <enable_stimulus/>
+    </menu>
+  </menus>
+  <branding>
+    <main_logo _delta="define">images/itop-logo.png</main_logo>
+  </branding>
+</itop_design>
diff --git a/test/setup/iTopDesignFormat/1.8_to_1.7.input.xml b/test/setup/iTopDesignFormat/1.8_to_1.7.input.xml
new file mode 100644
index 000000000..2ef953c22
--- /dev/null
+++ b/test/setup/iTopDesignFormat/1.8_to_1.7.input.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.8">
+	<menus>
+		<menu id="WelcomeMenuLink1" xsi:type="WebPageMenuNode" _delta="define">
+			<rank>100</rank>
+			<parent>WelcomeMenu</parent>
+			<url>$$http://fr.wikipedia.org/</url>
+			<in_new_window>true</in_new_window>
+		</menu>
+		<menu id="RequestManagement" xsi:type="MenuGroup" _delta="define">
+			<rank>30</rank>
+			<enable_stimulus/>
+	    <style>
+		    <decoration_classes>fas fa-comment-alt</decoration_classes>
+	    </style>
+		</menu>
+	</menus>
+	<branding>
+		<main_logo _delta="define">images/itop-logo.png</main_logo>
+		<main_logo_compact _delta="define">images/itop-logo-square.png</main_logo_compact>
+	</branding>
+</itop_design>
diff --git a/test/setup/iTopDesignFormat/iTopDesignFormatTest.php b/test/setup/iTopDesignFormat/iTopDesignFormatTest.php
index cabfbba24..004541520 100644
--- a/test/setup/iTopDesignFormat/iTopDesignFormatTest.php
+++ b/test/setup/iTopDesignFormat/iTopDesignFormatTest.php
@@ -31,7 +31,7 @@ class TestForITopDesignFormatClass extends ItopTestCase
 
 	/**
 	 * @covers       iTopDesignFormat::Convert
-	 * @dataProvider testMigrationMethodProvider
+	 * @dataProvider MigrationMethodProvider
 	 *
 	 * @param string $sTargetVersion
 	 * @param string $sInputXmlFileName example "1.7_to_1.6.input"
@@ -64,10 +64,11 @@ class TestForITopDesignFormatClass extends ItopTestCase
 		return file_get_contents($sCurrentPath.DIRECTORY_SEPARATOR.$sFileName.'.xml');
 	}
 
-	public function testMigrationMethodProvider()
+	public function MigrationMethodProvider()
 	{
 		return array(
 			'1.7 to 1.6' => array('1.6', '1.7_to_1.6.input', '1.7_to_1.6.expected'),
+			'1.8 to 1.7' => array('1.7', '1.8_to_1.7.input', '1.8_to_1.7.expected'),
 		);
 	}
 }
\ No newline at end of file