diff --git a/test/releaseChecklist/iTopModulesPhpVersionChecklistTest.php b/test/integration/iTopModulesPhpVersionChecklistTest.php similarity index 65% rename from test/releaseChecklist/iTopModulesPhpVersionChecklistTest.php rename to test/integration/iTopModulesPhpVersionChecklistTest.php index 71c480e4a..46fd5a557 100644 --- a/test/releaseChecklist/iTopModulesPhpVersionChecklistTest.php +++ b/test/integration/iTopModulesPhpVersionChecklistTest.php @@ -1,25 +1,19 @@ - * + * Copyright (C) 2013-2020 Combodo SARL + * This file is part of iTop. + * iTop is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * iTop is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Test\UnitTest\ReleaseChecklist; +namespace Combodo\iTop\Test\UnitTest\Integration; use Combodo\iTop\Test\UnitTest\ItopTestCase; use DOMDocument; @@ -27,7 +21,6 @@ use iTopDesignFormat; /** - * Class iTopDesignFormatChecklistTest * * @runTestsInSeparateProcesses * @preserveGlobalState disabled @@ -37,13 +30,15 @@ use iTopDesignFormat; * * @package Combodo\iTop\Test\UnitTest\Setup */ -class iTopModulesPhpVersionChecklistTest extends ItopTestCase +class iTopModulesPhpVersionIntegrationTest extends ItopTestCase { /** * Verify if the datamodel.*.xml files refer to the current itop version - * This is part of the checklist tests. + * This is an integration test + * + * @group iTopDesignFormat * * @dataProvider iTopModulesPhpVersionProvider */ diff --git a/test/releaseChecklist/iTopModulesXmlVersionChecklistTest.php b/test/integration/iTopModulesXmlVersionChecklistTest.php similarity index 61% rename from test/releaseChecklist/iTopModulesXmlVersionChecklistTest.php rename to test/integration/iTopModulesXmlVersionChecklistTest.php index 658bac1af..9031611a4 100644 --- a/test/releaseChecklist/iTopModulesXmlVersionChecklistTest.php +++ b/test/integration/iTopModulesXmlVersionChecklistTest.php @@ -1,25 +1,19 @@ - * + * Copyright (C) 2013-2020 Combodo SARL + * This file is part of iTop. + * iTop is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * iTop is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * You should have received a copy of the GNU Affero General Public License */ -namespace Combodo\iTop\Test\UnitTest\ReleaseChecklist; +namespace Combodo\iTop\Test\UnitTest\Integration; use Combodo\iTop\Test\UnitTest\ItopTestCase; use DOMDocument; @@ -27,7 +21,6 @@ use iTopDesignFormat; /** - * Class iTopDesignFormatChecklistTest * * @runTestsInSeparateProcesses * @preserveGlobalState disabled @@ -37,13 +30,15 @@ use iTopDesignFormat; * * @package Combodo\iTop\Test\UnitTest\Setup */ -class iTopModulesXmlVersionChecklistTest extends ItopTestCase +class iTopModulesXmlVersionIntegrationTest extends ItopTestCase { /** * Verify if the datamodel.*.xml files refer to the current itop version - * This is part of the checklist tests. + * This is an integration test + * + * @group iTopDesignFormat * * @dataProvider DatamodelItopXmlVersionProvider */ diff --git a/test/phpunit.xml.dist b/test/phpunit.xml.dist index 0e44c350f..7cf47b272 100644 --- a/test/phpunit.xml.dist +++ b/test/phpunit.xml.dist @@ -59,6 +59,9 @@ status + + integration + coreExtensions