From 2d5cc77bc82de4c12ba696a310f7bea63ad6017e 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/ApiControllerContractTrait.php | 8 +-- .../Api/ApiControllerContractTypeTrait.php | 8 +-- tests/Controller/ApiControllerTest.php | 3 +- tests/Models/ContractTest.php | 11 +--- tests/Models/NullContractTest.php | 16 ++---- tests/phpunit_default.xml | 56 ++++++++++--------- 7 files changed, 56 insertions(+), 68 deletions(-) diff --git a/tests/Controller/Api/ApiControllerAttributeTrait.php b/tests/Controller/Api/ApiControllerAttributeTrait.php index ad43941..c7eac33 100644 --- a/tests/Controller/Api/ApiControllerAttributeTrait.php +++ b/tests/Controller/Api/ApiControllerAttributeTrait.php @@ -24,8 +24,8 @@ trait ApiControllerAttributeTrait { /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractAttributeTypeCreate() : void { $response = new HttpResponse(); @@ -42,8 +42,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractAttributeTypeL11nCreate() : void { $response = new HttpResponse(); @@ -60,8 +60,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractAttributeValueIntCreate() : void { $response = new HttpResponse(); @@ -80,8 +80,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractAttributeValueStrCreate() : void { $response = new HttpResponse(); @@ -99,8 +99,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractAttributeValueFloatCreate() : void { $response = new HttpResponse(); @@ -118,8 +118,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractAttributeValueDatCreate() : void { $response = new HttpResponse(); @@ -137,8 +137,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractAttributeCreate() : void { $response = new HttpResponse(); @@ -155,8 +155,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractAttributeValueCreateInvalidData() : void { $response = new HttpResponse(); @@ -171,8 +171,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractAttributeTypeCreateInvalidData() : void { $response = new HttpResponse(); @@ -187,8 +187,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractAttributeTypeL11nCreateInvalidData() : void { $response = new HttpResponse(); @@ -203,8 +203,8 @@ trait ApiControllerAttributeTrait /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractAttributeCreateInvalidData() : void { $response = new HttpResponse(); diff --git a/tests/Controller/Api/ApiControllerContractTrait.php b/tests/Controller/Api/ApiControllerContractTrait.php index a0783b5..2270448 100644 --- a/tests/Controller/Api/ApiControllerContractTrait.php +++ b/tests/Controller/Api/ApiControllerContractTrait.php @@ -23,8 +23,8 @@ trait ApiControllerContractTrait { /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractCreate() : void { $response = new HttpResponse(); @@ -43,8 +43,8 @@ trait ApiControllerContractTrait /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractCreateInvalidData() : void { $response = new HttpResponse(); @@ -59,8 +59,8 @@ trait ApiControllerContractTrait /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractDocCreate() : void { $response = new HttpResponse(); @@ -90,8 +90,8 @@ trait ApiControllerContractTrait /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractDocCreateInvalidData() : void { $response = new HttpResponse(); diff --git a/tests/Controller/Api/ApiControllerContractTypeTrait.php b/tests/Controller/Api/ApiControllerContractTypeTrait.php index bfdd6f0..7ced99e 100644 --- a/tests/Controller/Api/ApiControllerContractTypeTrait.php +++ b/tests/Controller/Api/ApiControllerContractTypeTrait.php @@ -23,8 +23,8 @@ trait ApiControllerContractTypeTrait { /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractTypeCreate() : void { $response = new HttpResponse(); @@ -40,8 +40,8 @@ trait ApiControllerContractTypeTrait /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractTypeCreateInvalidData() : void { $response = new HttpResponse(); @@ -56,8 +56,8 @@ trait ApiControllerContractTypeTrait /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractTypeL11nCreate() : void { $response = new HttpResponse(); @@ -74,8 +74,8 @@ trait ApiControllerContractTypeTrait /** * @covers \Modules\ContractManagement\Controller\ApiController - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiContractTypeL11nCreateInvalidData() : void { $response = new HttpResponse(); diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 88f6a2f..c3ac5e3 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -33,10 +33,9 @@ use phpOMS\Router\WebRouter; use phpOMS\Utils\TestUtils; /** - * @testdox Modules\ContractManagement\tests\Controller\ApiControllerTest: ContractManagement api controller - * * @internal */ +#[\PHPUnit\Framework\Attributes\TestDox('Modules\ContractManagement\tests\Controller\ApiControllerTest: ContractManagement api controller')] final class ApiControllerTest extends \PHPUnit\Framework\TestCase { protected ApplicationAbstract $app; diff --git a/tests/Models/ContractTest.php b/tests/Models/ContractTest.php index 36fba12..0a69141 100755 --- a/tests/Models/ContractTest.php +++ b/tests/Models/ContractTest.php @@ -19,6 +19,7 @@ use Modules\ContractManagement\Models\Contract; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\ContractManagement\Models\Contract::class)] final class ContractTest extends \PHPUnit\Framework\TestCase { private Contract $contract; @@ -31,20 +32,14 @@ final class ContractTest extends \PHPUnit\Framework\TestCase $this->contract = new Contract(); } - /** - * @covers \Modules\ContractManagement\Models\Contract - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testDefault() : void { self::assertEquals(0, $this->contract->id); self::assertEquals([], $this->contract->files); } - /** - * @covers \Modules\ContractManagement\Models\Contract - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testSerialize() : void { $this->contract->title = 'Title'; diff --git a/tests/Models/NullContractTest.php b/tests/Models/NullContractTest.php index cfcae1d..b0ce117 100755 --- a/tests/Models/NullContractTest.php +++ b/tests/Models/NullContractTest.php @@ -19,31 +19,23 @@ use Modules\ContractManagement\Models\NullContract; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\ContractManagement\Models\NullContract::class)] final class NullContractTest extends \PHPUnit\Framework\TestCase { - /** - * @covers \Modules\ContractManagement\Models\NullContract - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testNull() : void { self::assertInstanceOf('\Modules\ContractManagement\Models\Contract', new NullContract()); } - /** - * @covers \Modules\ContractManagement\Models\NullContract - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testId() : void { $null = new NullContract(2); self::assertEquals(2, $null->id); } - /** - * @covers \Modules\ContractManagement\Models\NullContract - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testJsonSerialize() : void { $null = new NullContract(2); diff --git a/tests/phpunit_default.xml b/tests/phpunit_default.xml index d350430..e4a5639 100644 --- 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* + +