From d27bcabc8bc0ab41dbd2219519718b11f8f9ce94 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Thu, 2 Jan 2020 15:08:08 +0100 Subject: tests: code coverage cleanup --- tests/Feature/Logger/EngelsystemLoggerTest.php | 8 ++--- tests/Unit/Database/Migration/MigrationTest.php | 3 ++ tests/Unit/Exceptions/Handlers/WhoopsTest.php | 6 +++- tests/Unit/Helpers/AuthenticatorTest.php | 2 +- .../Helpers/Translation/GettextTranslatorTest.php | 3 ++ tests/Unit/Models/NewsCommentsTest.php | 36 ++-------------------- tests/Unit/Models/NewsTest.php | 19 ++++++++++-- tests/Unit/Models/User/UserTest.php | 17 ++++++++++ tests/Unit/Renderer/RendererTest.php | 7 +++++ 9 files changed, 59 insertions(+), 42 deletions(-) diff --git a/tests/Feature/Logger/EngelsystemLoggerTest.php b/tests/Feature/Logger/EngelsystemLoggerTest.php index f315d11a..f8b95fa2 100644 --- a/tests/Feature/Logger/EngelsystemLoggerTest.php +++ b/tests/Feature/Logger/EngelsystemLoggerTest.php @@ -13,6 +13,7 @@ use stdClass; class EngelsystemLoggerTest extends ApplicationFeatureTest { /** + * @covers \Engelsystem\Logger\EngelsystemLogger::__construct * @return LoggerInterface */ public function getLogger() @@ -47,7 +48,7 @@ class EngelsystemLoggerTest extends ApplicationFeatureTest } /** - * @covers \Engelsystem\Models\LogEntry + * @covers \Engelsystem\Logger\EngelsystemLogger::log * @dataProvider provideLogLevels * @param string $level */ @@ -148,10 +149,7 @@ class EngelsystemLoggerTest extends ApplicationFeatureTest */ protected function getLastEntry() { - $entries = LogEntry::all(); - $entry = $entries->last(); - - return $entry; + return LogEntry::all()->last(); } /** diff --git a/tests/Unit/Database/Migration/MigrationTest.php b/tests/Unit/Database/Migration/MigrationTest.php index a9c70ecc..953ffe2e 100644 --- a/tests/Unit/Database/Migration/MigrationTest.php +++ b/tests/Unit/Database/Migration/MigrationTest.php @@ -9,6 +9,9 @@ use PHPUnit\Framework\TestCase; class MigrationTest extends TestCase { + /** + * @covers \Engelsystem\Database\Migration\Migration::__construct + */ public function testConstructor() { require_once __DIR__ . '/Stub/2017_12_24_053300_another_stuff.php'; diff --git a/tests/Unit/Exceptions/Handlers/WhoopsTest.php b/tests/Unit/Exceptions/Handlers/WhoopsTest.php index 67029d4d..f3e9cf32 100644 --- a/tests/Unit/Exceptions/Handlers/WhoopsTest.php +++ b/tests/Unit/Exceptions/Handlers/WhoopsTest.php @@ -17,7 +17,11 @@ use Whoops\RunInterface as WhoopsRunnerInterface; class WhoopsTest extends TestCase { /** - * @covers \Engelsystem\Exceptions\Handlers\Whoops + * @covers \Engelsystem\Exceptions\Handlers\Whoops::__construct + * @covers \Engelsystem\Exceptions\Handlers\Whoops::render + * @covers \Engelsystem\Exceptions\Handlers\Whoops::getPrettyPageHandler + * @covers \Engelsystem\Exceptions\Handlers\Whoops::getJsonResponseHandler + * @covers \Engelsystem\Exceptions\Handlers\Whoops::getData */ public function testRender() { diff --git a/tests/Unit/Helpers/AuthenticatorTest.php b/tests/Unit/Helpers/AuthenticatorTest.php index 03033858..e088b82c 100644 --- a/tests/Unit/Helpers/AuthenticatorTest.php +++ b/tests/Unit/Helpers/AuthenticatorTest.php @@ -16,7 +16,7 @@ class AuthenticatorTest extends ServiceProviderTest use HasDatabase; /** - * @covers \Engelsystem\Helpers\Authenticator::__construct( + * @covers \Engelsystem\Helpers\Authenticator::__construct * @covers \Engelsystem\Helpers\Authenticator::user */ public function testUser() diff --git a/tests/Unit/Helpers/Translation/GettextTranslatorTest.php b/tests/Unit/Helpers/Translation/GettextTranslatorTest.php index 825cf5b7..176b3093 100644 --- a/tests/Unit/Helpers/Translation/GettextTranslatorTest.php +++ b/tests/Unit/Helpers/Translation/GettextTranslatorTest.php @@ -54,6 +54,9 @@ class GettextTranslatorTest extends ServiceProviderTest $this->assertEquals('Translations!', $translator->dnpgettext(null, null, 'test.value', 'test.values', 2)); } + /** + * @return Translations + */ protected function getTranslations(): Translations { $translations = new Translations(); diff --git a/tests/Unit/Models/NewsCommentsTest.php b/tests/Unit/Models/NewsCommentsTest.php index dfded712..1749e988 100644 --- a/tests/Unit/Models/NewsCommentsTest.php +++ b/tests/Unit/Models/NewsCommentsTest.php @@ -28,8 +28,6 @@ class NewsCommentsTest extends TestCase /** * Sets up some test objects and test data. - * - * @return void */ protected function setUp(): void { @@ -59,7 +57,7 @@ class NewsCommentsTest extends TestCase /** * Tests that a NewsComment can be created and loaded. * - * @return void + * @covers \Engelsystem\Models\NewsComment */ public function testCreate(): void { @@ -75,7 +73,7 @@ class NewsCommentsTest extends TestCase /** * Tests that accessing the User of a NewsComment works. * - * @return void + * @covers \Engelsystem\Models\NewsComment::user */ public function testUser(): void { @@ -87,7 +85,7 @@ class NewsCommentsTest extends TestCase /** * Tests that accessing the News of a NewsComment works. * - * @return void + * @covers \Engelsystem\Models\NewsComment::news */ public function testNews(): void { @@ -95,32 +93,4 @@ class NewsCommentsTest extends TestCase $this->assertInstanceOf(News::class, $newsComment->news); $this->assertSame($this->news->id, $newsComment->news->id); } - - /** - * Tests that accessing the NewsComments of a News works. - * - * @return void - */ - public function testNewsComments(): void - { - $newsComment = NewsComment::create($this->newsCommentData); - $comments = $this->news->comments; - $this->assertCount(1, $comments); - $comment = $comments->first(); - $this->assertSame($newsComment->id, $comment->id); - } - - /** - * Tests that accessing the NewsComments of an User works. - * - * @return void - */ - public function testUserNewsComments(): void - { - $newsComment = NewsComment::create($this->newsCommentData); - $comments = $this->user->newsComments; - $this->assertCount(1, $comments); - $comment = $comments->first(); - $this->assertSame($newsComment->id, $comment->id); - } } diff --git a/tests/Unit/Models/NewsTest.php b/tests/Unit/Models/NewsTest.php index 18ca2d9a..ca933686 100644 --- a/tests/Unit/Models/NewsTest.php +++ b/tests/Unit/Models/NewsTest.php @@ -47,7 +47,7 @@ class NewsTest extends TestCase /** * Tests that creating a News item with default values works. * - * @return void + * @covers \Engelsystem\Models\News */ public function testCreateDefault(): void { @@ -60,10 +60,25 @@ class NewsTest extends TestCase $this->assertFalse($news->is_meeting); } + /** + * Tests that accessing the NewsComments of a News works. + * + * @covers \Engelsystem\Models\News::comments + */ + public function testNewsComments(): void + { + $news = (new News())->create($this->newsData); + $comment = $news->comments()->create(['text' => 'test comment', 'user_id' => $this->user->id]); + + $comments = $news->comments; + $this->assertCount(1, $comments); + $this->assertEquals($comment->toArray(), $news->comments->first()->toArray()); + } + /** * Tests that creating a News item with all fill values works. * - * @return void + * @covers \Engelsystem\Models\News */ public function testCreate(): void { diff --git a/tests/Unit/Models/User/UserTest.php b/tests/Unit/Models/User/UserTest.php index fd8e2396..7f56d0c4 100644 --- a/tests/Unit/Models/User/UserTest.php +++ b/tests/Unit/Models/User/UserTest.php @@ -5,6 +5,7 @@ namespace Engelsystem\Test\Unit\Models; use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts; use Engelsystem\Models\BaseModel; use Engelsystem\Models\News; +use Engelsystem\Models\NewsComment; use Engelsystem\Models\Question; use Engelsystem\Models\User\Contact; use Engelsystem\Models\User\HasUserModel; @@ -148,6 +149,22 @@ class UserTest extends TestCase ]; } + /** + * Tests that accessing the NewsComments of an User works. + * + * @covers \Engelsystem\Models\User\User::newsComments + */ + public function testNewsComments(): void + { + ($user = new User($this->data))->save(); + $newsComment = NewsComment::create(['news_id' => 0, 'text' => 'test comment', 'user_id' => $user->id]); + $comments = $user->newsComments; + + $this->assertCount(1, $comments); + $comment = $comments->first(); + $this->assertSame($newsComment->id, $comment->id); + } + /** * @covers \Engelsystem\Models\User\User::questionsAsked */ diff --git a/tests/Unit/Renderer/RendererTest.php b/tests/Unit/Renderer/RendererTest.php index 9304356a..0b306c19 100644 --- a/tests/Unit/Renderer/RendererTest.php +++ b/tests/Unit/Renderer/RendererTest.php @@ -10,6 +10,10 @@ use Psr\Log\LoggerInterface; class RendererTest extends TestCase { + /** + * @covers \Engelsystem\Renderer\Renderer::render + * @covers \Engelsystem\Renderer\Renderer::addRenderer + */ public function testGet() { $renderer = new Renderer(); @@ -41,6 +45,9 @@ class RendererTest extends TestCase $this->assertEquals('Rendered content', $data); } + /** + * @covers \Engelsystem\Renderer\Renderer::render + */ public function testError() { $renderer = new Renderer(); -- cgit v1.2.3