From 0cb0497e25b1ad5b0268e1bf480d89bd60a739e6 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 27 Sep 2023 14:42:42 +0000 Subject: [PATCH] fix tests --- tests/Autoloader.php | 5 ++++- .../Api/ApiControllerAttributeTrait.php | 22 +++++++++---------- tests/Controller/ApiControllerTest.php | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/tests/Autoloader.php b/tests/Autoloader.php index c91996a..b39a8d6 100755 --- a/tests/Autoloader.php +++ b/tests/Autoloader.php @@ -83,9 +83,12 @@ final class Autoloader } $class2 = $class; + $class3 = $class; $pos = \stripos($class, '/'); if ($pos !== false) { + $class3 = \substr($class, $pos + 1); + $pos = \stripos($class, '/', $pos + 1); if ($pos !== false) { @@ -94,7 +97,7 @@ final class Autoloader } foreach (self::$paths as $path) { - if (\is_file($file = $path . $class2 . '.php')) { + if (\is_file($file = $path . $class2 . '.php') && \stripos($file, $class3) !== false) { include_once $file; return; diff --git a/tests/Controller/Api/ApiControllerAttributeTrait.php b/tests/Controller/Api/ApiControllerAttributeTrait.php index 446c89e..3a71118 100755 --- a/tests/Controller/Api/ApiControllerAttributeTrait.php +++ b/tests/Controller/Api/ApiControllerAttributeTrait.php @@ -24,7 +24,7 @@ use phpOMS\Uri\HttpUri; trait ApiControllerAttributeTrait { /** - * @covers Modules\EquipmentManagement\Controller\ApiController + * @covers Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController * @group module */ public function testApiEquipmentAttributeTypeCreate() : void @@ -42,7 +42,7 @@ trait ApiControllerAttributeTrait } /** - * @covers Modules\EquipmentManagement\Controller\ApiController + * @covers Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController * @group module */ public function testApiEquipmentAttributeTypeL11nCreate() : void @@ -60,7 +60,7 @@ trait ApiControllerAttributeTrait } /** - * @covers Modules\EquipmentManagement\Controller\ApiController + * @covers Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController * @group module */ public function testApiEquipmentAttributeValueIntCreate() : void @@ -80,7 +80,7 @@ trait ApiControllerAttributeTrait } /** - * @covers Modules\EquipmentManagement\Controller\ApiController + * @covers Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController * @group module */ public function testApiEquipmentAttributeValueStrCreate() : void @@ -99,7 +99,7 @@ trait ApiControllerAttributeTrait } /** - * @covers Modules\EquipmentManagement\Controller\ApiController + * @covers Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController * @group module */ public function testApiEquipmentAttributeValueFloatCreate() : void @@ -118,7 +118,7 @@ trait ApiControllerAttributeTrait } /** - * @covers Modules\EquipmentManagement\Controller\ApiController + * @covers Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController * @group module */ public function testApiEquipmentAttributeValueDatCreate() : void @@ -137,7 +137,7 @@ trait ApiControllerAttributeTrait } /** - * @covers Modules\EquipmentManagement\Controller\ApiController + * @covers Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController * @group module */ public function testApiEquipmentAttributeCreate() : void @@ -155,7 +155,7 @@ trait ApiControllerAttributeTrait } /** - * @covers Modules\EquipmentManagement\Controller\ApiController + * @covers Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController * @group module */ public function testApiEquipmentAttributeValueCreateInvalidData() : void @@ -171,7 +171,7 @@ trait ApiControllerAttributeTrait } /** - * @covers Modules\EquipmentManagement\Controller\ApiController + * @covers Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController * @group module */ public function testApiEquipmentAttributeTypeCreateInvalidData() : void @@ -187,7 +187,7 @@ trait ApiControllerAttributeTrait } /** - * @covers Modules\EquipmentManagement\Controller\ApiController + * @covers Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController * @group module */ public function testApiEquipmentAttributeTypeL11nCreateInvalidData() : void @@ -203,7 +203,7 @@ trait ApiControllerAttributeTrait } /** - * @covers Modules\EquipmentManagement\Controller\ApiController + * @covers Modules\EquipmentManagement\Controller\ApiEquipmentAttributeController * @group module */ public function testApiEquipmentAttributeCreateInvalidData() : void diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 348310b..ca3bf7b 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -87,7 +87,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $this->app->router = new WebRouter(); $this->module = $this->app->moduleManager->get('EquipmentManagement', 'Api'); - $this->attrModule = $this->app->moduleManager->get('EquipmentManagement', 'ApiAttribute'); + $this->attrModule = $this->app->moduleManager->get('EquipmentManagement', 'ApiEquipmentAttribute'); TestUtils::setMember($this->module, 'app', $this->app); TestUtils::setMember($this->attrModule, 'app', $this->app);