[FEATURE] Update tests

Author: wazum

.gitignore

@@ -6,3 +6,5 @@ Thumbs.db
 /composer.lock
 /public
 /vendor
+/Build/.phpunit.cache
+/Build/.phpunit.result.cache

Build/UnitTests.xml

@@ -1,16 +1,21 @@
-<phpunit backupGlobals="true"
-         backupStaticAttributes="false"
-         bootstrap="../../../vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php"
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+         bootstrap="../vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertWarningsToExceptions="true"
-         forceCoversAnnotation="false"
          processIsolation="false"
-         stopOnError="false"
          stopOnFailure="false"
+         stopOnError="false"
          stopOnIncomplete="false"
          stopOnSkipped="false"
-         verbose="false">
+         backupGlobals="true"
+         displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerNotices="true"
+         cacheDirectory=".phpunit.cache"
+         requireCoverageMetadata="false"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutOutputDuringTests="true">
     <testsuites>
         <testsuite name="EXT:sierrha">
             <directory>../Tests/Unit/</directory>

Tests/Unit/Utility/UrlTest.php

@@ -2,7 +2,10 @@
 
 namespace Plan2net\Sierrha\Tests\Error;
 
+use PHPUnit\Framework\Attributes\Test;
+use PHPUnit\Framework\MockObject\Exception;
 use Plan2net\Sierrha\Utility\Url;
+use TYPO3\CMS\Core\Http\Client\GuzzleClientFactory;
 use TYPO3\CMS\Core\Localization\LanguageService;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -12,28 +15,29 @@
 
 class UrlTest extends UnitTestCase
 {
-
     protected const ERROR_PAGE_CONTROLLER_CONTENT = 'FALLBACK ERROR TEXT';
 
     /**
      * System Under Test
-     *
-     * @var Url
      */
-    protected $sut;
+    protected Url $sut;
 
-    /** @var LanguageService */
-    protected $languageServiceStub;
+    protected LanguageService $languageServiceStub;
 
+    /**
+     * @throws Exception
+     */
     protected function setUp(): void
     {
         $this->sut = new Url();
 
         $this->languageServiceStub = $this->createMock(LanguageService::class);
         $this->languageServiceStub->method('sL')->willReturn('lorem ipsum');
+
+        parent::setUp();
     }
 
-    protected function setupErrorPageControllerStub()
+    protected function setupErrorPageControllerStub(): void
     {
         $errorPageControllerStub = $this->getMockBuilder(ErrorPageController::class)
             ->disableOriginalConstructor()
@@ -43,12 +47,28 @@ protected function setupErrorPageControllerStub()
         GeneralUtility::addInstance(ErrorPageController::class, $errorPageControllerStub);
     }
 
-    protected function setupRequestFactoryStub($response)
+    protected function setupRequestFactoryStub($response): void
     {
+        // Create a stub for GuzzleClientFactory
+        $guzzleClientStub = $this->getMockBuilder(\GuzzleHttp\Client::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $guzzleClientStub->method('request')
+            ->willReturn($response);
+
+        $guzzleFactoryStub = $this->getMockBuilder(GuzzleClientFactory::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $guzzleFactoryStub->method('getClient')
+            ->willReturn($guzzleClientStub);
+
+        // Now create the RequestFactory stub with the required dependency
         $requestFactoryStub = $this->getMockBuilder(RequestFactory::class)
+            ->setConstructorArgs([$guzzleFactoryStub])
             ->getMock();
         $requestFactoryStub->method('request')
             ->willReturn($response);
+
         GeneralUtility::addInstance(RequestFactory::class, $requestFactoryStub);
     }
 
@@ -61,37 +81,33 @@ protected function buildResponseBody(string $body)
         return $stream;
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function httpErrorOnFetchingUrlIsDetected()
     {
         $this->setupErrorPageControllerStub();
 
+        // Anything but 200
         $this->setupRequestFactoryStub(
             new Response($this->buildResponseBody('SERVER ERROR TEXT'), 500)
-        ); // anything but 200
+        );
 
         $result = $this->sut->fetchWithFallback('http://foo.bar/', $this->languageServiceStub, '');
         $this->assertEquals(self::ERROR_PAGE_CONTROLLER_CONTENT, $result);
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function emptyContentOfFetchedUrlIsDetected()
     {
         $this->setupErrorPageControllerStub();
 
-        $this->setupRequestFactoryStub(new Response()); // will return an empty string
+        // Will return an empty string
+        $this->setupRequestFactoryStub(new Response());
 
         $result = $this->sut->fetchWithFallback('http://foo.bar/', $this->languageServiceStub, '');
         $this->assertEquals(self::ERROR_PAGE_CONTROLLER_CONTENT, $result);
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function unusableContentOfFetchedUrlIsDetected()
     {
         $this->setupErrorPageControllerStub();
@@ -102,9 +118,7 @@ public function unusableContentOfFetchedUrlIsDetected()
         $this->assertEquals(self::ERROR_PAGE_CONTROLLER_CONTENT, $result);
     }
 
-    /**
-     * @test
-     */
+    #[Test]
     public function usableContentOfFetchedUrlIsReturned()
     {
         $errorPageContent = 'CUSTOM ERROR PAGE TEXT';

composer.json

@@ -60,5 +60,10 @@
       "typo3/class-alias-loader": true,
       "typo3/cms-composer-installers": true
     }
+  },
+  "scripts": {
+    "test": [
+      "./vendor/bin/phpunit --config Build/UnitTests.xml"
+    ]
   }
 }