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 @@ $$http://fr.wikipedia.org/ + 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 @@ $$http://fr.wikipedia.org/ + + + + + bar + + + + 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 @@ + + + + + 100 + WelcomeMenu + $$http://fr.wikipedia.org/ + true + + + 30 + + + + + images/itop-logo.png + + 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 @@ + + + + + 100 + WelcomeMenu + $$http://fr.wikipedia.org/ + true + + + 30 + + + + + + images/itop-logo.png + images/itop-logo-square.png + + 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