diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 4bb700c..7bd40a2 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -30,10 +30,10 @@ use phpOMS\Router\WebRouter; use phpOMS\Utils\TestUtils; /** - * @testdox Modules\tests\Auditor\Controller\ApiControllerTest: Auditor api controller - * * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Auditor\Controller\ApiController::class)] +#[\PHPUnit\Framework\Attributes\TestDox('Modules\tests\Auditor\Controller\ApiControllerTest: Auditor api controller')] final class ApiControllerTest extends \PHPUnit\Framework\TestCase { protected ApplicationAbstract $app; @@ -87,11 +87,8 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase TestUtils::setMember($this->module, 'app', $this->app); } - /** - * @testdox Audit logs for create statements can be created - * @covers \Modules\Auditor\Controller\ApiController - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] + #[\PHPUnit\Framework\Attributes\TestDox('Audit logs for create statements can be created')] public function testLogCreate() : void { $this->module->eventLogCreate(1, null, ['id' => 1, 'test' => true], 1, 'test-trigger', 'Auditor', 'abc', 'def'); @@ -118,11 +115,8 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase self::assertTrue(false); } - /** - * @testdox Audit logs for update statements can be created - * @covers \Modules\Auditor\Controller\ApiController - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] + #[\PHPUnit\Framework\Attributes\TestDox('Audit logs for update statements can be created')] public function testLogUpdate() : void { $this->module->eventLogUpdate(1, ['id' => 2, 'test' => true], ['id' => 1, 'test' => true], 1, 'test-trigger', 'Auditor', 'abc', 'def'); @@ -147,10 +141,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase self::assertTrue($found); } - /** - * @covers \Modules\Auditor\Controller\ApiController - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testLogUpdateWithoutChange() : void { $logs = AuditMapper::getAll()->execute(); @@ -161,11 +152,8 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase self::assertEquals(\count($logs), \count($logs2)); } - /** - * @testdox Audit logs for delete statements can be created - * @covers \Modules\Auditor\Controller\ApiController - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] + #[\PHPUnit\Framework\Attributes\TestDox('Audit logs for delete statements can be created')] public function testLogDelete() : void { $this->module->eventLogDelete(1, ['id' => 1, 'test' => true], null, 1, 'test-trigger', 'Auditor', 'abc', 'def'); diff --git a/tests/Models/AuditMapperTest.php b/tests/Models/AuditMapperTest.php index 2198de7..80b6ff4 100755 --- a/tests/Models/AuditMapperTest.php +++ b/tests/Models/AuditMapperTest.php @@ -21,12 +21,10 @@ use Modules\Auditor\Models\AuditMapper; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Auditor\Models\AuditMapper::class)] final class AuditMapperTest extends \PHPUnit\Framework\TestCase { - /** - * @covers \Modules\Auditor\Models\AuditMapper - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testCR() : void { $audit = new Audit( diff --git a/tests/Models/AuditTest.php b/tests/Models/AuditTest.php index e3d1094..db9e95d 100755 --- a/tests/Models/AuditTest.php +++ b/tests/Models/AuditTest.php @@ -18,17 +18,14 @@ use Modules\Auditor\Models\Audit; use phpOMS\Account\Account; /** - * @testdox Modules\tests\Auditor\Models\AuditTest: Audit model - * * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Auditor\Models\Audit::class)] +#[\PHPUnit\Framework\Attributes\TestDox('Modules\tests\Auditor\Models\AuditTest: Audit model')] final class AuditTest extends \PHPUnit\Framework\TestCase { - /** - * @testdox The model has the expected default values after initialization - * @covers \Modules\Auditor\Models\Audit - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] + #[\PHPUnit\Framework\Attributes\TestDox('The model has the expected default values after initialization')] public function testDefault() : void { $audit = new Audit(); @@ -45,11 +42,8 @@ final class AuditTest extends \PHPUnit\Framework\TestCase self::assertInstanceOf('\DateTimeImmutable', $audit->createdAt); } - /** - * @testdox The model can be initialized correctly - * @covers \Modules\Auditor\Models\Audit - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] + #[\PHPUnit\Framework\Attributes\TestDox('The model can be initialized correctly')] public function testConstructorInputOutput() : void { $audit = new Audit( diff --git a/tests/Models/NullAuditTest.php b/tests/Models/NullAuditTest.php index 01a197a..ee785c4 100755 --- a/tests/Models/NullAuditTest.php +++ b/tests/Models/NullAuditTest.php @@ -19,31 +19,23 @@ use Modules\Auditor\Models\NullAudit; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Auditor\Models\NullAudit::class)] final class NullAuditTest extends \PHPUnit\Framework\TestCase { - /** - * @covers \Modules\Auditor\Models\NullAudit - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testNull() : void { self::assertInstanceOf('\Modules\Auditor\Models\Audit', new NullAudit()); } - /** - * @covers \Modules\Auditor\Models\NullAudit - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testId() : void { $null = new NullAudit(2); self::assertEquals(2, $null->id); } - /** - * @covers \Modules\Auditor\Models\NullAudit - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testJsonSerialize() : void { $null = new NullAudit(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* + +