BaseTestCase: Use phpunit's new TestCase

Icinga · Aug 30, 2023 · 044fcfd · 044fcfd
1 parent c277bcf
commit 044fcfd
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 20 deletions.
diff --git a/library/Director/Test/BaseTestCase.php b/library/Director/Test/BaseTestCase.php
@@ -10,16 +10,16 @@
 use Icinga\Module\Director\Db\Migrations;
 use Icinga\Module\Director\Objects\IcingaObject;
 use Icinga\Module\Director\Objects\IcingaZone;
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 
-abstract class BaseTestCase extends PHPUnit_Framework_TestCase
+abstract class BaseTestCase extends TestCase
 {
     private static $app;
 
     /** @var Db */
     private static $db;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->app();
     }

diff --git a/library/Director/Test/IcingaObjectTestCase.php b/library/Director/Test/IcingaObjectTestCase.php
@@ -76,7 +76,7 @@ protected function prepareObjectTearDown(IcingaObject $object)
     /**
      * @inheritdoc
      */
-    public function tearDown()
+    public function tearDown(): void
     {
         if ($this->hasDb()) {
             /** @var IcingaObject $object */

diff --git a/library/Director/Test/SyncTest.php b/library/Director/Test/SyncTest.php
@@ -29,7 +29,7 @@ abstract class SyncTest extends BaseTestCase
     /** @var  Sync */
     protected $sync;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->source = ImportSource::create(array(
             'source_name'    => 'testimport',
@@ -49,7 +49,7 @@ public function setUp()
         $this->sync = new Sync($this->rule);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         // properties should be deleted automatically
         if ($this->rule !== null && $this->rule->hasBeenLoadedFromDb()) {

diff --git a/test/php/library/Director/Data/AssignFilterHelperTest.php b/test/php/library/Director/Data/AssignFilterHelperTest.php
@@ -11,7 +11,7 @@ class AssignFilterHelperTest extends BaseTestCase
 {
     protected static $exampleHost;
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         self::$exampleHost = (object) [
             'address'              => '127.0.0.1',

diff --git a/test/php/library/Director/IcingaConfig/StateFilterTest.php b/test/php/library/Director/IcingaConfig/StateFilterTest.php
@@ -152,7 +152,7 @@ protected function user2()
         ));
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         if ($this->hasDb()) {
             $users = array(

diff --git a/test/php/library/Director/Import/HostSyncTest.php b/test/php/library/Director/Import/HostSyncTest.php
@@ -242,7 +242,7 @@ protected function removeGroups($names)
         }
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $this->removeGroups(['SYNCTEST_groupa', 'SYNCTEST_groupb']);
         parent::tearDown();

diff --git a/test/php/library/Director/Objects/HostGroupMembershipResolverTest.php b/test/php/library/Director/Objects/HostGroupMembershipResolverTest.php
@@ -15,7 +15,7 @@ class HostGroupMembershipResolverTest extends BaseTestCase
     const PREFIX = '__groupmembership';
     const TYPE = 'host';
 
-    public function setUp()
+    public function setUp(): void
     {
         IcingaTemplateRepository::clear();
     }
@@ -32,12 +32,12 @@ public static function cleanArtifacts()
         $db->delete('icinga_' . self::TYPE, $where);
     }
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         static::cleanArtifacts();
     }
 
-    public static function tearDownAfterClass()
+    public static function tearDownAfterClass(): void
     {
         static::cleanArtifacts();
     }

diff --git a/test/php/library/Director/Objects/IcingaCommandTest.php b/test/php/library/Director/Objects/IcingaCommandTest.php
@@ -206,7 +206,7 @@ protected function loadRendered($name)
         return file_get_contents(__DIR__ . '/rendered/' . $name . '.out');
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $db = $this->getDb();
         if (IcingaCommand::exists($this->testCommandName, $db)) {

diff --git a/test/php/library/Director/Objects/IcingaHostTest.php b/test/php/library/Director/Objects/IcingaHostTest.php
@@ -731,7 +731,7 @@ protected function loadRendered($name)
         return file_get_contents(__DIR__ . '/rendered/' . $name . '.out');
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         if ($this->hasDb()) {
             $db = $this->getDb();

diff --git a/test/php/library/Director/Objects/IcingaNotificationTest.php b/test/php/library/Director/Objects/IcingaNotificationTest.php
@@ -226,7 +226,7 @@ protected function loadRendered($name)
         return file_get_contents(__DIR__ . '/rendered/' . $name . '.out');
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         if ($this->hasDb()) {
             $db = $this->getDb();

diff --git a/test/php/library/Director/Objects/IcingaServiceSetTest.php b/test/php/library/Director/Objects/IcingaServiceSetTest.php
@@ -10,7 +10,7 @@ class IcingaServiceSetTest extends IcingaObjectTestCase
     protected $table = 'icinga_service_set';
     protected $testObjectName = '___TEST___set';
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->assertNull($this->subject, 'subject must have been taken down before!');
 

diff --git a/test/php/library/Director/Objects/IcingaServiceTest.php b/test/php/library/Director/Objects/IcingaServiceTest.php
@@ -271,7 +271,7 @@ protected function loadRendered($name)
         return file_get_contents(__DIR__ . '/rendered/' . $name . '.out');
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         if ($this->hasDb()) {
             $db = $this->getDb();

diff --git a/test/php/library/Director/Objects/IcingaTemplateResolverTest.php b/test/php/library/Director/Objects/IcingaTemplateResolverTest.php
@@ -144,7 +144,7 @@ protected function create($name)
         return $host;
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $db = $this->getDb();
         $kill = array('t1', 't2', 't6', 't3', 't4', 't5');

diff --git a/test/php/library/Director/Objects/IcingaTimePeriodTest.php b/test/php/library/Director/Objects/IcingaTimePeriodTest.php
@@ -171,7 +171,7 @@ protected function loadTestPeriod($suffix = '')
         return IcingaTimePeriod::load($this->testPeriodName . $suffix, $this->getDb());
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         $db = $this->getDb();
 

diff --git a/test/php/library/Director/Resolver/TemplateTreeTest.php b/test/php/library/Director/Resolver/TemplateTreeTest.php
@@ -248,7 +248,7 @@ protected function removeServices(Db $db)
         }
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         if ($this->hasDb()) {
             $db = $this->getDb();