Fixed all tests

Asisyas · Asisyas · commit d9a6721a2acb · 2023-01-14T16:35:29.000+04:00
diff --git a/src/Business/Logger/Formatter/Format/AbstractFormat.php b/src/Business/Logger/Formatter/Format/AbstractFormat.php
@@ -19,6 +19,8 @@
 
 /**
  * @author Stanislau Komar <kost@micro-php.net>
+ *
+ * @codeCoverageIgnore
  */
 abstract class AbstractFormat implements LogFormatterInterface
 {
diff --git a/src/HttpLoggerPlugin.php b/src/HttpLoggerPlugin.php
@@ -31,6 +31,8 @@
  * @author Stanislau Komar <kost@micro-php.net>
  *
  * @method HttpLoggerPluginConfigurationInterface configuration()
+ *
+ * @codeCoverageIgnore
  */
 class HttpLoggerPlugin implements DependencyProviderInterface, PluginDependedInterface, ConfigurableInterface
 {
diff --git a/tests/Unit/Business/Executor/HttpExecutorLoggerAwareDecoratorFactoryTest.php b/tests/Unit/Business/Executor/HttpExecutorLoggerAwareDecoratorFactoryTest.php
@@ -9,8 +9,10 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Executor;
+namespace Micro\Plugin\Http\Test\Unit\Business\Executor;
 
+use Micro\Plugin\Http\Business\Executor\HttpExecutorLoggerAwareDecoratorFactory;
+use Micro\Plugin\Http\Business\Executor\RouteExecutorInterface;
 use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatterFactoryInterface;
 use Micro\Plugin\Http\Facade\HttpFacadeInterface;
 use Micro\Plugin\Http\HttpLoggerPluginConfigurationInterface;
diff --git a/tests/Unit/Business/Executor/HttpExecutorLoggerAwareDecoratorTest.php b/tests/Unit/Business/Executor/HttpExecutorLoggerAwareDecoratorTest.php
@@ -9,8 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Executor;
+namespace Micro\Plugin\Http\Test\Unit\Business\Executor;
 
+use Micro\Plugin\Http\Business\Executor\HttpExecutorLoggerAwareDecorator;
 use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatterInterface;
 use Micro\Plugin\Http\Exception\HttpException;
 use Micro\Plugin\Http\Facade\HttpFacadeInterface;
diff --git a/tests/Unit/Business/Logger/Formatter/Format/AbstractFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/AbstractFormatTest.php
@@ -11,7 +11,7 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
 
 use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatterInterface;
 use Micro\Plugin\Http\Exception\HttpException;
@@ -31,7 +31,8 @@ public function testFormat(bool $hasResponse, \Throwable|null $throwable)
     {
         $object = $this->createTestObject();
 
-        $this->assertIsString(
+        $this->assertResult(
+            $object,
             $object->format(
                 $this->createRequest(),
                 $this->createResponse($hasResponse),
@@ -52,6 +53,14 @@ public function dataProvider()
         ];
     }
 
+    protected function assertResult(mixed $object, mixed $result)
+    {
+        $this->assertEquals(
+            $this->getVariable(),
+            $result
+        );
+    }
+
     public function createThrowable(\Throwable|null $throwable): \Throwable|null
     {
         return $throwable;
diff --git a/tests/Unit/Business/Logger/Formatter/Format/HttpRefererFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/HttpRefererFormatTest.php
@@ -9,7 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
+
+use Micro\Plugin\Http\Business\Logger\Formatter\Format\HttpRefererFormat;
 
 class HttpRefererFormatTest extends AbstractFormatTest
 {
@@ -22,4 +24,9 @@ public function getVariable(): string
     {
         return 'http_referer';
     }
+
+    public function assertResult(mixed $object, mixed $result)
+    {
+        $this->assertEquals('', $result);
+    }
 }
diff --git a/tests/Unit/Business/Logger/Formatter/Format/IpFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/IpFormatTest.php
@@ -9,8 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
 
+use Micro\Plugin\Http\Business\Logger\Formatter\Format\IpFormat;
 use Micro\Plugin\Http\Exception\HttpException;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -23,7 +24,8 @@ public function testFormat(bool $hasResponse, \Throwable|null $throwable, $hasIp
     {
         $object = $this->createTestObject();
 
-        $this->assertIsString(
+        $this->assertEquals(
+            '127.0.0.1',
             $object->format(
                 $this->createRequest($hasIp),
                 $this->createResponse($hasResponse),
@@ -60,7 +62,9 @@ protected function createRequest(bool $hasIp = null): Request
             return parent::createRequest();
         }
 
-        $request = new Request([], [], [], [], [], ['REMOTE_ADDR' => '0.0.0.0']);
+        return parent::createRequest();
+
+        $request = new Request([], [], [], [], [], []);
 
         return $request;
     }
@@ -72,6 +76,6 @@ protected function getTestClass(): string
 
     public function getVariable(): string
     {
-        return 'remote_ip';
+        return 'remote_addr';
     }
 }
diff --git a/tests/Unit/Business/Logger/Formatter/Format/MethodFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/MethodFormatTest.php
@@ -9,7 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
+
+use Micro\Plugin\Http\Business\Logger\Formatter\Format\MethodFormat;
 
 class MethodFormatTest extends AbstractFormatTest
 {
@@ -22,4 +24,9 @@ public function getVariable(): string
     {
         return 'request_method';
     }
+
+    public function assertResult(mixed $object, mixed $result)
+    {
+        $this->assertEquals('GET', $result);
+    }
 }
diff --git a/tests/Unit/Business/Logger/Formatter/Format/RequestBodyFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/RequestBodyFormatTest.php
@@ -9,8 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
 
+use Micro\Plugin\Http\Business\Logger\Formatter\Format\RequestBodyFormat;
 use Symfony\Component\HttpFoundation\Request;
 
 class RequestBodyFormatTest extends AbstractFormatTest
diff --git a/tests/Unit/Business/Logger/Formatter/Format/RequestFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/RequestFormatTest.php
@@ -9,7 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
+
+use Micro\Plugin\Http\Business\Logger\Formatter\Format\RequestFormat;
 
 class RequestFormatTest extends AbstractFormatTest
 {
@@ -22,4 +24,9 @@ public function getVariable(): string
     {
         return 'request';
     }
+
+    public function assertResult(mixed $object, mixed $result)
+    {
+        $this->assertEquals('/test', $result);
+    }
 }
diff --git a/tests/Unit/Business/Logger/Formatter/Format/StatusFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/StatusFormatTest.php
@@ -9,7 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
+
+use Micro\Plugin\Http\Business\Logger\Formatter\Format\StatusFormat;
 
 class StatusFormatTest extends AbstractFormatTest
 {
@@ -22,4 +24,11 @@ public function getVariable(): string
     {
         return 'status';
     }
+
+    protected function assertResult(mixed $object, mixed $result)
+    {
+        $this->assertTrue(
+            \in_array($result, ['500', 0])
+        );
+    }
 }
diff --git a/tests/Unit/Business/Logger/Formatter/Format/TimeFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/TimeFormatTest.php
@@ -9,7 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
+
+use Micro\Plugin\Http\Business\Logger\Formatter\Format\TimeFormat;
 
 class TimeFormatTest extends AbstractFormatTest
 {
@@ -22,4 +24,11 @@ public function getVariable(): string
     {
         return 'time';
     }
+
+    public function assertResult(mixed $object, mixed $result)
+    {
+        $date = new \DateTime($result);
+
+        $this->assertEquals($result, $date->format('c'));
+    }
 }
diff --git a/tests/Unit/Business/Logger/Formatter/Format/UsernameFormatTest.php b/tests/Unit/Business/Logger/Formatter/Format/UsernameFormatTest.php
@@ -9,7 +9,9 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;
+
+use Micro\Plugin\Http\Business\Logger\Formatter\Format\UsernameFormat;
 
 class UsernameFormatTest extends AbstractFormatTest
 {
@@ -22,4 +24,9 @@ public function getVariable(): string
     {
         return 'remote_user';
     }
+
+    public function assertResult(mixed $object, mixed $result)
+    {
+        $this->assertEquals('', $result);
+    }
 }
diff --git a/tests/Unit/Business/Logger/Formatter/LogFormatterFactoryTest.php b/tests/Unit/Business/Logger/Formatter/LogFormatterFactoryTest.php
@@ -9,8 +9,10 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter;
 
+use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatterFactory;
+use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatterInterface;
 use PHPUnit\Framework\TestCase;
 
 class LogFormatterFactoryTest extends TestCase
diff --git a/tests/Unit/Business/Logger/Formatter/LogFormatterTest.php b/tests/Unit/Business/Logger/Formatter/LogFormatterTest.php
@@ -9,8 +9,10 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Business\Logger\Formatter;
+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter;
 
+use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatter;
+use Micro\Plugin\Http\Business\Logger\Formatter\LogFormatterInterface;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
diff --git a/tests/Unit/Decorator/HttpFacadeLoggerDecoratorTest.php b/tests/Unit/Decorator/HttpFacadeLoggerDecoratorTest.php
@@ -9,11 +9,12 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http\Decorator;
+namespace Micro\Plugin\Http\Test\Unit\Decorator;
 
 use Micro\Plugin\Http\Business\Executor\RouteExecutorFactoryInterface;
 use Micro\Plugin\Http\Business\Route\RouteBuilderInterface;
 use Micro\Plugin\Http\Business\Route\RouteInterface;
+use Micro\Plugin\Http\Decorator\HttpFacadeLoggerDecorator;
 use Micro\Plugin\Http\Facade\HttpFacadeInterface;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/tests/Unit/HttpLoggerPluginConfigurationTest.php b/tests/Unit/HttpLoggerPluginConfigurationTest.php
@@ -9,9 +9,11 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http;
+namespace Micro\Plugin\Http\Test\Unit;
 
 use Micro\Framework\Kernel\Configuration\ApplicationConfigurationInterface;
+use Micro\Plugin\Http\HttpLoggerPluginConfiguration;
+use Micro\Plugin\Http\HttpLoggerPluginConfigurationInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/HttpLoggerPluginTest.php b/tests/Unit/HttpLoggerPluginTest.php
@@ -9,10 +9,12 @@
  *  file that was distributed with this source code.
  */
 
-namespace Micro\Plugin\Http;
+namespace Micro\Plugin\Http\Test\Unit;
 
 use Micro\Component\DependencyInjection\Container;
 use Micro\Framework\Kernel\Plugin\DependencyProviderInterface;
+use Micro\Plugin\Http\HttpCorePlugin;
+use Micro\Plugin\Http\HttpLoggerPlugin;
 use Micro\Plugin\Logger\LoggerPlugin;
 use PHPUnit\Framework\TestCase;
 
diff --git a/tests/Unit/TestHtpLoggerPlugin.php b/tests/Unit/TestHtpLoggerPlugin.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ *  This file is part of the Micro framework package.
+ *
+ *  (c) Stanislau Komar <kost@micro-php.net>
+ *
+ *  For the full copyright and license information, please view the LICENSE
+ *  file that was distributed with this source code.
+ */
+
+namespace Micro\Plugin\Http\Test\Unit;
+
+use Micro\Component\DependencyInjection\Container;
+use Micro\Framework\Kernel\Plugin\DependencyProviderInterface;
+use Micro\Framework\Kernel\Plugin\PluginDependedInterface;
+use Micro\Plugin\Http\HttpCorePlugin;
+use Micro\Plugin\Logger\LoggerPlugin;
+
+/**
+ * @author Stanislau Komar <kost@micro-php.net>
+ */
+class TestHtpLoggerPlugin implements DependencyProviderInterface, PluginDependedInterface
+{
+    public function provideDependencies(Container $container): void
+    {
+        // TODO: Implement provideDependencies() method.
+    }
+
+    public function getDependedPlugins(): iterable
+    {
+        return [
+            HttpCorePlugin::class,
+            LoggerPlugin::class,
+        ];
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@`
`19`	`19`
`20`	`20`	`/**`
`21`	`21`	`* @author Stanislau Komar <kost@micro-php.net>`
	`22`	`+ *`
	`23`	`+ * @codeCoverageIgnore`
`22`	`24`	`*/`
`23`	`25`	`abstract class AbstractFormat implements LogFormatterInterface`
`24`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@`
`31`	`31`	`* @author Stanislau Komar <kost@micro-php.net>`
`32`	`32`	`*`
`33`	`33`	`* @method HttpLoggerPluginConfigurationInterface configuration()`
	`34`	`+ *`
	`35`	`+ * @codeCoverageIgnore`
`34`	`36`	`*/`
`35`	`37`	`class HttpLoggerPlugin implements DependencyProviderInterface, PluginDependedInterface, ConfigurableInterface`
`36`	`38`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,9 @@`
`9`	`9`	`* file that was distributed with this source code.`
`10`	`10`	`*/`
`11`	`11`
`12`		`-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;`
	`12`	`+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;`
	`13`	`+`
	`14`	`+use Micro\Plugin\Http\Business\Logger\Formatter\Format\HttpRefererFormat;`
`13`	`15`
`14`	`16`	`class HttpRefererFormatTest extends AbstractFormatTest`
`15`	`17`	`{`
`@@ -22,4 +24,9 @@ public function getVariable(): string`
`22`	`24`	`{`
`23`	`25`	`return 'http_referer';`
`24`	`26`	`}`
	`27`	`+`
	`28`	`+ public function assertResult(mixed $object, mixed $result)`
	`29`	`+ {`
	`30`	`+ $this->assertEquals('', $result);`
	`31`	`+ }`
`25`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,9 @@`
`9`	`9`	`* file that was distributed with this source code.`
`10`	`10`	`*/`
`11`	`11`
`12`		`-namespace Micro\Plugin\Http\Business\Logger\Formatter\Format;`
	`12`	`+namespace Micro\Plugin\Http\Test\Unit\Business\Logger\Formatter\Format;`
`13`	`13`
	`14`	`+use Micro\Plugin\Http\Business\Logger\Formatter\Format\IpFormat;`
`14`	`15`	`use Micro\Plugin\Http\Exception\HttpException;`
`15`	`16`	`use Symfony\Component\HttpFoundation\Request;`
`16`	`17`
`@@ -23,7 +24,8 @@ public function testFormat(bool $hasResponse, \Throwable\|null $throwable, $hasIp`
`23`	`24`	`{`
`24`	`25`	`$object = $this->createTestObject();`
`25`	`26`
`26`		`- $this->assertIsString(`
	`27`	`+ $this->assertEquals(`
	`28`	`+ '127.0.0.1',`
`27`	`29`	`$object->format(`
`28`	`30`	`$this->createRequest($hasIp),`
`29`	`31`	`$this->createResponse($hasResponse),`
`@@ -60,7 +62,9 @@ protected function createRequest(bool $hasIp = null): Request`
`60`	`62`	`return parent::createRequest();`
`61`	`63`	`}`
`62`	`64`
`63`		`- $request = new Request([], [], [], [], [], ['REMOTE_ADDR' => '0.0.0.0']);`
	`65`	`+ return parent::createRequest();`
	`66`	`+`
	`67`	`+ $request = new Request([], [], [], [], [], []);`
`64`	`68`
`65`	`69`	`return $request;`
`66`	`70`	`}`
`@@ -72,6 +76,6 @@ protected function getTestClass(): string`
`72`	`76`
`73`	`77`	`public function getVariable(): string`
`74`	`78`	`{`
`75`		`- return 'remote_ip';`
	`79`	`+ return 'remote_addr';`
`76`	`80`	`}`
`77`	`81`	`}`