adjust tests to not mock

Author: dbu

src/Collector/Formatter.php

@@ -4,7 +4,6 @@
 
 namespace Http\HttplugBundle\Collector;
 
-use Exception;
 use Http\Client\Exception\HttpException;
 use Http\Client\Exception\TransferException;
 use Http\Message\Formatter as MessageFormatter;

tests/Unit/Collector/ProfileClientTest.php

@@ -13,7 +13,6 @@
 use Http\HttplugBundle\Collector\ProfileClient;
 use Http\HttplugBundle\Collector\Stack;
 use Http\Message\Formatter as MessageFormatter;
-use Http\Message\Formatter\SimpleFormatter;
 use Http\Promise\FulfilledPromise;
 use Http\Promise\Promise;
 use Http\Promise\RejectedPromise;
@@ -45,26 +44,27 @@ class ProfileClientTest extends TestCase
 
     public function setUp(): void
     {
-        $messageFormatter = $this->createMock(SimpleFormatter::class);
+        $messageFormatter = $this->createMock(MessageFormatter::class);
         $formatter = new Formatter($messageFormatter, $this->createMock(MessageFormatter::class));
         $this->collector = new Collector();
         $stopwatch = $this->createMock(Stopwatch::class);
 
-        $activeStack = new Stack('default', 'FormattedRequest');
-        $this->collector->activateStack($activeStack);
+        $this->activeStack = new Stack('default', 'FormattedRequest');
+        $this->collector->activateStack($this->activeStack);
+
         $this->client = $this->getMockBuilder(CombinedClientInterface::class)->getMock();
         $uri = new Uri('https://example.com/target');
         $this->request = new Request('GET', $uri);
         $this->stopwatchEvent = $this->createMock(StopwatchEvent::class);
         $this->subject = new ProfileClient($this->client, $this->collector, $formatter, $stopwatch);
         $this->response = new Response();
-        $exception = new \Exception('test');
+        $this->exception = new \Exception();
         $this->fulfilledPromise = new FulfilledPromise($this->response);
-        $this->rejectedPromise = new RejectedPromise($exception);
+        $this->rejectedPromise = new RejectedPromise($this->exception);
 
         $messageFormatter
-            ->method('formatResponseForRequest')
-            ->with($this->response, $this->request)
+            ->method('formatResponse')
+            ->with($this->response)
             ->willReturn('FormattedResponse')
         ;
 
@@ -168,10 +168,8 @@ public function testOnRejected(): void
 
         $this->subject->sendAsyncRequest($this->request);
 
-        $activeStack = $this->collector->getActiveStack();
-        $this->assertInstanceOf(Stack::class, $activeStack);
-        $this->assertEquals(42, $activeStack->getDuration());
-        $this->assertEquals('Unexpected exception of type "Exception": test', $activeStack->getClientException());
+        $this->assertEquals(42, $this->activeStack->getDuration());
+        $this->assertEquals('FormattedResponse', $this->activeStack->getClientException());
     }
 }
 

tests/Unit/Collector/ProfilePluginTest.php

@@ -13,17 +13,17 @@
 use Http\HttplugBundle\Collector\ProfilePlugin;
 use Http\HttplugBundle\Collector\Stack;
 use Http\Message\Formatter as MessageFormatter;
-use Http\Message\Formatter\SimpleFormatter;
 use Http\Promise\FulfilledPromise;
 use Http\Promise\Promise;
 use Http\Promise\RejectedPromise;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
 class ProfilePluginTest extends TestCase
 {
-    private Plugin $plugin;
+    private Plugin&MockObject $plugin;
 
     private RequestInterface $request;
 
@@ -42,15 +42,15 @@ class ProfilePluginTest extends TestCase
     public function setUp(): void
     {
         $this->collector = new Collector();
-        $messageFormatter = $this->createMock(SimpleFormatter::class);
-        $formatter = new Formatter($messageFormatter, $this->createMock(MessageFormatter::class));
+        $messageFormatter = $this->createMock(MessageFormatter::class);
+        $this->formatter = new Formatter($messageFormatter, $this->createMock(MessageFormatter::class));
 
-        $this->plugin = $this->createMock(Plugin::class);
+        $this->plugin = $this->getMockBuilder(Plugin::class)->getMock();
         $this->request = new Request('GET', '/');
         $this->response = new Response();
         $this->fulfilledPromise = new FulfilledPromise($this->response);
-        $currentStack = new Stack('default', 'FormattedRequest');
-        $this->collector->activateStack($currentStack);
+        $this->currentStack = new Stack('default', 'FormattedRequest');
+        $this->collector->activateStack($this->currentStack);
         $this->exception = new TransferException();
         $this->rejectedPromise = new RejectedPromise($this->exception);
 
@@ -74,7 +74,7 @@ public function setUp(): void
         $this->subject = new ProfilePlugin(
             $this->plugin,
             $this->collector,
-            $formatter
+            $this->formatter
         );
     }
 
@@ -130,10 +130,9 @@ public function testOnRejected(): void
         $promise = $this->subject->handleRequest($this->request, fn () => $this->rejectedPromise, function (): void {
         });
 
-        $activeStack = $this->collector->getActiveStack();
-        $this->assertCount(1, $activeStack->getProfiles());
-
+        $this->assertEquals($this->exception, $promise->wait());
+        $profile = $this->currentStack->getProfiles()[0];
         $this->expectException(TransferException::class);
-        $promise->wait();
+        $profile->getResponse();
     }
 }

tests/Unit/Collector/StackPluginTest.php

@@ -11,7 +11,6 @@
 use Http\HttplugBundle\Collector\Formatter;
 use Http\HttplugBundle\Collector\StackPlugin;
 use Http\Message\Formatter as MessageFormatter;
-use Http\Message\Formatter\SimpleFormatter;
 use Http\Promise\FulfilledPromise;
 use Http\Promise\RejectedPromise;
 use PHPUnit\Framework\Error\Warning;
@@ -49,8 +48,8 @@ class StackPluginTest extends TestCase
     public function setUp(): void
     {
         $this->collector = new Collector();
-        $messageFormatter = $this->createMock(SimpleFormatter::class);
-        $formatter = new Formatter($messageFormatter, $this->createMock(MessageFormatter::class));
+        $messageFormatter = $this->createMock(MessageFormatter::class);
+        $this->formatter = new Formatter($messageFormatter, $this->createMock(MessageFormatter::class));
         $this->request = new Request('GET', '/');
         $this->response = new Response();
         $this->exception = new HttpException('', $this->request, $this->response);
@@ -67,7 +66,7 @@ public function setUp(): void
             ->willReturn('FormattedResponse')
         ;
 
-        $this->subject = new StackPlugin($this->collector, $formatter, 'default');
+        $this->subject = new StackPlugin($this->collector, $this->formatter, 'default');
     }
 
     public function testStackIsInitialized(): void
@@ -77,11 +76,9 @@ public function testStackIsInitialized(): void
         $this->subject->handleRequest($this->request, $next, function (): void {
         });
 
-        $this->assertNull($this->collector->getActiveStack());
-        $stacks = $this->collector->getStacks();
-        $this->assertCount(1, $stacks);
-        $this->assertEquals('default', $stacks[0]->getClient());
-        $this->assertEquals('FormattedRequest', $stacks[0]->getRequest());
+        $stack = $this->collector->getActiveStack();
+        $this->assertEquals('default', $stack->getClient());
+        $this->assertEquals('FormattedRequest', $stack->getRequest());
     }
 
     public function testOnFulfilled(): void
@@ -92,10 +89,8 @@ public function testOnFulfilled(): void
         });
 
         $this->assertEquals($this->response, $promise->wait());
-        $this->assertNull($this->collector->getActiveStack());
-        $stacks = $this->collector->getStacks();
-        $this->assertCount(1, $stacks);
-        $this->assertEquals('FormattedResponse', $stacks[0]->getResponse());
+        $currentStack = $this->collector->getActiveStack();
+        $this->assertEquals('FormattedResponse', $currentStack->getResponse());
     }
 
     public function testOnRejected(): void
@@ -105,14 +100,10 @@ public function testOnRejected(): void
         $promise = $this->subject->handleRequest($this->request, $next, function (): void {
         });
 
-        $this->assertNull($this->collector->getActiveStack());
-        $stacks = $this->collector->getStacks();
-        $this->assertCount(1, $stacks);
-        $this->assertEquals('FormattedResponse', $stacks[0]->getResponse());
-        $this->assertTrue($stacks[0]->isFailed());
-
-        $this->expectException(\Exception::class);
-        $promise->wait();
+        $this->assertEquals($this->exception, $promise->wait());
+        $currentStack = $this->collector->getActiveStack();
+        $this->assertEquals('FormattedResponse', $currentStack->getResponse());
+        $this->assertTrue($currentStack->isFailed());
     }
 
     public function testOnException(): void