fix tests and replace file_exists

This commit is contained in:
Dennis Eichhorn 2020-10-08 15:12:24 +02:00
parent 3b3421ceff
commit e575194a2b
11 changed files with 84 additions and 9 deletions

View File

@ -396,7 +396,7 @@ final class ApiController extends Controller
$appManager = new ApplicationManager($this->app->moduleManager); $appManager = new ApplicationManager($this->app->moduleManager);
$app = $request->getData('appSrc'); $app = $request->getData('appSrc');
if (!\file_exists(__DIR__ . '/../../../' . $app)) { if (!\is_dir(__DIR__ . '/../../../' . $app)) {
$response->getHeader()->setStatusCode(RequestStatusCode::R_400); $response->getHeader()->setStatusCode(RequestStatusCode::R_400);
return; return;
} }
@ -425,11 +425,11 @@ final class ApiController extends Controller
*/ */
public function apiActivateTheme(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiActivateTheme(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
if (\file_exists(__DIR__ . '/../../../' . $request->getData('appDest') . '/css')) { if (\is_dir(__DIR__ . '/../../../' . $request->getData('appDest') . '/css')) {
Directory::delete(__DIR__ . '/../../../' . $request->getData('appDest') . '/css'); Directory::delete(__DIR__ . '/../../../' . $request->getData('appDest') . '/css');
} }
if (\file_exists(__DIR__ . '/../../../' . $request->getData('appDest') . '/Themes/' . $request->getData('theme') . '/css')) { if (\is_dir(__DIR__ . '/../../../' . $request->getData('appDest') . '/Themes/' . $request->getData('theme') . '/css')) {
Directory::copy( Directory::copy(
__DIR__ . '/../../../' . $request->getData('appDest') . '/Themes/' . $request->getData('theme') . '/css', __DIR__ . '/../../../' . $request->getData('appDest') . '/Themes/' . $request->getData('theme') . '/css',
__DIR__ . '/../../../' . $request->getData('appDest') . '/css', __DIR__ . '/../../../' . $request->getData('appDest') . '/css',
@ -1363,21 +1363,21 @@ final class ApiController extends Controller
if ($directories !== false) { if ($directories !== false) {
foreach ($directories as $directory) { foreach ($directories as $directory) {
if (\file_exists($path = $directory . '/Routes.php')) { if (\is_file($path = $directory . '/Routes.php')) {
\file_put_contents($path, '<?php return [];'); \file_put_contents($path, '<?php return [];');
} }
if (\file_exists($path = $directory . '/Hooks.php')) { if (\is_file($path = $directory . '/Hooks.php')) {
\file_put_contents($path, '<?php return [];'); \file_put_contents($path, '<?php return [];');
} }
} }
} }
if (\file_exists($path = __DIR__ . '/../../../Console/Routes.php')) { if (\is_file($path = __DIR__ . '/../../../Console/Routes.php')) {
\file_put_contents($path, '<?php return [];'); \file_put_contents($path, '<?php return [];');
} }
if (\file_exists($path = __DIR__ . '/../../../Socket/Routes.php')) { if (\is_file($path = __DIR__ . '/../../../Socket/Routes.php')) {
\file_put_contents($path, '<?php return [];'); \file_put_contents($path, '<?php return [];');
} }
@ -1423,9 +1423,9 @@ final class ApiController extends Controller
$name = \explode('_', $file['name']); $name = \explode('_', $file['name']);
$path = ''; $path = '';
if (\file_exists(__DIR__ . '/../../../' . $name[0])) { if (\is_dir(__DIR__ . '/../../../' . $name[0])) {
$path = __DIR__ . '/../../../' . $name[0]; $path = __DIR__ . '/../../../' . $name[0];
} elseif (\file_exists(__DIR__ . '/../../' . $name[0])) { } elseif (\is_dir(__DIR__ . '/../../' . $name[0])) {
$path = __DIR__ . '/../../' . $name[0]; $path = __DIR__ . '/../../' . $name[0];
} }

View File

@ -106,6 +106,10 @@ trait ApiControllerAccountTrait
self::assertGreaterThan(0, $response->get('')['response']->getId()); self::assertGreaterThan(0, $response->get('')['response']->getId());
} }
/**
* @covers Modules\Admin\Controller\ApiController
* @group module
*/
public function testApiAccountCreateWithCustomLocale() : void public function testApiAccountCreateWithCustomLocale() : void
{ {
$response = new HttpResponse(); $response = new HttpResponse();

View File

@ -21,6 +21,10 @@ use phpOMS\Uri\HttpUri;
trait ApiControllerApplicationTrait trait ApiControllerApplicationTrait
{ {
/**
* @covers Modules\Admin\Controller\Apicontroller
* @group module
*/
public function testApiInvalidAppplicationPathInstall() : void public function testApiInvalidAppplicationPathInstall() : void
{ {
$response = new HttpResponse(); $response = new HttpResponse();

View File

@ -61,6 +61,10 @@ trait ApiControllerSettingsTrait
$this->module->apiSettingsSet($request, $response); $this->module->apiSettingsSet($request, $response);
} }
/**
* @covers Modules\Admin\Controller\ApiController
* @group module
*/
public function testApiAccountLocalizationLoadSet() : void public function testApiAccountLocalizationLoadSet() : void
{ {
$response = new HttpResponse(); $response = new HttpResponse();
@ -82,6 +86,10 @@ trait ApiControllerSettingsTrait
self::assertEquals($l11n->getLanguage(), 'en'); self::assertEquals($l11n->getLanguage(), 'en');
} }
/**
* @covers Modules\Admin\Controller\ApiController
* @group module
*/
public function testApiAccountLocalizationSet() : void public function testApiAccountLocalizationSet() : void
{ {
$response = new HttpResponse(); $response = new HttpResponse();
@ -102,6 +110,10 @@ trait ApiControllerSettingsTrait
self::assertEquals($l11n->getCurrency(), 'EUR'); self::assertEquals($l11n->getCurrency(), 'EUR');
} }
/**
* @covers Modules\Admin\Controller\ApiController
* @group module
*/
public function testInvalidPermissionAccountLocalizationSet() : void public function testInvalidPermissionAccountLocalizationSet() : void
{ {
$response = new HttpResponse(); $response = new HttpResponse();

View File

@ -42,6 +42,9 @@ class ApiControllerTest extends \PHPUnit\Framework\TestCase
{ {
protected ApplicationAbstract $app; protected ApplicationAbstract $app;
/**
* @var \Modules\Admin\Controller\ApiController
*/
protected ModuleAbstract $module; protected ModuleAbstract $module;
protected function setUp() : void protected function setUp() : void

View File

@ -102,6 +102,10 @@ class AccountMapperTest extends \PHPUnit\Framework\TestCase
self::assertGreaterThan(0, AccountMapper::login('admin', 'orange')); self::assertGreaterThan(0, AccountMapper::login('admin', 'orange'));
} }
/**
* @covers Modules\Admin\Models\AccountMapper
* @group module
*/
public function testInvalidLoginTries() : void public function testInvalidLoginTries() : void
{ {
$accountR = AccountMapper::get(1); $accountR = AccountMapper::get(1);
@ -114,6 +118,10 @@ class AccountMapperTest extends \PHPUnit\Framework\TestCase
AccountMapper::update($accountR); AccountMapper::update($accountR);
} }
/**
* @covers Modules\Admin\Models\AccountMapper
* @group module
*/
public function testInvalidLoginAccountStatus() : void public function testInvalidLoginAccountStatus() : void
{ {
$accountR = AccountMapper::get(1); $accountR = AccountMapper::get(1);
@ -126,6 +134,10 @@ class AccountMapperTest extends \PHPUnit\Framework\TestCase
AccountMapper::update($accountR); AccountMapper::update($accountR);
} }
/**
* @covers Modules\Admin\Models\AccountMapper
* @group module
*/
public function testEmptyLoginPassword() : void public function testEmptyLoginPassword() : void
{ {
$accountR = AccountMapper::get(1); $accountR = AccountMapper::get(1);

View File

@ -21,11 +21,19 @@ use Modules\Admin\Models\NullAccountPermission;
*/ */
final class NullAccountPermissionTest extends \PHPUnit\Framework\TestCase final class NullAccountPermissionTest extends \PHPUnit\Framework\TestCase
{ {
/**
* @covers Modules\Admin\Models\NullAccountPermission
* @group module
*/
public function testNull() : void public function testNull() : void
{ {
self::assertInstanceOf('\Modules\Admin\Models\AccountPermission', new NullAccountPermission()); self::assertInstanceOf('\Modules\Admin\Models\AccountPermission', new NullAccountPermission());
} }
/**
* @covers Modules\Admin\Models\NullAccountPermission
* @group module
*/
public function testId() : void public function testId() : void
{ {
$null = new NullAccountPermission(2); $null = new NullAccountPermission(2);

View File

@ -21,11 +21,19 @@ use Modules\Admin\Models\NullAccount;
*/ */
final class NullAccountTest extends \PHPUnit\Framework\TestCase final class NullAccountTest extends \PHPUnit\Framework\TestCase
{ {
/**
* @covers Modules\Admin\Models\NullAccount
* @group module
*/
public function testNull() : void public function testNull() : void
{ {
self::assertInstanceOf('\Modules\Admin\Models\Account', new NullAccount()); self::assertInstanceOf('\Modules\Admin\Models\Account', new NullAccount());
} }
/**
* @covers Modules\Admin\Models\NullAccount
* @group module
*/
public function testId() : void public function testId() : void
{ {
$null = new NullAccount(2); $null = new NullAccount(2);

View File

@ -21,11 +21,19 @@ use Modules\Admin\Models\NullAddress;
*/ */
final class NullAddressTest extends \PHPUnit\Framework\TestCase final class NullAddressTest extends \PHPUnit\Framework\TestCase
{ {
/**
* @covers Modules\Admin\Models\NullAddress
* @group module
*/
public function testNull() : void public function testNull() : void
{ {
self::assertInstanceOf('\Modules\Admin\Models\Address', new NullAddress()); self::assertInstanceOf('\Modules\Admin\Models\Address', new NullAddress());
} }
/**
* @covers Modules\Admin\Models\NullAddress
* @group module
*/
public function testId() : void public function testId() : void
{ {
$null = new NullAddress(2); $null = new NullAddress(2);

View File

@ -21,11 +21,19 @@ use Modules\Admin\Models\NullGroupPermission;
*/ */
final class NullGroupPermissionTest extends \PHPUnit\Framework\TestCase final class NullGroupPermissionTest extends \PHPUnit\Framework\TestCase
{ {
/**
* @covers Modules\Admin\Models\NullGroupPermission
* @group module
*/
public function testNull() : void public function testNull() : void
{ {
self::assertInstanceOf('\Modules\Admin\Models\GroupPermission', new NullGroupPermission()); self::assertInstanceOf('\Modules\Admin\Models\GroupPermission', new NullGroupPermission());
} }
/**
* @covers Modules\Admin\Models\NullGroupPermission
* @group module
*/
public function testId() : void public function testId() : void
{ {
$null = new NullGroupPermission(2); $null = new NullGroupPermission(2);

View File

@ -21,11 +21,19 @@ use Modules\Admin\Models\NullGroup;
*/ */
final class NullGroupTest extends \PHPUnit\Framework\TestCase final class NullGroupTest extends \PHPUnit\Framework\TestCase
{ {
/**
* @covers Modules\Admin\Models\NullGroup
* @group module
*/
public function testNull() : void public function testNull() : void
{ {
self::assertInstanceOf('\Modules\Admin\Models\Group', new NullGroup()); self::assertInstanceOf('\Modules\Admin\Models\Group', new NullGroup());
} }
/**
* @covers Modules\Admin\Models\NullGroup
* @group module
*/
public function testId() : void public function testId() : void
{ {
$null = new NullGroup(2); $null = new NullGroup(2);