Merge branch 'master' into add_options

8p · Oct 31, 2017 · 9485db1 · 9485db1
2 parents cabb52c + 07e9693
commit 9485db1
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 5 deletions.
diff --git a/src/DataCollector/HttpDataCollector.php b/src/DataCollector/HttpDataCollector.php
@@ -31,10 +31,8 @@ class HttpDataCollector extends DataCollector
     public function __construct(LoggerInterface $logger)
     {
         $this->logger = $logger;
-        $this->data = [
-            'logs' => [],
-            'callCount' => 0,
-        ];
+
+        $this->reset();
     }
 
     /**
@@ -67,6 +65,17 @@ public function getName() : string
         return 'eight_points_guzzle';
     }
 
+    /**
+     * Resets this data collector to its initial state.
+     */
+    public function reset()
+    {
+        $this->data = [
+            'logs' => [],
+            'callCount' => 0,
+        ];
+    }
+
     /**
      * Returning log entries
      *

diff --git a/tests/DataCollector/HttpDataCollectorTest.php b/tests/DataCollector/HttpDataCollectorTest.php
@@ -16,7 +16,7 @@
 class HttpDataCollectorTest extends TestCase
 {
     /**
-     * @var Logger
+     * @var Logger|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $logger;
 
@@ -184,6 +184,43 @@ public function testCallCount()
         $this->assertSame(2, $collector->getCallCount());
     }
 
+    /**
+     * Test reset method
+     *
+     * @covers \EightPoints\Bundle\GuzzleBundle\DataCollector\HttpDataCollector::reset
+     */
+    public function testReset()
+    {
+        $this->logger->expects($this->once())
+            ->method('getMessages')
+            ->willReturn(['test message #1', 'test message #2']);
+
+        $collector = new HttpDataCollector($this->logger);
+
+        $response = $this->getMockBuilder(Response::class)
+            ->getMock();
+
+        $request = $this->getMockBuilder(Request::class)
+            ->getMock();
+
+        $request->expects($this->once())
+            ->method('getUri')
+            ->willReturn('someRandomUrlId');
+
+        $request->expects($this->once())
+            ->method('getPathInfo')
+            ->willReturn('id');
+
+        $collector->collect($request, $response);
+
+        $this->assertSame(2, $collector->getCallCount());
+
+        $collector->reset();
+
+        $this->assertSame(0, $collector->getCallCount());
+        $this->assertCount(0, $collector->getLogs());
+    }
+
     /**
      * Test Error Count
      *