From 03156c99d5695cb045d8583ab68179aa93ee9d5a Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 20 Mar 2024 05:16:00 +0000 Subject: [PATCH] upgrade phpunit --- tests/Controller/ApiControllerTest.php | 34 +++-------- .../NullSurveyTemplateElementL11nTest.php | 16 ++---- .../Models/NullSurveyTemplateElementTest.php | 16 ++---- tests/Models/NullSurveyTemplateL11nTest.php | 16 ++---- .../NullSurveyTemplateLabelL11nTest.php | 16 ++---- tests/Models/NullSurveyTemplateTest.php | 16 ++---- .../Models/SurveyTemplateElementL11nTest.php | 21 ++----- tests/Models/SurveyTemplateElementTest.php | 26 ++------- tests/Models/SurveyTemplateL11nTest.php | 21 ++----- tests/Models/SurveyTemplateLabelL11nTest.php | 16 ++---- tests/Models/SurveyTemplateTest.php | 16 ++---- tests/phpunit_default.xml | 56 ++++++++++--------- 12 files changed, 81 insertions(+), 189 deletions(-) diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 43161a5..f9f39c1 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -35,10 +35,10 @@ use phpOMS\System\MimeType; use phpOMS\Utils\TestUtils; /** - * @testdox Modules\Surveys\tests\Controller\ApiControllerTest: Surveys api controller - * * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Surveys\Controller\ApiController::class)] +#[\PHPUnit\Framework\Attributes\TestDox('Modules\Surveys\tests\Controller\ApiControllerTest: Surveys api controller')] final class ApiControllerTest extends \PHPUnit\Framework\TestCase { protected ApplicationAbstract $app; @@ -93,10 +93,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase TestUtils::setMember($this->module, 'app', $this->app); } - /** - * @covers \Modules\Surveys\Controller\ApiController - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiSurveyTemplateCreate() : void { $response = new HttpResponse(); @@ -128,10 +125,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } - /** - * @covers \Modules\Surveys\Controller\ApiController - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiSurveyTemplateCreateInvalidData() : void { $response = new HttpResponse(); @@ -144,10 +138,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase self::assertEquals(RequestStatusCode::R_400, $response->header->status); } - /** - * @covers \Modules\Surveys\Controller\ApiController - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiSurveyTemplateElementCreate() : void { $response = new HttpResponse(); @@ -169,10 +160,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } - /** - * @covers \Modules\Surveys\Controller\ApiController - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiSurveyTemplateElementCreateInvalidData() : void { $response = new HttpResponse(); @@ -185,10 +173,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase self::assertEquals(RequestStatusCode::R_400, $response->header->status); } - /** - * @covers \Modules\Surveys\Controller\ApiController - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiSurveyAnswerCreate() : void { $response = new HttpResponse(); @@ -203,10 +188,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase self::assertGreaterThan(0, $response->getDataArray('')['response']->id); } - /** - * @covers \Modules\Surveys\Controller\ApiController - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testApiSurveyAnswerCreateInvalidData() : void { $response = new HttpResponse(); diff --git a/tests/Models/NullSurveyTemplateElementL11nTest.php b/tests/Models/NullSurveyTemplateElementL11nTest.php index 6bc0be5..c162080 100755 --- a/tests/Models/NullSurveyTemplateElementL11nTest.php +++ b/tests/Models/NullSurveyTemplateElementL11nTest.php @@ -19,31 +19,23 @@ use Modules\Surveys\Models\NullSurveyTemplateElementL11n; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Surveys\Models\NullSurveyTemplateElementL11n::class)] final class NullSurveyTemplateElementL11nTest extends \PHPUnit\Framework\TestCase { - /** - * @covers \Modules\Surveys\Models\NullSurveyTemplateElementL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testNull() : void { self::assertInstanceOf('\Modules\Surveys\Models\SurveyTemplateElementL11n', new NullSurveyTemplateElementL11n()); } - /** - * @covers \Modules\Surveys\Models\NullSurveyTemplateElementL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testId() : void { $null = new NullSurveyTemplateElementL11n(2); self::assertEquals(2, $null->id); } - /** - * @covers \Modules\Surveys\Models\NullSurveyTemplateElementL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testJsonSerialize() : void { $null = new NullSurveyTemplateElementL11n(2); diff --git a/tests/Models/NullSurveyTemplateElementTest.php b/tests/Models/NullSurveyTemplateElementTest.php index 9b5b619..dd5ce06 100755 --- a/tests/Models/NullSurveyTemplateElementTest.php +++ b/tests/Models/NullSurveyTemplateElementTest.php @@ -19,31 +19,23 @@ use Modules\Surveys\Models\NullSurveyTemplateElement; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Surveys\Models\NullSurveyTemplateElement::class)] final class NullSurveyTemplateElementTest extends \PHPUnit\Framework\TestCase { - /** - * @covers \Modules\Surveys\Models\NullSurveyTemplateElement - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testNull() : void { self::assertInstanceOf('\Modules\Surveys\Models\SurveyTemplateElement', new NullSurveyTemplateElement()); } - /** - * @covers \Modules\Surveys\Models\NullSurveyTemplateElement - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testId() : void { $null = new NullSurveyTemplateElement(2); self::assertEquals(2, $null->id); } - /** - * @covers \Modules\Surveys\Models\NullSurveyTemplateElement - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testJsonSerialize() : void { $null = new NullSurveyTemplateElement(2); diff --git a/tests/Models/NullSurveyTemplateL11nTest.php b/tests/Models/NullSurveyTemplateL11nTest.php index 76ef6c0..858e6d2 100755 --- a/tests/Models/NullSurveyTemplateL11nTest.php +++ b/tests/Models/NullSurveyTemplateL11nTest.php @@ -19,31 +19,23 @@ use Modules\Surveys\Models\NullSurveyTemplateL11n; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Surveys\Models\NullSurveyTemplateL11n::class)] final class NullSurveyTemplateL11nTest extends \PHPUnit\Framework\TestCase { - /** - * @covers \Modules\Surveys\Models\NullSurveyTemplateL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testNull() : void { self::assertInstanceOf('\Modules\Surveys\Models\SurveyTemplateL11n', new NullSurveyTemplateL11n()); } - /** - * @covers \Modules\Surveys\Models\NullSurveyTemplateL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testId() : void { $null = new NullSurveyTemplateL11n(2); self::assertEquals(2, $null->id); } - /** - * @covers \Modules\Surveys\Models\NullSurveyTemplateL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testJsonSerialize() : void { $null = new NullSurveyTemplateL11n(2); diff --git a/tests/Models/NullSurveyTemplateLabelL11nTest.php b/tests/Models/NullSurveyTemplateLabelL11nTest.php index 1b9ba4e..fba835d 100755 --- a/tests/Models/NullSurveyTemplateLabelL11nTest.php +++ b/tests/Models/NullSurveyTemplateLabelL11nTest.php @@ -19,31 +19,23 @@ use Modules\Surveys\Models\NullSurveyTemplateLabelL11n; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Surveys\Models\NullSurveyTemplateLabelL11n::class)] final class NullSurveyTemplateLabelL11nTest extends \PHPUnit\Framework\TestCase { - /** - * @covers \Modules\Surveys\Models\NullSurveyTemplateLabelL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testNull() : void { self::assertInstanceOf('\Modules\Surveys\Models\SurveyTemplateLabelL11n', new NullSurveyTemplateLabelL11n()); } - /** - * @covers \Modules\Surveys\Models\NullSurveyTemplateLabelL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testId() : void { $null = new NullSurveyTemplateLabelL11n(2); self::assertEquals(2, $null->id); } - /** - * @covers \Modules\Surveys\Models\NullSurveyTemplateLabelL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testJsonSerialize() : void { $null = new NullSurveyTemplateLabelL11n(2); diff --git a/tests/Models/NullSurveyTemplateTest.php b/tests/Models/NullSurveyTemplateTest.php index 2b57cea..9f463ea 100755 --- a/tests/Models/NullSurveyTemplateTest.php +++ b/tests/Models/NullSurveyTemplateTest.php @@ -19,31 +19,23 @@ use Modules\Surveys\Models\NullSurveyTemplate; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Surveys\Models\NullSurveyTemplate::class)] final class NullSurveyTemplateTest extends \PHPUnit\Framework\TestCase { - /** - * @covers \Modules\Surveys\Models\NullSurveyTemplate - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testNull() : void { self::assertInstanceOf('\Modules\Surveys\Models\SurveyTemplate', new NullSurveyTemplate()); } - /** - * @covers \Modules\Surveys\Models\NullSurveyTemplate - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testId() : void { $null = new NullSurveyTemplate(2); self::assertEquals(2, $null->id); } - /** - * @covers \Modules\Surveys\Models\NullSurveyTemplate - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testJsonSerialize() : void { $null = new NullSurveyTemplate(2); diff --git a/tests/Models/SurveyTemplateElementL11nTest.php b/tests/Models/SurveyTemplateElementL11nTest.php index eaa6649..f6a1fc1 100755 --- a/tests/Models/SurveyTemplateElementL11nTest.php +++ b/tests/Models/SurveyTemplateElementL11nTest.php @@ -20,6 +20,7 @@ use phpOMS\Localization\ISO639x1Enum; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Surveys\Models\SurveyTemplateElementL11n::class)] final class SurveyTemplateElementL11nTest extends \PHPUnit\Framework\TestCase { private SurveyTemplateElementL11n $l11n; @@ -32,10 +33,7 @@ final class SurveyTemplateElementL11nTest extends \PHPUnit\Framework\TestCase $this->l11n = new SurveyTemplateElementL11n(); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplateElementL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testDefault() : void { self::assertEquals(0, $this->l11n->id); @@ -45,30 +43,21 @@ final class SurveyTemplateElementL11nTest extends \PHPUnit\Framework\TestCase self::assertEquals(ISO639x1Enum::_EN, $this->l11n->language); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplateElementL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testTextInputOutput() : void { $this->l11n->text = 'TestName'; self::assertEquals('TestName', $this->l11n->text); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplateElementL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testDescriptionInputOutput() : void { $this->l11n->description = 'TestContent'; self::assertEquals('TestContent', $this->l11n->description); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplateElementL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testSerialize() : void { $this->l11n->text = 'Title'; diff --git a/tests/Models/SurveyTemplateElementTest.php b/tests/Models/SurveyTemplateElementTest.php index d52f104..0ff3041 100755 --- a/tests/Models/SurveyTemplateElementTest.php +++ b/tests/Models/SurveyTemplateElementTest.php @@ -22,6 +22,7 @@ use Modules\Surveys\Models\SurveyTemplateLabelL11n; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Surveys\Models\SurveyTemplateElement::class)] final class SurveyTemplateElementTest extends \PHPUnit\Framework\TestCase { private SurveyTemplateElement $element; @@ -34,10 +35,7 @@ final class SurveyTemplateElementTest extends \PHPUnit\Framework\TestCase $this->element = new SurveyTemplateElement(); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplateElement - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testDefault() : void { self::assertEquals(0, $this->element->id); @@ -48,40 +46,28 @@ final class SurveyTemplateElementTest extends \PHPUnit\Framework\TestCase self::assertInstanceOf('\Modules\Surveys\Models\SurveyTemplateElementL11n', $this->element->getL11n()); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplateElement - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testL11nInputOutput() : void { $this->element->setL11n(new SurveyTemplateElementL11n('NewTest')); self::assertEquals('NewTest', $this->element->getL11n()->text); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplateElement - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testLabelInputOutput() : void { $this->element->addLabel(new SurveyTemplateLabelL11n()); self::assertCount(1, $this->element->getLabels()); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplateElement - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testValueInputOutput() : void { $this->element->addValue('testValue'); self::assertCount(1, $this->element->getValues()); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplateElement - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testSerialize() : void { $this->element->isOptional = true; diff --git a/tests/Models/SurveyTemplateL11nTest.php b/tests/Models/SurveyTemplateL11nTest.php index 6ef6615..9b3a438 100755 --- a/tests/Models/SurveyTemplateL11nTest.php +++ b/tests/Models/SurveyTemplateL11nTest.php @@ -20,6 +20,7 @@ use phpOMS\Localization\ISO639x1Enum; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Surveys\Models\SurveyTemplateL11n::class)] final class SurveyTemplateL11nTest extends \PHPUnit\Framework\TestCase { private SurveyTemplateL11n $l11n; @@ -32,10 +33,7 @@ final class SurveyTemplateL11nTest extends \PHPUnit\Framework\TestCase $this->l11n = new SurveyTemplateL11n(); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplateL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testDefault() : void { self::assertEquals(0, $this->l11n->id); @@ -45,30 +43,21 @@ final class SurveyTemplateL11nTest extends \PHPUnit\Framework\TestCase self::assertEquals(ISO639x1Enum::_EN, $this->l11n->language); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplateL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testTextInputOutput() : void { $this->l11n->title = 'TestName'; self::assertEquals('TestName', $this->l11n->title); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplateL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testDescriptionInputOutput() : void { $this->l11n->description = 'TestContent'; self::assertEquals('TestContent', $this->l11n->description); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplateL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testSerialize() : void { $this->l11n->title = 'Title'; diff --git a/tests/Models/SurveyTemplateLabelL11nTest.php b/tests/Models/SurveyTemplateLabelL11nTest.php index c8d0977..e4ee6a6 100755 --- a/tests/Models/SurveyTemplateLabelL11nTest.php +++ b/tests/Models/SurveyTemplateLabelL11nTest.php @@ -20,6 +20,7 @@ use phpOMS\Localization\ISO639x1Enum; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Surveys\Models\SurveyTemplateLabelL11n::class)] final class SurveyTemplateLabelL11nTest extends \PHPUnit\Framework\TestCase { private SurveyTemplateLabelL11n $l11n; @@ -32,10 +33,7 @@ final class SurveyTemplateLabelL11nTest extends \PHPUnit\Framework\TestCase $this->l11n = new SurveyTemplateLabelL11n(); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplateLabelL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testDefault() : void { self::assertEquals(0, $this->l11n->id); @@ -43,20 +41,14 @@ final class SurveyTemplateLabelL11nTest extends \PHPUnit\Framework\TestCase self::assertEquals(ISO639x1Enum::_EN, $this->l11n->language); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplateLabelL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testTextInputOutput() : void { $this->l11n->title = 'TestName'; self::assertEquals('TestName', $this->l11n->title); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplateLabelL11n - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testSerialize() : void { $this->l11n->title = 'Title'; diff --git a/tests/Models/SurveyTemplateTest.php b/tests/Models/SurveyTemplateTest.php index 6990ea0..899e6f5 100755 --- a/tests/Models/SurveyTemplateTest.php +++ b/tests/Models/SurveyTemplateTest.php @@ -21,6 +21,7 @@ use Modules\Surveys\Models\SurveyTemplateL11n; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Surveys\Models\SurveyTemplate::class)] final class SurveyTemplateTest extends \PHPUnit\Framework\TestCase { private SurveyTemplate $survey; @@ -33,10 +34,7 @@ final class SurveyTemplateTest extends \PHPUnit\Framework\TestCase $this->survey = new SurveyTemplate(); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplate - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testDefault() : void { self::assertEquals(0, $this->survey->id); @@ -47,20 +45,14 @@ final class SurveyTemplateTest extends \PHPUnit\Framework\TestCase self::assertEquals([], $this->survey->files); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplate - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testL11nInputOutput() : void { $this->survey->setL11n(new SurveyTemplateL11n('NewTest')); self::assertEquals('NewTest', $this->survey->getL11n()->title); } - /** - * @covers \Modules\Surveys\Models\SurveyTemplate - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testSerialize() : void { $this->survey->hasPublicResult = false; 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* + +