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

:greenheart: test readability

Browse Source
This commit is contained in:
bruno-ds
2020-08-31 14:45:40 +02:00
parent eb99dc9f3f
commit 7d8aaf91db
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/integration/iTopModulesPhpVersionChecklistTest.php
View File

@@ -57,22 +57,10 @@ class iTopModulesPhpVersionIntegrationTest extends ItopTestCase
$matches
);
$this->assertSame($this->KeepMajorVersion($sExpectedVersion), $this->KeepMajorVersion($matches[1]),
"$sPhpFile file refer does not refer to current itop version ($matches[1] instead of expected $sExpectedVersion)");
$this->assertRegExp("#$sExpectedVersion#", $matches[1], "$sPhpFile file refer does not refer to current itop version ($sModuleName/$matches[1] does not match regexp $sModuleName/$sExpectedVersion)");
}
private function KeepMajorVersion($sVersion)
{
preg_match(
"#(.*)\.[^\.]*$#",
$sVersion,
$matches
);
return $matches[1];
}
public function iTopModulesPhpVersionProvider()
{
parent::setUp();
@@ -96,7 +84,7 @@ class iTopModulesPhpVersionIntegrationTest extends ItopTestCase
$sPath = $DatamodelsPath.'/*/module.*.php';
$aPhpFiles = glob($sPath);
$sExpectedVersion = \utils::GetItopPatchVersion();
$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)
$aTestCases = array();
foreach ($aPhpFiles as $sPhpFile)