From de3cc110d165f20e10260c89e62717558c005b4f Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 20 Mar 2024 05:15:59 +0000 Subject: [PATCH] upgrade phpunit --- .../Api/ApiControllerAttributeTrait.php | 22 ++++---- .../Api/ApiControllerVehicleTrait.php | 2 +- tests/Controller/ApiControllerTest.php | 3 +- tests/Models/Driver/NullDriverInspection.php | 16 ++---- tests/Models/Driver/NullDriverTest.php | 16 ++---- tests/Models/NullInspectionTest.php | 16 ++---- tests/Models/NullVehicleTest.php | 16 ++---- tests/phpunit_default.xml | 56 ++++++++++--------- 8 files changed, 58 insertions(+), 89 deletions(-) diff --git a/tests/Controller/Api/ApiControllerAttributeTrait.php b/tests/Controller/Api/ApiControllerAttributeTrait.php index 6ea5f99..987e013 100644 --- a/tests/Controller/Api/ApiControllerAttributeTrait.php +++ b/tests/Controller/Api/ApiControllerAttributeTrait.php @@ -26,8 +26,8 @@ trait ApiControllerAttributeTrait { /** * @covers \Modules\FleetManagement\Controller\ApiVehicleAttributeController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiVehicleAttributeTypeCreate() : void { $response = new HttpResponse(); @@ -44,8 +44,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\FleetManagement\Controller\ApiVehicleAttributeController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiVehicleAttributeTypeL11nCreate() : void { $response = new HttpResponse(); @@ -62,8 +62,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\FleetManagement\Controller\ApiVehicleAttributeController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiVehicleAttributeValueIntCreate() : void { $response = new HttpResponse(); @@ -82,8 +82,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\FleetManagement\Controller\ApiVehicleAttributeController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiVehicleAttributeValueStrCreate() : void { $response = new HttpResponse(); @@ -101,8 +101,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\FleetManagement\Controller\ApiVehicleAttributeController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiVehicleAttributeValueFloatCreate() : void { $response = new HttpResponse(); @@ -120,8 +120,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\FleetManagement\Controller\ApiVehicleAttributeController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiVehicleAttributeValueDatCreate() : void { $response = new HttpResponse(); @@ -139,8 +139,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\FleetManagement\Controller\ApiVehicleAttributeController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiVehicleAttributeCreate() : void { $response = new HttpResponse(); @@ -157,8 +157,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\FleetManagement\Controller\ApiVehicleAttributeController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiVehicleAttributeValueCreateInvalidData() : void { $response = new HttpResponse(); @@ -173,8 +173,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\FleetManagement\Controller\ApiVehicleAttributeController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiVehicleAttributeTypeCreateInvalidData() : void { $response = new HttpResponse(); @@ -189,8 +189,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\FleetManagement\Controller\ApiVehicleAttributeController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiVehicleAttributeTypeL11nCreateInvalidData() : void { $response = new HttpResponse(); @@ -205,8 +205,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\FleetManagement\Controller\ApiVehicleAttributeController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiVehicleAttributeCreateInvalidData() : void { $response = new HttpResponse(); diff --git a/tests/Controller/Api/ApiControllerVehicleTrait.php b/tests/Controller/Api/ApiControllerVehicleTrait.php index 0e6d7bb..53b5202 100644 --- a/tests/Controller/Api/ApiControllerVehicleTrait.php +++ b/tests/Controller/Api/ApiControllerVehicleTrait.php @@ -24,8 +24,8 @@ trait ApiControllerVehicleTrait { /** * @covers \Modules\FleetManagement\Controller\ApiVehicleController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiVehicleCreate() : void { $vehicleType = VehicleTypeMapper::getAll()->execute(); diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index efd9256..1134e0d 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -32,10 +32,9 @@ use phpOMS\Router\WebRouter; use phpOMS\Utils\TestUtils; /** - * @testdox Modules\FleetManagement\tests\Controller\ApiControllerTest: FleetManagement api controller - * * @internal */ +#[\PHPUnit\Framework\Attributes\TestDox('Modules\FleetManagement\tests\Controller\ApiControllerTest: FleetManagement api controller')] final class ApiControllerTest extends \PHPUnit\Framework\TestCase { protected ApplicationAbstract $app; diff --git a/tests/Models/Driver/NullDriverInspection.php b/tests/Models/Driver/NullDriverInspection.php index 4660baa..dfe941b 100644 --- a/tests/Models/Driver/NullDriverInspection.php +++ b/tests/Models/Driver/NullDriverInspection.php @@ -19,31 +19,23 @@ use Modules\FleetManagement\Models\Driver\NullDriverInspection; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\FleetManagement\Models\Driver\NullDriverInspection::class)] final class NullDriverInspectionTest extends \PHPUnit\Framework\TestCase { - /** - * @covers \Modules\FleetManagement\Models\Driver\NullDriverInspection - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testNull() : void { self::assertInstanceOf('\Modules\FleetManagement\Models\Driver\DriverInspection', new NullDriverInspection()); } - /** - * @covers \Modules\FleetManagement\Models\Driver\NullDriverInspection - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testId() : void { $null = new NullDriverInspection(2); self::assertEquals(2, $null->id); } - /** - * @covers \Modules\FleetManagement\Models\Driver\NullDriverInspection - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testJsonSerialize() : void { $null = new NullDriverInspection(2); diff --git a/tests/Models/Driver/NullDriverTest.php b/tests/Models/Driver/NullDriverTest.php index 991eae8..3f8419f 100644 --- a/tests/Models/Driver/NullDriverTest.php +++ b/tests/Models/Driver/NullDriverTest.php @@ -19,31 +19,23 @@ use Modules\FleetManagement\Models\Driver\NullDriver; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\FleetManagement\Models\Driver\NullDriver::class)] final class NullDriverTest extends \PHPUnit\Framework\TestCase { - /** - * @covers \Modules\FleetManagement\Models\Driver\NullDriver - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testNull() : void { self::assertInstanceOf('\Modules\FleetManagement\Models\Driver\Driver', new NullDriver()); } - /** - * @covers \Modules\FleetManagement\Models\Driver\NullDriver - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testId() : void { $null = new NullDriver(2); self::assertEquals(2, $null->id); } - /** - * @covers \Modules\FleetManagement\Models\Driver\NullDriver - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testJsonSerialize() : void { $null = new NullDriver(2); diff --git a/tests/Models/NullInspectionTest.php b/tests/Models/NullInspectionTest.php index 2b47ccd..80caca7 100644 --- a/tests/Models/NullInspectionTest.php +++ b/tests/Models/NullInspectionTest.php @@ -19,31 +19,23 @@ use Modules\FleetManagement\Models\NullInspection; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\FleetManagement\Models\NullInspection::class)] final class NullInspectionTest extends \PHPUnit\Framework\TestCase { - /** - * @covers \Modules\FleetManagement\Models\NullInspection - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testNull() : void { self::assertInstanceOf('\Modules\FleetManagement\Models\Inspection', new NullInspection()); } - /** - * @covers \Modules\FleetManagement\Models\NullInspection - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testId() : void { $null = new NullInspection(2); self::assertEquals(2, $null->id); } - /** - * @covers \Modules\FleetManagement\Models\NullInspection - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testJsonSerialize() : void { $null = new NullInspection(2); diff --git a/tests/Models/NullVehicleTest.php b/tests/Models/NullVehicleTest.php index a68b599..6495c5b 100644 --- a/tests/Models/NullVehicleTest.php +++ b/tests/Models/NullVehicleTest.php @@ -19,31 +19,23 @@ use Modules\FleetManagement\Models\NullVehicle; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\FleetManagement\Models\NullVehicle::class)] final class NullVehicleTest extends \PHPUnit\Framework\TestCase { - /** - * @covers \Modules\FleetManagement\Models\NullVehicle - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testNull() : void { self::assertInstanceOf('\Modules\FleetManagement\Models\Vehicle', new NullVehicle()); } - /** - * @covers \Modules\FleetManagement\Models\NullVehicle - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testId() : void { $null = new NullVehicle(2); self::assertEquals(2, $null->id); } - /** - * @covers \Modules\FleetManagement\Models\NullVehicle - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testJsonSerialize() : void { $null = new NullVehicle(2); diff --git a/tests/phpunit_default.xml b/tests/phpunit_default.xml index d350430..e4a5639 100755 --- a/tests/phpunit_default.xml +++ b/tests/phpunit_default.xml @@ -1,31 +1,6 @@ - - - - ../ - - - ../vendor* - ../MainRepository* - ../Karaka* - ../Admin/Install/Application* - ../phpOMS* - ../tests* - ../*/tests* - ../**/tests* - */tests* - ../* - ../* - ../* - ../* - ../* - ../**/test* - ../**/Theme* - ../**/Admin/Routes* - ../**/Admin/Hooks* - ../**/Admin/Install* - ../Media/Files* - + + @@ -56,4 +31,31 @@ + + + ../ + + + ../vendor* + ../MainRepository* + ../Karaka* + ../Admin/Install/Application* + ../phpOMS* + ../tests* + ../*/tests* + ../**/tests* + */tests* + ../* + ../* + ../* + ../* + ../* + ../**/test* + ../**/Theme* + ../**/Admin/Routes* + ../**/Admin/Hooks* + ../**/Admin/Install* + ../Media/Files* + +