diff --git a/test/core/BulkChangeExtKeyTest.php b/test/core/BulkChangeExtKeyTest.php index ebc7f9a16..181fc095a 100644 --- a/test/core/BulkChangeExtKeyTest.php +++ b/test/core/BulkChangeExtKeyTest.php @@ -180,7 +180,7 @@ class BulkChangeExtKeyTest extends ItopDataTestCase { ); $this->performBulkChangeTest( - "invalid value for attribute", + "Invalid value for attribute", "Ambiguous: found 2 objects", null, $bIsRackReconKey, @@ -206,7 +206,7 @@ class BulkChangeExtKeyTest extends ItopDataTestCase { $aCsvData = [["UnexistingRackDescription"]]; $aExtKeys = ["org_id" => ["name" => 0], "rack_id" => ["name" => 1, "description" => 3]]; - $sSearchLinkUrl = 'UI.php?operation=search&filter=%5B%22SELECT+%60Rack%60+FROM+Rack+AS+%60Rack%60+WHERE+%28%28%60Rack%60.%60name%60+%3D+%3Aname%29+AND+%28%60Rack%60.%60description%60+%3D+%3Adescription%29%29%22%2C%7B%22name%22%3A%22UnexistingRack%22%2C%22description%22%3A%22UnexistingRackDescription%22%7D%2C%5B%5D%5D' + $sSearchLinkUrl = 'UI.php?operation=search&filter=%255B%2522SELECT%2B%2560Rack%2560%2BFROM%2BRack%2BAS%2B%2560Rack%2560%2BWHERE%2B%2528%2528%2560Rack%2560.%2560name%2560%2B%253D%2B%253Aname%2529%2BAND%2B%2528%2560Rack%2560.%2560description%2560%2B%253D%2B%253Adescription%2529%2529%2522%252C%257B%2522name%2522%253A%2522UnexistingRack%2522%252C%2522description%2522%253A%2522UnexistingRackDescription%2522%257D%252C%255B%255D%255D' ; $this->performBulkChangeTest( "No match for value 'UnexistingRack UnexistingRackDescription'", @@ -238,7 +238,7 @@ class BulkChangeExtKeyTest extends ItopDataTestCase { public function performBulkChangeTest($sExpectedDisplayableValue, $sExpectedDescription, $oOrg, $bIsRackReconKey, $aAdditionalCsvData=null, $aExtKeys=null, $sSearchLinkUrl=null, $sError="Object not found") { if ($sSearchLinkUrl===null){ - $sSearchLinkUrl = 'UI.php?operation=search&filter=%5B%22SELECT+%60Rack%60+FROM+Rack+AS+%60Rack%60+WHERE+%28%60Rack%60.%60name%60+%3D+%3Aname%29%22%2C%7B%22name%22%3A%22UnexistingRack%22%7D%2C%5B%5D%5D'; + $sSearchLinkUrl = 'UI.php?operation=search&filter=%255B%2522SELECT%2B%2560Rack%2560%2BFROM%2BRack%2BAS%2B%2560Rack%2560%2BWHERE%2B%2528%2560Rack%2560.%2560name%2560%2B%253D%2B%253Aname%2529%2522%252C%257B%2522name%2522%253A%2522UnexistingRack%2522%257D%252C%255B%255D%255D'; } if (is_null($oOrg)){ $iOrgId = $this->getTestOrgId(); diff --git a/test/core/BulkChangeTest.php b/test/core/BulkChangeTest.php index 25c72d6f6..0cc1c4d5f 100644 --- a/test/core/BulkChangeTest.php +++ b/test/core/BulkChangeTest.php @@ -23,7 +23,7 @@ class BulkChangeTest extends ItopDataTestCase { //bug 2888: csv import / data synchro issue with password validation public function testPasswordBulkChangeIssue() { - /** @var Personn $oPerson */ + /** @var \Person $oPerson */ $oPerson = $this->createObject('Person', array( 'first_name' => 'isaac', 'name' => 'asimov', @@ -145,7 +145,7 @@ class BulkChangeTest extends ItopDataTestCase { ["name" => 1, "id" => 2, "status" => 3, "purchase_date" => 4], ["org_id" => ["name" => 0]], ["id"], - [ "org_id" => "invalid value for attribute", 1 => "Server1", 2 => "1", 3 => "production", 4 => "", "id" => 1, "__STATUS__" => "Issue: Unexpected attribute value(s)"], + [ "org_id" => "Invalid value for attribute", 1 => "Server1", 2 => "1", 3 => "production", 4 => "", "id" => 1, "__STATUS__" => "Issue: Unexpected attribute value(s)"], ], "Case 6 : Unexpected value" => [ [["Demo", "Server1", "1", "", ""]], @@ -351,7 +351,7 @@ class BulkChangeTest extends ItopDataTestCase { ["name" => 1, "id" => 2, "status" => 3, "purchase_date" => 4], ["org_id" => ["name" => 0]], ["id"], - [ 0 => "", "org_id" => "invalid value for attribute", 1 => "ServerTest", 2 => "1", 3 => "production", 4 => "", "id" => 1, "__STATUS__" => "Issue: Unexpected attribute value(s)", + [ 0 => "", "org_id" => "Invalid value for attribute", 1 => "ServerTest", 2 => "1", 3 => "production", 4 => "", "id" => 1, "__STATUS__" => "Issue: Unexpected attribute value(s)", "__ERRORS__" => "Null not allowed", ], ], diff --git a/test/webservices/ImportTest.php b/test/webservices/ImportTest.php index 0f10350c8..0741d1fa5 100644 --- a/test/webservices/ImportTest.php +++ b/test/webservices/ImportTest.php @@ -2,7 +2,6 @@ namespace Combodo\iTop\Test\UnitTest\Webservices; -use CMDBSource; use Combodo\iTop\Test\UnitTest\ItopDataTestCase; use MetaModel; @@ -12,11 +11,12 @@ use MetaModel; * @backupGlobals disabled */ class ImportTest extends ItopDataTestCase { + const USE_TRANSACTION = false; private $sUrl; private $sUid; private $sLogin; - private $sPassword = "Iuytrez9876543ç_è-("; + private $sPassword = "abcDEF12345##"; private $sTmpFile = ""; private $oOrg;