composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-03-04 08:34:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°3060 - filter modules autoinstalled in checklist test

Browse Source
This commit is contained in:
odain
2020-08-06 10:51:34 +02:00
parent 4e0c6e5614
commit b9145ca996
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/releaseChecklist/iTopModuleXmlInstallationChecklistTest.php
View File

@@ -65,7 +65,9 @@ class iTopModuleXmlInstallationChecklistTest extends ItopTestCase
}
}
$this->assertArraySubset($this->GetModulesFromDatamodels(APPROOT.'/datamodels'), $aDeclaredModules, false, "$sInstallationXmlPath does not refer to all provided modules. Refered modules:\n " . var_export($aDeclaredModules, true));
$aModulesFromDatamodels = $this->GetModulesFromDatamodels(APPROOT.'/datamodels');
$this->assertArraySubset($aModulesFromDatamodels, $aDeclaredModules, false, "$sInstallationXmlPath does not refer to all provided modules. Refered modules:\n " . var_export($aDeclaredModules, true));
$this->assertArraySubset($aDeclaredModules, $aModulesFromDatamodels, false, "Not all modules are contained in $sInstallationXmlPath. Refered modules:\n " . var_export($aModulesFromDatamodels, true));²²
}
public function GetModulesFromDatamodels($sFolder)
@@ -79,10 +81,16 @@ class iTopModuleXmlInstallationChecklistTest extends ItopTestCase
{
$aModules = array_merge($aModules, $this->GetModulesFromDatamodels($sPath));
}
else if (preg_match("/datamodel\..*\.xml/", basename($sPath)))
else if (preg_match("/module\..*\.php/", basename($sPath)))
{
$sModule = basename(dirname($sPath));
$aModules[$sModule] = $sModule;
$sModulePhpContent = file_get_contents($sPath);
if (strpos($sModulePhpContent, "SetupWebPage::AddModule(")!==false
&& strpos($sModulePhpContent, "'mandatory' => true,")===false
&& strpos($sModulePhpContent, "'visible' => false,")===false)
{
$sModule = basename(dirname($sPath));
$aModules[$sModule] = $sModule;
}
}
}
}