From 19d4fffe5fdc5b7ab86be5eb9fd38f9669d74b91 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/ApiControllerClientTrait.php | 12 ++-- tests/Controller/ApiControllerTest.php | 3 +- tests/Models/ClientMapperTest.php | 6 +- tests/Models/ClientTest.php | 16 ++---- tests/Models/NullClientTest.php | 16 ++---- tests/phpunit_default.xml | 56 ++++++++++--------- 7 files changed, 57 insertions(+), 74 deletions(-) diff --git a/tests/Controller/Api/ApiControllerAttributeTrait.php b/tests/Controller/Api/ApiControllerAttributeTrait.php index c6bad00..56edcf0 100755 --- a/tests/Controller/Api/ApiControllerAttributeTrait.php +++ b/tests/Controller/Api/ApiControllerAttributeTrait.php @@ -24,8 +24,8 @@ trait ApiControllerAttributeTrait { /** * @covers \Modules\ClientManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiClientAttributeTypeCreate() : void { $response = new HttpResponse(); @@ -42,8 +42,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ClientManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiClientAttributeTypeL11nCreate() : void { $response = new HttpResponse(); @@ -60,8 +60,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ClientManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiClientAttributeValueIntCreate() : void { $response = new HttpResponse(); @@ -80,8 +80,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ClientManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiClientAttributeValueStrCreate() : void { $response = new HttpResponse(); @@ -99,8 +99,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ClientManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiClientAttributeValueFloatCreate() : void { $response = new HttpResponse(); @@ -118,8 +118,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ClientManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiClientAttributeValueDatCreate() : void { $response = new HttpResponse(); @@ -137,8 +137,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ClientManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiClientAttributeCreate() : void { $response = new HttpResponse(); @@ -155,8 +155,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ClientManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiClientAttributeValueCreateInvalidData() : void { $response = new HttpResponse(); @@ -171,8 +171,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ClientManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiClientAttributeTypeCreateInvalidData() : void { $response = new HttpResponse(); @@ -187,8 +187,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ClientManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiClientAttributeTypeL11nCreateInvalidData() : void { $response = new HttpResponse(); @@ -203,8 +203,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ClientManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiClientAttributeCreateInvalidData() : void { $response = new HttpResponse(); diff --git a/tests/Controller/Api/ApiControllerClientTrait.php b/tests/Controller/Api/ApiControllerClientTrait.php index ab5ca00..c7e73d4 100755 --- a/tests/Controller/Api/ApiControllerClientTrait.php +++ b/tests/Controller/Api/ApiControllerClientTrait.php @@ -36,8 +36,8 @@ trait ApiControllerClientTrait /** * @covers \Modules\ClientManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiClientCreate() : void { $response = new HttpResponse(); @@ -59,8 +59,8 @@ trait ApiControllerClientTrait /** * @covers \Modules\ClientManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiClientCreateInvalidData() : void { $response = new HttpResponse(); @@ -75,8 +75,8 @@ trait ApiControllerClientTrait /** * @covers \Modules\ClientManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiClientProfileImageCreate() : void { $response = new HttpResponse(); @@ -106,8 +106,8 @@ trait ApiControllerClientTrait /** * @covers \Modules\ClientManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiClientFileCreate() : void { $response = new HttpResponse(); @@ -136,8 +136,8 @@ trait ApiControllerClientTrait /** * @covers \Modules\ClientManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiClientNoteCreate() : void { $response = new HttpResponse(); @@ -157,8 +157,8 @@ trait ApiControllerClientTrait /** * @covers \Modules\ClientManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiFileCreateInvalidData() : void { $response = new HttpResponse(); diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 6143247..5efacda 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\ClientManagement\tests\Controller\ApiControllerTest: ClientManagement api controller - * * @internal */ +#[\PHPUnit\Framework\Attributes\TestDox('Modules\ClientManagement\tests\Controller\ApiControllerTest: ClientManagement api controller')] final class ApiControllerTest extends \PHPUnit\Framework\TestCase { protected ApplicationAbstract $app; diff --git a/tests/Models/ClientMapperTest.php b/tests/Models/ClientMapperTest.php index 5720ec8..c5a968f 100755 --- a/tests/Models/ClientMapperTest.php +++ b/tests/Models/ClientMapperTest.php @@ -23,12 +23,10 @@ use Modules\Profile\Models\ProfileMapper; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\ClientManagement\Models\ClientMapper::class)] final class ClientMapperTest extends \PHPUnit\Framework\TestCase { - /** - * @covers \Modules\ClientManagement\Models\ClientMapper - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testCR() : void { $client = new Client(); diff --git a/tests/Models/ClientTest.php b/tests/Models/ClientTest.php index d517e63..d605e04 100755 --- a/tests/Models/ClientTest.php +++ b/tests/Models/ClientTest.php @@ -21,6 +21,7 @@ use Modules\Editor\Models\EditorDoc; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\ClientManagement\Models\Client::class)] final class ClientTest extends \PHPUnit\Framework\TestCase { private Client $client; @@ -33,10 +34,7 @@ final class ClientTest extends \PHPUnit\Framework\TestCase $this->client = new Client(); } - /** - * @covers \Modules\ClientManagement\Models\Client - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testDefault() : void { self::assertEquals(0, $this->client->id); @@ -52,20 +50,14 @@ final class ClientTest extends \PHPUnit\Framework\TestCase self::assertInstanceOf('\phpOMS\Stdlib\Base\Address', $this->client->mainAddress); } - /** - * @covers \Modules\ClientManagement\Models\Client - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testNoteInputOutput() : void { $this->client->addNote(new EditorDoc()); self::assertCount(1, $this->client->getNotes()); } - /** - * @covers \Modules\ClientManagement\Models\Client - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testSerialize() : void { $this->client->number = '123456'; diff --git a/tests/Models/NullClientTest.php b/tests/Models/NullClientTest.php index e20c652..0e713b5 100755 --- a/tests/Models/NullClientTest.php +++ b/tests/Models/NullClientTest.php @@ -19,31 +19,23 @@ use Modules\ClientManagement\Models\NullClient; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\ClientManagement\Models\NullClient::class)] final class NullClientTest extends \PHPUnit\Framework\TestCase { - /** - * @covers \Modules\ClientManagement\Models\NullClient - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testNull() : void { self::assertInstanceOf('\Modules\ClientManagement\Models\Client', new NullClient()); } - /** - * @covers \Modules\ClientManagement\Models\NullClient - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testId() : void { $null = new NullClient(2); self::assertEquals(2, $null->id); } - /** - * @covers \Modules\ClientManagement\Models\NullClient - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testJsonSerialize() : void { $null = new NullClient(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* + +