💚 renaming postbuild test folder + fix tests

This commit is contained in:
odain
2020-08-26 12:25:31 +02:00
parent 2ad4fd1707
commit 8319d655b9
6 changed files with 25 additions and 12 deletions

View File

@@ -57,9 +57,22 @@ class iTopModulesPhpVersionIntegrationTest extends ItopTestCase
$matches
);
$this->assertSame($sExpectedVersion, $matches[1], "$sPhpFile file refer does not refer to current itop version ($matches[1] instead of expected $sExpectedVersion)");
$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)");
}
private function KeepMajorVersion($sVersion)
{
preg_match(
"#(.*)\.[^\.]*$#",
$sVersion,
$matches
);
return $matches[1];
}
public function iTopModulesPhpVersionProvider()
{
parent::setUp();

View File

@@ -61,7 +61,7 @@ class iTopModulesXmlVersionIntegrationTest extends ItopTestCase
{
// Compare the original and new format
$sExpectedXmlVersion = ITOP_DESIGN_LATEST_VERSION;
$this->assertSame($oTransformedXml->saveXML(), $oOriginalXml->saveXML(), "Datamodel file $sXmlFile not in the latest format ($sExpectedXmlVersion)");
$this->assertSame($oTransformedXml->saveXML(), $oOriginalXml->saveXML(), "Datamodel file $sXmlFile:2 not in the latest format ($sExpectedXmlVersion)");
}
else
{

View File

@@ -41,8 +41,8 @@
verbose="false">
<testsuites>
<testsuite name="ReleaseChecklist">
<directory>releaseChecklist</directory>
<testsuite name="PostBuildIntegration">
<directory>postbuild_integration</directory>
</testsuite>
</testsuites>

View File

@@ -54,18 +54,18 @@ class TestForITopDesignFormatClass extends ItopTestCase
//check we have migration function from new version to previous one
$sCurrentVersion = array_values($aDatamodelCurrentVersions)[0];
$this->assertTrue(array_key_exists($sCurrentVersion, iTopDesignFormat::$aVersions), "Release checklist: missing $sCurrentVersion config in iTopDesignFormat ");
$this->assertTrue(array_key_exists($sCurrentVersion, iTopDesignFormat::$aVersions), "Missing $sCurrentVersion conversion functions in iTopDesignFormat.");
$aCurrentVersionInfo = iTopDesignFormat::$aVersions[$sCurrentVersion];
$this->assertTrue(is_array($aCurrentVersionInfo), "Release checklist: wrong $sCurrentVersion config in iTopDesignFormat ");
$this->assertTrue(array_key_exists('previous', $aCurrentVersionInfo), "Release checklist: missing previous for $sCurrentVersion config in iTopDesignFormat ");
$this->assertTrue(is_array($aCurrentVersionInfo), "Wrong $sCurrentVersion config in iTopDesignFormat.");
$this->assertTrue(array_key_exists('previous', $aCurrentVersionInfo), "Missing previous for $sCurrentVersion config in iTopDesignFormat.");
$this->TestDefinedFunction($aCurrentVersionInfo, 'go_to_previous', $sCurrentVersion);
//check we have migration function from N-1 version to new one
$sPreviousVersion = $aCurrentVersionInfo['previous'];
$this->assertTrue(array_key_exists($sPreviousVersion, iTopDesignFormat::$aVersions), "Release checklist: missing $sPreviousVersion config in iTopDesignFormat ");
$this->assertTrue(array_key_exists($sPreviousVersion, iTopDesignFormat::$aVersions), "Missing $sPreviousVersion config in iTopDesignFormat.");
$aPreviousVersionInfo = iTopDesignFormat::$aVersions[$sPreviousVersion];
$this->assertTrue(is_array($aPreviousVersionInfo), "Release checklist: wrong $sPreviousVersion config in iTopDesignFormat ");
$this->assertTrue(array_key_exists('previous', $aPreviousVersionInfo), "Release checklist: missing previous for $sPreviousVersion config in iTopDesignFormat ");
$this->assertTrue(is_array($aPreviousVersionInfo), "wrong $sPreviousVersion config in iTopDesignFormat.");
$this->assertTrue(array_key_exists('previous', $aPreviousVersionInfo), "Missing previous for $sPreviousVersion config in iTopDesignFormat.");
$this->TestDefinedFunction($aPreviousVersionInfo, 'go_to_previous', $sPreviousVersion);
$this->TestDefinedFunction($aPreviousVersionInfo, 'go_to_next', $sPreviousVersion);
}
@@ -73,10 +73,10 @@ class TestForITopDesignFormatClass extends ItopTestCase
private function TestDefinedFunction($aCurrentVersionInfo, $sFunctionKey, $sVersion)
{
$sInfo = json_encode($aCurrentVersionInfo, true);
$this->assertTrue(array_key_exists($sFunctionKey, $aCurrentVersionInfo), "Release checklist: missing $sFunctionKey in $sVersion config in iTopDesignFormat: " . $sInfo);
$this->assertTrue(array_key_exists($sFunctionKey, $aCurrentVersionInfo), "Missing $sFunctionKey in $sVersion config in iTopDesignFormat: " . $sInfo);
echo $aCurrentVersionInfo[$sFunctionKey].'\n';
$oReflectionClass = new \ReflectionClass(iTopDesignFormat::class);
$this->assertTrue($oReflectionClass->hasMethod($aCurrentVersionInfo[$sFunctionKey]), "Release checklist: wrong go_to_previous function '".$aCurrentVersionInfo[$sFunctionKey]."'' for $sVersion config in iTopDesignFormat " . $sInfo);
$this->assertTrue($oReflectionClass->hasMethod($aCurrentVersionInfo[$sFunctionKey]), "wrong go_to_previous function '".$aCurrentVersionInfo[$sFunctionKey]."'' for $sVersion config in iTopDesignFormat." . $sInfo);
}
public function GetDataModelFiles($sFolder)