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

N°4714 utils version method refactoring

Browse Source 
- removes utils::GetItopPatchVersion and GetItopMinorVersion : unused and badly named :/
- GetItopVersionWikiSyntax now uses core version constant
- iTopModulesPhpVersionIntegrationTest::testiTopModulesPhpVersion now uses ITOP_CORE_VERSION constant
This commit is contained in:
Pierre Goiffon
2022-02-01 15:03:06 +01:00
parent e14845728c
commit 17612f88d3
3 changed files with 13 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/integration/iTopModulesPhpVersionChecklistTest.php
View File

@@ -35,6 +35,8 @@ class iTopModulesPhpVersionIntegrationTest extends ItopTestCase
* @group skipPostBuild
*
* @dataProvider iTopModulesPhpVersionProvider
*
* @since 2.7.7 3.0.1 3.1.0 N°4714 uses new {@link ITOP_CORE_VERSION} constant
*/
public function testiTopModulesPhpVersion($sExpectedVersion, $sPhpFile)
{
@@ -51,9 +53,8 @@ class iTopModulesPhpVersionIntegrationTest extends ItopTestCase
$matches
);
$this->assertRegExp("#$sExpectedVersion#", $matches[1],
" $sPhpFile:2 file refer does not refer to current itop version ($sModuleName/$matches[1] does not match regexp $sModuleName/$sExpectedVersion)");
$this->assertSame($sExpectedVersion, $matches[1],
'Module desc file does not contain the same version as the core: '.$sPhpFile);
}
public function iTopModulesPhpVersionProvider()
@@ -74,7 +75,7 @@ class iTopModulesPhpVersionIntegrationTest extends ItopTestCase
$sPath = $DatamodelsPath.'/*/module.*.php';
$aPhpFiles = glob($sPath);
$sExpectedVersion = \utils::GetItopMinorVersion().'\.\d+'; // ie: 2.7\.\d+ (and yes, the 1st dot should be escaped, but, hey, it is good enough as it, ans less complex to read)
$sExpectedVersion = ITOP_CORE_VERSION;
$aTestCases = array();
foreach ($aPhpFiles as $sPhpFile) {