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

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

Browse Source 
# Conflicts:
#	tests/php-unit-tests/src/BaseTestCase/ItopDataTestCase.php
This commit is contained in:
Pierre Goiffon
2023-08-31 15:40:07 +02:00
parent f8fb51fea0 6ebcd44bb1
commit 6d6f55acf7
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/php-unit-tests/src/BaseTestCase/ItopDataTestCase.php
View File

@@ -16,9 +16,7 @@ namespace Combodo\iTop\Test\UnitTest;
use ArchivedObjectException;
use CMDBObject;
use CMDBSource;
use Combodo\iTop\Service\Events\EventData;
use Combodo\iTop\Service\Events\EventService;
use Config;
use Contact;
use DBObject;
use DBObjectSet;
@@ -34,7 +32,6 @@ use MetaModel;
use Person;
use PluginManager;
use Server;
use SetupUtils;
use TagSetFieldData;
use Ticket;
use URP_UserProfile;
@@ -57,6 +54,7 @@ define('TAG_ATTCODE', 'domains');
*
* @since 2.7.7 3.0.1 3.1.0 N°4624 processIsolation is disabled by default and must be enabled in each test needing it (basically all tests using
* iTop datamodel)
* @since 3.0.4 3.1.1 3.2.0 N°6658 move some setUp/tearDown code to the corresponding methods *BeforeClass to speed up tests process time.
*/
abstract class ItopDataTestCase extends ItopTestCase
{
@@ -950,6 +948,9 @@ abstract class ItopDataTestCase extends ItopTestCase
}
}
/**
* @since 3.0.4 3.1.1 3.2.0 N°6658 method creation
*/
protected function assertDBChangeOpCount(string $sClass, $iId, int $iExpectedCount)
{
$oSearch = new \DBObjectSearch('CMDBChangeOp');