From 58e2a8fca68967ab93bb526df3cdcda5396efe7a Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Mon, 15 Jan 2024 11:03:33 +0100 Subject: [PATCH] Change parent class of BaseTestCase to `\Icinga\Test\BaseTestCase` --- library/Director/Test/BaseTestCase.php | 9 ++------- library/Director/Test/IcingaObjectTestCase.php | 2 ++ library/Director/Test/SyncTest.php | 2 ++ test/config/config.ini | 0 .../library/Director/Form/IcingaObjectFieldFormTest.php | 1 + .../library/Director/IcingaConfig/StateFilterTest.php | 2 ++ .../Director/Objects/HostGroupMembershipResolverTest.php | 1 + test/php/library/Director/Objects/IcingaCommandTest.php | 2 ++ test/php/library/Director/Objects/IcingaHostTest.php | 2 ++ .../library/Director/Objects/IcingaNotificationTest.php | 2 ++ .../library/Director/Objects/IcingaServiceSetTest.php | 1 + test/php/library/Director/Objects/IcingaServiceTest.php | 3 +++ .../Director/Objects/IcingaTemplateResolverTest.php | 2 ++ .../library/Director/Objects/IcingaTimePeriodTest.php | 2 ++ test/php/library/Director/Resolver/TemplateTreeTest.php | 2 ++ 15 files changed, 26 insertions(+), 7 deletions(-) delete mode 100644 test/config/config.ini diff --git a/library/Director/Test/BaseTestCase.php b/library/Director/Test/BaseTestCase.php index 07217c1b..adc24cb6 100644 --- a/library/Director/Test/BaseTestCase.php +++ b/library/Director/Test/BaseTestCase.php @@ -10,20 +10,15 @@ use Icinga\Module\Director\Db; use Icinga\Module\Director\Db\Migrations; use Icinga\Module\Director\Objects\IcingaObject; use Icinga\Module\Director\Objects\IcingaZone; -use PHPUnit\Framework\TestCase; +use Icinga\Test\BaseTestCase as IcingaBaseTestCase; -abstract class BaseTestCase extends TestCase +abstract class BaseTestCase extends IcingaBaseTestCase { private static $app; /** @var Db */ private static $db; - public function setUp(): void - { - $this->app(); - } - protected function skipForMissingDb() { if ($this->hasDb()) { diff --git a/library/Director/Test/IcingaObjectTestCase.php b/library/Director/Test/IcingaObjectTestCase.php index b8831bb9..5d0dde3e 100644 --- a/library/Director/Test/IcingaObjectTestCase.php +++ b/library/Director/Test/IcingaObjectTestCase.php @@ -88,5 +88,7 @@ abstract class IcingaObjectTestCase extends BaseTestCase $this->subject->delete(); } } + + parent::tearDown(); } } diff --git a/library/Director/Test/SyncTest.php b/library/Director/Test/SyncTest.php index ac704e89..d118eeaa 100644 --- a/library/Director/Test/SyncTest.php +++ b/library/Director/Test/SyncTest.php @@ -31,6 +31,7 @@ abstract class SyncTest extends BaseTestCase public function setUp(): void { + parent::setUp(); $this->source = ImportSource::create(array( 'source_name' => 'testimport', 'provider_class' => 'Icinga\\Module\\Director\\Test\\ImportSourceDummy', @@ -75,6 +76,7 @@ abstract class SyncTest extends BaseTestCase // make sure cache is clean for other tests PrefetchCache::forget(); DbObject::clearAllPrefetchCaches(); + parent::tearDown(); } /** diff --git a/test/config/config.ini b/test/config/config.ini deleted file mode 100644 index e69de29b..00000000 diff --git a/test/php/library/Director/Form/IcingaObjectFieldFormTest.php b/test/php/library/Director/Form/IcingaObjectFieldFormTest.php index 3f7672fb..8a5e0cc1 100644 --- a/test/php/library/Director/Form/IcingaObjectFieldFormTest.php +++ b/test/php/library/Director/Form/IcingaObjectFieldFormTest.php @@ -30,6 +30,7 @@ class IcingaObjectFieldFormTest extends BaseTestCase public function setUp(): void { + parent::setUp(); if ($this->hasDb()) { $db = $this->getDb(); $this->testDatafield = DirectorDatafield::create([ diff --git a/test/php/library/Director/IcingaConfig/StateFilterTest.php b/test/php/library/Director/IcingaConfig/StateFilterTest.php index 6b7708b6..2c997bd0 100644 --- a/test/php/library/Director/IcingaConfig/StateFilterTest.php +++ b/test/php/library/Director/IcingaConfig/StateFilterTest.php @@ -167,5 +167,7 @@ class StateFilterSetTest extends BaseTestCase } } } + + parent::tearDown(); } } diff --git a/test/php/library/Director/Objects/HostGroupMembershipResolverTest.php b/test/php/library/Director/Objects/HostGroupMembershipResolverTest.php index f6d21d0a..df4b24ce 100644 --- a/test/php/library/Director/Objects/HostGroupMembershipResolverTest.php +++ b/test/php/library/Director/Objects/HostGroupMembershipResolverTest.php @@ -17,6 +17,7 @@ class HostGroupMembershipResolverTest extends BaseTestCase public function setUp(): void { + parent::setUp(); IcingaTemplateRepository::clear(); } diff --git a/test/php/library/Director/Objects/IcingaCommandTest.php b/test/php/library/Director/Objects/IcingaCommandTest.php index ca4b5fd1..e3c9d89b 100644 --- a/test/php/library/Director/Objects/IcingaCommandTest.php +++ b/test/php/library/Director/Objects/IcingaCommandTest.php @@ -212,5 +212,7 @@ class IcingaCommandTest extends BaseTestCase if (IcingaCommand::exists($this->testCommandName, $db)) { IcingaCommand::load($this->testCommandName, $db)->delete(); } + + parent::tearDown(); } } diff --git a/test/php/library/Director/Objects/IcingaHostTest.php b/test/php/library/Director/Objects/IcingaHostTest.php index 0fed9472..52ec23e6 100644 --- a/test/php/library/Director/Objects/IcingaHostTest.php +++ b/test/php/library/Director/Objects/IcingaHostTest.php @@ -756,6 +756,8 @@ class IcingaHostTest extends BaseTestCase $this->deleteDatafields(); } + + parent::tearDown(); } protected function deleteDatafields() diff --git a/test/php/library/Director/Objects/IcingaNotificationTest.php b/test/php/library/Director/Objects/IcingaNotificationTest.php index ee02a083..dbbce919 100644 --- a/test/php/library/Director/Objects/IcingaNotificationTest.php +++ b/test/php/library/Director/Objects/IcingaNotificationTest.php @@ -244,5 +244,7 @@ class IcingaNotificationTest extends BaseTestCase } } } + + parent::tearDown(); } } diff --git a/test/php/library/Director/Objects/IcingaServiceSetTest.php b/test/php/library/Director/Objects/IcingaServiceSetTest.php index 564d3448..a9a9fa10 100644 --- a/test/php/library/Director/Objects/IcingaServiceSetTest.php +++ b/test/php/library/Director/Objects/IcingaServiceSetTest.php @@ -12,6 +12,7 @@ class IcingaServiceSetTest extends IcingaObjectTestCase public function setUp(): void { + parent::setUp(); $this->assertNull($this->subject, 'subject must have been taken down before!'); if ($this->hasDb()) { diff --git a/test/php/library/Director/Objects/IcingaServiceTest.php b/test/php/library/Director/Objects/IcingaServiceTest.php index 8899361c..3005349e 100644 --- a/test/php/library/Director/Objects/IcingaServiceTest.php +++ b/test/php/library/Director/Objects/IcingaServiceTest.php @@ -44,6 +44,7 @@ class IcingaServiceTest extends BaseTestCase public function testAcceptsAssignRules() { + $this->expectNotToPerformAssertions(); $service = $this->service(); $service->object_type = 'apply'; $service->assign_filter = 'host.address="127.*"'; @@ -287,5 +288,7 @@ class IcingaServiceTest extends BaseTestCase } } } + + parent::tearDown(); } } diff --git a/test/php/library/Director/Objects/IcingaTemplateResolverTest.php b/test/php/library/Director/Objects/IcingaTemplateResolverTest.php index e1a046db..f521d745 100644 --- a/test/php/library/Director/Objects/IcingaTemplateResolverTest.php +++ b/test/php/library/Director/Objects/IcingaTemplateResolverTest.php @@ -154,5 +154,7 @@ class IcingaTemplateResolverTest extends BaseTestCase IcingaHost::load($name, $db)->delete(); } } + + parent::tearDown(); } } diff --git a/test/php/library/Director/Objects/IcingaTimePeriodTest.php b/test/php/library/Director/Objects/IcingaTimePeriodTest.php index efa01b8e..9888fa4e 100644 --- a/test/php/library/Director/Objects/IcingaTimePeriodTest.php +++ b/test/php/library/Director/Objects/IcingaTimePeriodTest.php @@ -180,5 +180,7 @@ class IcingaTimePeriodTest extends BaseTestCase IcingaTimePeriod::load($name, $db)->delete(); } } + + parent::tearDown(); } } diff --git a/test/php/library/Director/Resolver/TemplateTreeTest.php b/test/php/library/Director/Resolver/TemplateTreeTest.php index 7211ff4a..c2ed9164 100644 --- a/test/php/library/Director/Resolver/TemplateTreeTest.php +++ b/test/php/library/Director/Resolver/TemplateTreeTest.php @@ -255,5 +255,7 @@ class TemplateTreeTest extends BaseTestCase $this->removeHosts($db); $this->removeServices($db); } + + parent::tearDown(); } }