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

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source 
# Conflicts:
#	tests/php-unit-tests/unitary-tests/core/OQLTest.php
#	tests/php-unit-tests/unitary-tests/core/iTopConfigParserTest.php
#	tests/php-unit-tests/unitary-tests/webservices/RestTest.php
This commit is contained in:
Pierre Goiffon
2023-01-16 11:36:02 +01:00
parent d7b94fb123 f65e14397c
commit 0a7c8f9fd1
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/php-unit-tests/unitary-tests/core/OQLTest.php
View File

@@ -41,10 +41,11 @@ class OQLTest extends ItopDataTestCase
utils::GetConfig()->Set('apc_cache.enabled', false, 'test');
utils::GetConfig()->Set('query_cache_enabled', false, 'test');
utils::GetConfig()->Set('expression_cache_enabled', false, 'test');
$sConfigFile = utils::GetConfig()->GetLoadedFile();
@chmod($sConfigFile, 0770);
utils::GetConfig()->WriteToFile();
@chmod($sConfigFile, 0444); // Read-only
$oConfig->WriteToFile();
@chmod($sConfigFile, 0444);
}
/**

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

@@ -44,10 +44,10 @@ class iTopConfigParserTest extends ItopTestCase
parent::tearDown();
if ($this->conf_exists) {
// restoring config that was in place before the test
$sBackupConfigFileContent = file_get_contents($this->tmpSavePath);
$hItopConfigFile = @fopen($this->sConfigPath, 'w');
fwrite($hItopConfigFile, $sBackupConfigFileContent);
fclose($hItopConfigFile);
@chmod($this->sConfigPath, 0770);
$bRenameResult = rename($this->tmpSavePath, $this->sConfigPath);
echo "Restored config file, result={$bRenameResult}";
@chmod($this->sConfigPath, 0440);
}
}

21
tests/php-unit-tests/unitary-tests/webservices/RestTest.php
View File

@@ -42,20 +42,16 @@ class RestTest extends ItopDataTestCase
unlink($this->sTmpFile);
}
$sConfigFile = \utils::GetConfig()->GetLoadedFile();
@chmod($sConfigFile, 0770);
$this->sUrl = \MetaModel::GetConfig()->Get('app_root_url');
@chmod($sConfigFile, 0444); // Read-only
$this->sUrl = \MetaModel::GetConfig()->Get('app_root_url');
$oRestProfile = \MetaModel::GetObjectFromOQL("SELECT URP_Profiles WHERE name = :name", array('name' => 'REST Services User'), true);
$oAdminProfile = \MetaModel::GetObjectFromOQL("SELECT URP_Profiles WHERE name = :name", array('name' => 'Administrator'), true);
$oRestProfile = \MetaModel::GetObjectFromOQL("SELECT URP_Profiles WHERE name = :name", array('name' => 'REST Services User'), true);
$oAdminProfile = \MetaModel::GetObjectFromOQL("SELECT URP_Profiles WHERE name = :name", array('name' => 'Administrator'), true);
if (is_object($oRestProfile) && is_object($oAdminProfile))
{
$oUser = $this->CreateUser($this->sLogin, $oRestProfile->GetKey(), $this->sPassword);
$this->AddProfileToUser($oUser, $oAdminProfile->GetKey());
}
}
if (is_object($oRestProfile) && is_object($oAdminProfile)) {
$oUser = $this->CreateUser($this->sLogin, $oRestProfile->GetKey(), $this->sPassword);
$this->AddProfileToUser($oUser, $oAdminProfile->GetKey());
}
}
/**
* @dataProvider BasicProvider
@@ -69,6 +65,7 @@ class RestTest extends ItopDataTestCase
$description = date('dmY H:i:s');
$sOuputJson = $this->CreateTicketViaApi($description);
$aJson = json_decode($sOuputJson, true);
$this->assertNotNull($aJson, "Cannot decode returned JSON : $sOuputJson");
if ($this->iJsonDataMode === self::MODE['NO_JSONDATA']){
$this->assertStringContainsString("3", "".$aJson['code'], $sOuputJson);