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

Make the tests compatible with windows (and linux)

Browse Source
This commit is contained in:
Romain Quetiez
2024-05-03 15:24:59 +02:00
parent 5d5df5ad1a
commit ccaf2dc5b7
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php
View File

@@ -21,7 +21,7 @@ class iTopConfigParserTest extends ItopTestCase
clearstatcache();
$this->sConfigPath = utils::GetConfigFilePath();
$this->tmpSavePath = tempnam('/tmp/', 'config-itop');
$this->tmpSavePath = tempnam(sys_get_temp_dir(), 'config-itop');
$this->conf_exists = is_file($this->sConfigPath);
if ($this->conf_exists)
@@ -156,8 +156,8 @@ class iTopConfigParserTest extends ItopTestCase
*/
public function testConfigWriteToFile()
{
$tmpConfigFileBeforePath = tempnam( '/tmp/', 'config-itop');
$tmpConfigFileAfterPath = tempnam( '/tmp/', 'config-itop');
$tmpConfigFileBeforePath = tempnam( sys_get_temp_dir(), 'config-itop');
$tmpConfigFileAfterPath = tempnam( sys_get_temp_dir(), 'config-itop');
//create new config file
$sConfigFile = utils::GetConfig()->GetLoadedFile();

4
tests/php-unit-tests/unitary-tests/setup/unattended-install/InstallationFileServiceTest.php
View File

@@ -287,8 +287,8 @@ class InstallationFileServiceTest extends ItopTestCase {
private function GetMockListOfFoundModules() : array {
$sJsonContent = file_get_contents(realpath(__DIR__ . '/resources/AnalyzeInstallation.json'));
$sJsonContent = str_replace('ROOTDIR_TOREPLACE', APPROOT, $sJsonContent);
return json_decode($sJsonContent, true);
$sJsonContent = str_replace('ROOTDIR_TOREPLACE', addslashes(APPROOT), $sJsonContent);
return json_decode($sJsonContent, true);
}
/**

8
tests/php-unit-tests/unitary-tests/setup/unattended-install/UnattendedInstallTest.php
View File

@@ -69,6 +69,12 @@ class UnattendedInstallTest extends ItopDataTestCase
$sOutput = implode('\n', $aOutput);
var_dump($sOutput);
$this->assertStringContainsString("Missing mandatory argument `--param-file`", $sOutput);
$this->assertEquals(255, $iCode);
if (DIRECTORY_SEPARATOR === '\\') {
// Windows
$this->assertEquals(-1, $iCode);
} else {
// Linux
$this->assertEquals(255, $iCode);
}
}
}