composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 18:48:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix checklist unit tests

Browse Source
This commit is contained in:
bruno-ds
2020-08-06 08:57:41 +02:00
parent b628bb5e80
commit da34383363
3 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
test/releaseChecklist/iTopModulesPhpVersionChecklistTest.php
View File

@@ -45,9 +45,9 @@ class iTopModulesPhpVersionChecklistTest extends ItopTestCase
* Verify if the datamodel.*.xml files refer to the current itop version
* This is part of the checklist tests.
*
* @dataProvider DatamodelItopXmlVersionProvider
* @dataProvider iTopModulesPhpVersionProvider
*/
public function testDatamodelItopXmlVersion($sExpectedVersion, $sPhpFile)
public function testiTopModulesPhpVersion($sExpectedVersion, $sPhpFile)
{
$sModulePath = realpath($sPhpFile);
@@ -65,17 +65,30 @@ class iTopModulesPhpVersionChecklistTest extends ItopTestCase
$this->assertSame($sExpectedVersion, $matches[1], "$sPhpFile file refer does not refer to current itop version ($matches[1] instead of expected $sExpectedVersion)");
}
public function DatamodelItopXmlVersionProvider()
public function iTopModulesPhpVersionProvider()
{
parent::setUp();
require_once APPROOT.'core/config.class.inc.php';
require_once APPROOT.'application/utils.inc.php';
$sPath = APPROOT.'datamodels/2.x/*/module.*.php';
if (is_dir(APPROOT.'datamodels/2.x'))
{
$DatamodelsPath = APPROOT.'datamodels/2.x';
}
elseif (is_dir(APPROOT.'datamodels/1.x'))
{
$DatamodelsPath = APPROOT.'datamodels/1.x';
}
else
{
throw new \Exception('Cannot local the datamodels directory');
}
$sPath = $DatamodelsPath.'/*/module.*.php';
$aPhpFiles = glob($sPath);
$sExpectedVersion = \utils::GetItopVersionShort();
$sExpectedVersion = \utils::GetItopPatchVersion();
$aTestCases = array();
foreach ($aPhpFiles as $sPhpFile)

2
test/releaseChecklist/iTopModulesXmlVersionChecklistTest.php
View File

@@ -70,7 +70,7 @@ class iTopModulesXmlVersionChecklistTest extends ItopTestCase
$sPath = APPROOT.'datamodels/2.x/*/datamodel.*.xml';
$aXmlFiles = glob($sPath);
$sItopVersionShort = \utils::GetItopVersionShort();
$sItopVersionShort = \utils::GetItopPatchVersion();
$aItopVersion = explode('.', $sItopVersionShort);
$sExpectedXmlVersion = ($aItopVersion[0] - 1).'.'.($aItopVersion[1]); // eg: 2.7.0-dev become 1.7