Merge pull request #689 from hydephp/code-cleanup

Internal: Test code refactors and cleanup
hydephp · Dec 21, 2024 · b87b0ed · b87b0ed
2 parents 1fabbd8 + d0ee682
commit b87b0ed
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 140 deletions.
diff --git a/tests/Unit/AssetServiceUnitTest.php b/tests/Unit/AssetServiceUnitTest.php
@@ -17,7 +17,7 @@ class AssetServiceUnitTest extends UnitTestCase
 {
     protected function setUp(): void
     {
-        self::setupKernel();
+        self::resetKernel();
         self::mockConfig();
     }
 

diff --git a/tests/Unit/BaseFoundationCollectionTest.php b/tests/Unit/BaseFoundationCollectionTest.php
@@ -17,7 +17,7 @@ class BaseFoundationCollectionTest extends UnitTestCase
 {
     public function testBaseFoundationCollectionInitialization()
     {
-        $this->setupKernel();
+        self::resetKernel();
 
         $booted = BaseFoundationCollectionTestClass::init(HydeKernel::getInstance())->boot();
 

diff --git a/tests/Unit/BreadcrumbsComponentTest.php b/tests/Unit/BreadcrumbsComponentTest.php
@@ -23,7 +23,7 @@ class BreadcrumbsComponentTest extends UnitTestCase
 {
     protected function setUp(): void
     {
-        self::setupKernel();
+        self::resetKernel();
         self::mockConfig();
     }
 

diff --git a/tests/Unit/BuildTaskUnitTest.php b/tests/Unit/BuildTaskUnitTest.php
@@ -153,7 +153,7 @@ public function testCanWriteToOutput()
 
     public function testCreatedSiteFile()
     {
-        self::setupKernel();
+        self::resetKernel();
 
         $task = new BufferedTestBuildTask();
 
@@ -164,7 +164,7 @@ public function testCreatedSiteFile()
 
     public function testCreatedSiteFileWithAbsolutePath()
     {
-        self::setupKernel();
+        self::resetKernel();
 
         $task = new BufferedTestBuildTask();
 

diff --git a/tests/Unit/Facades/AuthorTest.php b/tests/Unit/Facades/AuthorTest.php
@@ -5,23 +5,37 @@
 namespace Hyde\Framework\Testing\Unit\Facades;
 
 use Hyde\Facades\Author;
+use Hyde\Testing\UnitTestCase;
 use Hyde\Framework\Features\Blogging\Models\PostAuthor;
-use Hyde\Testing\TestCase;
 
 /**
  * @covers \Hyde\Facades\Author
  */
-class AuthorTest extends TestCase
+class AuthorTest extends UnitTestCase
 {
+    protected function setUp(): void
+    {
+        self::mockConfig(['hyde.authors' => [
+            Author::create('mr_hyde', 'Mr. Hyde', 'https://hydephp.com'),
+        ]]);
+    }
+
     public function testCreate()
     {
         $author = Author::create('john_doe', 'John Doe', 'https://johndoe.com');
 
         $this->assertSame('john_doe', $author->username);
         $this->assertSame('John Doe', $author->name);
         $this->assertSame('https://johndoe.com', $author->website);
+    }
 
-        $this->assertEquals(Author::create('foo', null, null), Author::create('foo'));
+    public function testCreateWithOnlyRequiredFields()
+    {
+        $author = Author::create('john_doe');
+
+        $this->assertSame('john_doe', $author->username);
+        $this->assertSame('john_doe', $author->name);
+        $this->assertNull($author->website);
     }
 
     public function testGet()
@@ -31,7 +45,15 @@ public function testGet()
         $this->assertSame('mr_hyde', $author->username);
         $this->assertSame('Mr. Hyde', $author->name);
         $this->assertSame('https://hydephp.com', $author->website);
+    }
 
+    public function testGetWithNotSetUsername()
+    {
+        $this->assertEquals(Author::create('foo'), Author::get('foo'));
+    }
+
+    public function testGetAliasesPostAuthor()
+    {
         $this->assertEquals(PostAuthor::get('foo'), Author::get('foo'));
     }
 
@@ -40,5 +62,12 @@ public function testAll()
         $authors = Author::all();
         $this->assertCount(1, $authors);
         $this->assertContainsOnlyInstancesOf(PostAuthor::class, $authors);
+        $this->assertEquals(Author::get('mr_hyde'), $authors->first());
+    }
+
+    public function testAllWithNoAuthors()
+    {
+        self::mockConfig(['hyde.authors' => []]);
+        $this->assertEmpty(Author::all());
     }
 }
diff --git a/tests/Unit/HtmlTestingSupportMetaTest.php b/tests/Unit/HtmlTestingSupportMetaTest.php
@@ -31,9 +31,7 @@ class HtmlTestingSupportMetaTest extends UnitTestCase
 
     protected function setUp(): void
     {
-        parent::setUp();
-
-        self::setupKernel();
+        self::resetKernel();
 
         $this->html ??= file_get_contents(Hyde::vendorPath('resources/views/homepages/welcome.blade.php'));
     }

diff --git a/tests/Unit/NavItemTest.php b/tests/Unit/NavItemTest.php
@@ -25,8 +25,11 @@
  */
 class NavItemTest extends UnitTestCase
 {
-    protected static bool $needsKernel = true;
-    protected static bool $needsConfig = true;
+    public static function setUpBeforeClass(): void
+    {
+        self::resetKernel();
+        self::mockConfig();
+    }
 
     protected function setUp(): void
     {

diff --git a/tests/Unit/NavigationDataFactoryUnitTest.php b/tests/Unit/NavigationDataFactoryUnitTest.php
@@ -19,7 +19,7 @@ class NavigationDataFactoryUnitTest extends UnitTestCase
 {
     protected function setUp(): void
     {
-        self::setupKernel();
+        self::resetKernel();
         self::mockConfig();
     }
 

diff --git a/tests/Unit/Pages/PageModelGetAllFilesHelperTest.php b/tests/Unit/Pages/PageModelGetAllFilesHelperTest.php
diff --git a/tests/Unit/Pages/PageModelGetHelperTest.php b/tests/Unit/Pages/PageModelGetHelperTest.php
diff --git a/tests/Unit/UnixsumTest.php b/tests/Unit/UnixsumTest.php
@@ -63,7 +63,7 @@ public function testMethodReturnsSameValueForStringWithMixedEndOfLineSequences()
 
     public function testMethodReturnsSameValueWhenLoadedFromFileUsingShorthand()
     {
-        self::setupKernel();
+        self::resetKernel();
 
         $string = "foo\nbar\r\nbaz\r\n";