mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-24 02:58:43 +02:00
N°5857 - PHPUnit: Replace usage of deprecated assetContains with assertStringContainsString
This commit is contained in:
@@ -334,7 +334,7 @@ class MetaModelTest extends ItopDataTestCase
|
||||
try {
|
||||
MetaModel::GetEnumStyle('Contact', 'name', '');
|
||||
} catch (CoreException $e) {
|
||||
self::assertContains('AttributeEnum', $e->getMessage());
|
||||
self::assertStringContainsString('AttributeEnum', $e->getMessage());
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@ class TriggerTest extends ItopDataTestCase
|
||||
$this->assertEquals('Unknown class \'Toto\' (<b title="Trigger">TriggerOnObjectCreate</b>::-1 ()<br/>)', $e1->getMessage());
|
||||
|
||||
$fullStackTraceAsString = $e1->getFullStackTraceAsString();
|
||||
$this->assertContains("MetaModel::NewObject", $fullStackTraceAsString,"new enriched exception should contain root cause method: " . $fullStackTraceAsString);
|
||||
$this->assertStringContainsString("MetaModel::NewObject", $fullStackTraceAsString,"new enriched exception should contain root cause method: " . $fullStackTraceAsString);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -60,7 +60,7 @@ class ConfigTest extends ItopTestCase
|
||||
$this->assertFileExists($sTmpFile);
|
||||
$sFileContent = file_get_contents($sTmpFile);
|
||||
|
||||
$this->assertContains($sExpectedContains, $sFileContent, "File content doesn't contain : ".$sExpectedContains);
|
||||
$this->assertStringContainsString($sExpectedContains, $sFileContent, "File content doesn't contain : ".$sExpectedContains);
|
||||
}
|
||||
|
||||
public function ProviderPreserveVarOnWriteToFile()
|
||||
|
||||
@@ -71,14 +71,14 @@ class RestTest extends ItopDataTestCase
|
||||
$aJson = json_decode($sOuputJson, true);
|
||||
|
||||
if ($this->iJsonDataMode === self::MODE['NO_JSONDATA']){
|
||||
$this->assertContains("3", "".$aJson['code'], $sOuputJson);
|
||||
$this->assertContains("Error: Missing parameter 'json_data'", "".$aJson['message'], $sOuputJson);
|
||||
$this->assertStringContainsString("3", "".$aJson['code'], $sOuputJson);
|
||||
$this->assertStringContainsString("Error: Missing parameter 'json_data'", "".$aJson['message'], $sOuputJson);
|
||||
return;
|
||||
}
|
||||
|
||||
$this->assertContains("0", "".$aJson['code'], $sOuputJson);
|
||||
$this->assertStringContainsString("0", "".$aJson['code'], $sOuputJson);
|
||||
$sUserRequestKey = $this->array_key_first($aJson['objects']);
|
||||
$this->assertContains('UserRequest::', $sUserRequestKey);
|
||||
$this->assertStringContainsString('UserRequest::', $sUserRequestKey);
|
||||
$iId = $aJson['objects'][$sUserRequestKey]['key'];
|
||||
$sExpectedJsonOuput=<<<JSON
|
||||
{"objects":{"UserRequest::$iId":{"code":0,"message":"created","class":"UserRequest","key":"$iId","fields":{"id":"$iId"}}},"code":0,"message":null}
|
||||
@@ -125,14 +125,14 @@ JSON;
|
||||
$aJson = json_decode($sOuputJson, true);
|
||||
|
||||
if ($this->iJsonDataMode === self::MODE['NO_JSONDATA']){
|
||||
$this->assertContains("3", "".$aJson['code'], $sOuputJson);
|
||||
$this->assertContains("Error: Missing parameter 'json_data'", "".$aJson['message'], $sOuputJson);
|
||||
$this->assertStringContainsString("3", "".$aJson['code'], $sOuputJson);
|
||||
$this->assertStringContainsString("Error: Missing parameter 'json_data'", "".$aJson['message'], $sOuputJson);
|
||||
return;
|
||||
}
|
||||
|
||||
$this->assertContains("0", "".$aJson['code'], $sOuputJson);
|
||||
$this->assertStringContainsString("0", "".$aJson['code'], $sOuputJson);
|
||||
$sUserRequestKey = $this->array_key_first($aJson['objects']);
|
||||
$this->assertContains('UserRequest::', $sUserRequestKey);
|
||||
$this->assertStringContainsString('UserRequest::', $sUserRequestKey);
|
||||
$iId = $aJson['objects'][$sUserRequestKey]['key'];
|
||||
|
||||
//update ticket
|
||||
@@ -164,21 +164,21 @@ JSON;
|
||||
$aJson = json_decode($sOuputJson, true);
|
||||
|
||||
if ($this->iJsonDataMode === self::MODE['NO_JSONDATA']){
|
||||
$this->assertContains("3", "".$aJson['code'], $sOuputJson);
|
||||
$this->assertContains("Error: Missing parameter 'json_data'", "".$aJson['message'], $sOuputJson);
|
||||
$this->assertStringContainsString("3", "".$aJson['code'], $sOuputJson);
|
||||
$this->assertStringContainsString("Error: Missing parameter 'json_data'", "".$aJson['message'], $sOuputJson);
|
||||
return;
|
||||
}
|
||||
|
||||
$this->assertContains("0", "".$aJson['code'], $sOuputJson);
|
||||
$this->assertStringContainsString("0", "".$aJson['code'], $sOuputJson);
|
||||
$sUserRequestKey = $this->array_key_first($aJson['objects']);
|
||||
$this->assertContains('UserRequest::', $sUserRequestKey);
|
||||
$this->assertStringContainsString('UserRequest::', $sUserRequestKey);
|
||||
$iId = $aJson['objects'][$sUserRequestKey]['key'];
|
||||
|
||||
//delete ticket
|
||||
$sExpectedJsonOuput=<<<JSON
|
||||
{"objects":{"UserRequest::$iId"
|
||||
JSON;
|
||||
$this->assertContains($sExpectedJsonOuput, $this->DeleteTicketFromApi($iId));
|
||||
$this->assertStringContainsString($sExpectedJsonOuput, $this->DeleteTicketFromApi($iId));
|
||||
|
||||
$sExpectedJsonOuput=<<<JSON
|
||||
{"objects":null,"code":0,"message":"Found: 0"}
|
||||
|
||||
Reference in New Issue
Block a user