diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index 0812eba..43b3520 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -22,6 +22,7 @@ use phpOMS\Uri\HttpUri; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Navigation\Models\Navigation::class)] final class AdminTest extends \PHPUnit\Framework\TestCase { protected const NAME = 'Navigation'; @@ -33,11 +34,10 @@ final class AdminTest extends \PHPUnit\Framework\TestCase /** * Test if navigation model works correct * - * @covers \Modules\Navigation\Models\Navigation * - * @group final - * @group module */ + #[\PHPUnit\Framework\Attributes\Group('final')] + #[\PHPUnit\Framework\Attributes\Group('module')] public function testNavigationElements() : void { $request = new HttpRequest(new HttpUri('http://127.0.0.1/en/backend')); diff --git a/tests/Controller/SearchControllerTest.php b/tests/Controller/SearchControllerTest.php index 9188c45..5bfde46 100755 --- a/tests/Controller/SearchControllerTest.php +++ b/tests/Controller/SearchControllerTest.php @@ -33,10 +33,10 @@ use phpOMS\Router\WebRouter; use phpOMS\Utils\TestUtils; /** - * @testdox Modules\Navigation\tests\Controller\SearchControllerTest: Admin api controller - * * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Navigation\Controller\SearchController::class)] +#[\PHPUnit\Framework\Attributes\TestDox('Modules\Navigation\tests\Controller\SearchControllerTest: Admin api controller')] final class SearchControllerTest extends \PHPUnit\Framework\TestCase { protected ApplicationAbstract $app; @@ -90,10 +90,7 @@ final class SearchControllerTest extends \PHPUnit\Framework\TestCase TestUtils::setMember($this->module, 'app', $this->app); } - /** - * @covers \Modules\Navigation\Controller\SearchController - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testGotoSearch() : void { $response = new HttpResponse(); @@ -108,10 +105,7 @@ final class SearchControllerTest extends \PHPUnit\Framework\TestCase self::assertInstanceOf(Redirect::class, $response->getData('')); } - /** - * @covers \Modules\Navigation\Controller\SearchController - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testInvalidGotoSearch() : void { $response = new HttpResponse(); diff --git a/tests/Models/NavigationTest.php b/tests/Models/NavigationTest.php index c13737c..8632e2a 100755 --- a/tests/Models/NavigationTest.php +++ b/tests/Models/NavigationTest.php @@ -23,6 +23,7 @@ use phpOMS\Utils\TestUtils; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Navigation\Models\Navigation::class)] final class NavigationTest extends \PHPUnit\Framework\TestCase { private Navigation $nav; @@ -39,19 +40,13 @@ final class NavigationTest extends \PHPUnit\Framework\TestCase $this->nav = Navigation::getInstance($request, $account, $GLOBALS['dbpool'], 1, 2); } - /** - * @covers \Modules\Navigation\Models\Navigation - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testDefault() : void { self::assertTrue(!empty($this->nav->getNav())); } - /** - * @covers \Modules\Navigation\Models\Navigation - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testGetInstanceInvalidHashes() : void { TestUtils::setMember($this->nav, 'instance', null); diff --git a/tests/Models/NullNavElementTest.php b/tests/Models/NullNavElementTest.php index a1495c4..8ed1354 100644 --- a/tests/Models/NullNavElementTest.php +++ b/tests/Models/NullNavElementTest.php @@ -19,31 +19,23 @@ use Modules\Navigation\Models\NullNavElement; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Navigation\Models\NullNavElement::class)] final class NullNavElementTest extends \PHPUnit\Framework\TestCase { - /** - * @covers \Modules\Navigation\Models\NullNavElement - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testNull() : void { self::assertInstanceOf('\Modules\Navigation\Models\NavElement', new NullNavElement()); } - /** - * @covers \Modules\Navigation\Models\NullNavElement - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testId() : void { $null = new NullNavElement(2); self::assertEquals(2, $null->id); } - /** - * @covers \Modules\Navigation\Models\NullNavElement - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testJsonSerialize() : void { $null = new NullNavElement(2); diff --git a/tests/Views/NavigationViewTest.php b/tests/Views/NavigationViewTest.php index f8bc680..00822a2 100755 --- a/tests/Views/NavigationViewTest.php +++ b/tests/Views/NavigationViewTest.php @@ -19,6 +19,7 @@ use Modules\Navigation\Views\NavigationView; /** * @internal */ +#[\PHPUnit\Framework\Attributes\CoversClass(\Modules\Navigation\Views\NavigationView::class)] final class NavigationViewTest extends \PHPUnit\Framework\TestCase { private NavigationView $view; @@ -31,10 +32,7 @@ final class NavigationViewTest extends \PHPUnit\Framework\TestCase $this->view = new NavigationView(); } - /** - * @covers \Modules\Navigation\Views\NavigationView - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testDefault() : void { self::assertEquals(0, $this->view->getNavId()); @@ -42,30 +40,21 @@ final class NavigationViewTest extends \PHPUnit\Framework\TestCase self::assertEquals(0, $this->view->parent); } - /** - * @covers \Modules\Navigation\Views\NavigationView - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testNavIdInputOutput() : void { $this->view->setNavId(2); self::assertEquals(2, $this->view->getNavId()); } - /** - * @covers \Modules\Navigation\Views\NavigationView - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testNavInputOutput() : void { $this->view->setNav([1, 2, 3]); self::assertEquals([1, 2, 3], $this->view->getNav()); } - /** - * @covers \Modules\Navigation\Views\NavigationView - * @group module - */ + #[\PHPUnit\Framework\Attributes\Group('module')] public function testParentInputOutput() : void { $this->view->parent = 4; 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* + +