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

💚 ThemeHandlerTest: test fix + enhance failure messages

Browse Source
This commit is contained in:
odain
2020-08-26 12:09:55 +02:00
parent c986927de9
commit f5c8411a07
3 changed files with 256 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
test/application/ThemeHandlerTest.php
View File

@@ -111,6 +111,7 @@ class ThemeHandlerTest extends ItopTestCase
{
if (is_file($sXmlDataCustoFilePath))
{
$sXmlDataCustoFilePath = realpath($sXmlDataCustoFilePath);
$sContent = file_get_contents($sXmlDataCustoFilePath);
if (strpos($sContent, "precompiled_stylesheet") !== false)
{
@@ -130,9 +131,9 @@ class ThemeHandlerTest extends ItopTestCase
$sThemeId = $oTheme->getAttribute('id');
echo "=== theme: $sThemeId ===\n";
//echo "=== theme: $sThemeId ===\n";
$sPreCompiledSig = ThemeHandler::GetSignature(dirname(__FILE__)."/../../datamodels/2.x/".$sPrecompiledStylesheetUri);
echo " precompiled signature: $sPreCompiledSig\n";
//echo " precompiled signature: $sPreCompiledSig\n";
if (empty($sPreCompiledSig))
{
@@ -178,11 +179,12 @@ class ThemeHandlerTest extends ItopTestCase
$aIncludedImages = ThemeHandler::GetIncludedImages($aThemeParameters['variables'], $aStylesheetFiles, $sThemeId);
$compiled_json_sig = ThemeHandler::ComputeSignature($aThemeParameters, $aImportsPaths, $aIncludedImages);
echo " current signature: $compiled_json_sig\n";
//echo " current signature: $compiled_json_sig\n";
if ($sPreCompiledSig !== $compiled_json_sig)
{
$aErrors[] = "Precompiled signature does not match currently compiled one on theme '".$sThemeId."' (cf precompiledsheet $sPrecompiledStylesheetUri / datamodel $sXmlDataCustoFilePath)";
$iLine = $oTheme->GetLineNo();
$aErrors[] = " $sPrecompiledStylesheetUri declared in $sXmlDataCustoFilePath:$iLine.";
continue;
}
}
@@ -190,7 +192,16 @@ class ThemeHandlerTest extends ItopTestCase
}
}
$this->assertEquals([], $aErrors, "Precompiled files are not up to date. please have a look.");
if (count($aErrors)!=0)
{
$sMsg = "Below precompiled files are not up to date. Please run a new setup and save your precompiled files again:\n";
$sMsg .= implode("\n", $aErrors);
$this->fail($sMsg);
}
else
{
$this->assertTrue(true);
}
}
function recurseMkdir($dir)