Merge pull request #1491 from Labstep/testing/coverage-improvements

Testing/coverage improvements

Author: XWB

tests/Unit/DataCollector/ElasticaDataCollectorTest.php

@@ -13,14 +13,14 @@
 
 use FOS\ElasticaBundle\DataCollector\ElasticaDataCollector;
 use FOS\ElasticaBundle\Logger\ElasticaLogger;
-use PHPUnit\Framework\TestCase;
+use FOS\ElasticaBundle\Tests\Unit\UnitTestHelper;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 /**
  * @author Richard Miller <[email protected]>
  */
-class ElasticaDataCollectorTest extends TestCase
+class ElasticaDataCollectorTest extends UnitTestHelper
 {
     public function testCorrectAmountOfQueries()
     {
@@ -103,4 +103,17 @@ public function testName()
 
         $this->assertSame('elastica', $elasticaDataCollector->getName());
     }
+
+    public function testReset()
+    {
+        /** @var $loggerMock \PHPUnit_Framework_MockObject_MockObject|ElasticaLogger */
+        $loggerMock = $this->createMock(ElasticaLogger::class);
+        $loggerMock->expects($this->once())
+            ->method('reset')
+            ->willReturn('foo');
+
+        $elasticaDataCollector = new ElasticaDataCollector($loggerMock);
+        $elasticaDataCollector->reset();
+        $this->assertSame([], $this->getProtectedProperty($elasticaDataCollector, 'data'));
+    }
 }

tests/Unit/Event/IndexPopulateEventTest.php

@@ -33,7 +33,19 @@ public function testReset()
         $this->assertTrue($this->event->isReset());
     }
 
-    public function testOption()
+    public function testOptions()
+    {
+        $this->event->setOption('name', 'value');
+        $this->assertEquals(['name' => 'value'], $this->event->getOptions());
+    }
+
+    public function testOptionValid()
+    {
+        $this->event->setOption('name', 'value');
+        $this->assertEquals('value', $this->event->getOption('name'));
+    }
+
+    public function testOptionInvalid()
     {
         $this->expectException(\InvalidArgumentException::class);
         $this->event->getOption('name');

tests/Unit/Event/IndexResetEventTest.php

@@ -23,6 +23,9 @@ public function testForce()
 
         $event = new IndexResetEvent('index', false, false);
         $this->assertFalse($event->isForce());
+
+        $event->setForce(true);
+        $this->assertTrue($event->isForce());
     }
 
     public function testPopulating()