Improve ExplainTest and ExplainFunctionalTest

src/Operation/Explain.php

@@ -80,16 +80,12 @@ class Explain implements Executable
             throw UnsupportedException::explainNotSupported();
         }
 
-        if ($this->explainable instanceOf \MongoDB\Operation\Distinct) {
-            if (! \MongoDB\server_supports_feature($server, self::$wireVersionForDistinct)) {
-                throw UnsupportedException::explainNotSupported();
-            }
+        if ($this->explainable instanceof \MongoDB\Operation\Distinct && ! \MongoDB\server_supports_feature($server, self::$wireVersionForDistinct)) {
+            throw UnsupportedException::explainNotSupported();
         }
 
-        if ($this->explainable instanceOf \MongoDB\Operation\FindAndModify) {
-            if (! \MongoDB\server_supports_feature($server, self::$wireVersionForFindAndModify)) {
-                throw UnsupportedException::explainNotSupported();
-            }
+        if ($this->explainable instanceof \MongoDB\Operation\FindAndModify && ! \MongoDB\server_supports_feature($server, self::$wireVersionForFindAndModify)) {
+            throw UnsupportedException::explainNotSupported();
         }
 
         $cmd = ['explain' => $this->explainable->getCommandDocument()];

tests/Operation/ExplainTest.php

@@ -12,19 +12,9 @@ class ExplainTest extends TestCase
      * @expectedException MongoDB\Exception\InvalidArgumentException
      * @dataProvider provideInvalidConstructorOptions
      */
-    public function testConstructorOptionTypeChecksForCount(array $options)
+    public function testConstructorOptionTypeChecks(array $options)
     {
-        $explainable = new Count($this->getDatabaseName(), $this->getCollectionName(),[]);
-        new Explain($this->getDatabaseName(), $explainable, $options);
-    }
-
-    /**
-     * @expectedException MongoDB\Exception\InvalidArgumentException
-     * @dataProvider provideInvalidConstructorOptions
-     */
-    public function testConstructorOptionTypeChecksForDistinct(array $options)
-    {
-        $explainable = new Distinct($this->getDatabaseName(), $this->getCollectionName(), 'x', []);
+        $explainable = $this->createMock('MongoDB\Operation\Explainable');
         new Explain($this->getDatabaseName(), $explainable, $options);
     }