Revert assertDocumentsMatch

Author: GromNaN

tests/FunctionalTestCase.php

@@ -16,7 +16,6 @@
 use MongoDB\Operation\CreateCollection;
 use MongoDB\Operation\DatabaseCommand;
 use MongoDB\Operation\ListCollections;
-use MongoDB\Tests\SpecTests\DocumentsMatchConstraint;
 use stdClass;
 use UnexpectedValueException;
 
@@ -205,21 +204,6 @@ protected function assertSameObjectId($expectedObjectId, $actualObjectId): void
         $this->assertEquals((string) $expectedObjectId, (string) $actualObjectId);
     }
 
-    /**
-     * Asserts that two given documents match.
-     *
-     * Extra keys in the actual value's document(s) will be ignored.
-     *
-     * @param array|object $expectedDocument
-     * @param array|object $actualDocument
-     */
-    public static function assertDocumentsMatch($expectedDocument, $actualDocument, string $message = ''): void
-    {
-        $constraint = new DocumentsMatchConstraint($expectedDocument, true, true);
-
-        static::assertThat($actualDocument, $constraint, $message);
-    }
-
     /**
      * Configure a fail point for the test.
      *

tests/SpecTests/FunctionalTestCase.php

@@ -81,6 +81,21 @@ public static function assertCommandReplyMatches(stdClass $expected, stdClass $a
         throw new LogicException(sprintf('%s does not assert CommandSucceededEvents', static::class));
     }
 
+    /**
+     * Asserts that two given documents match.
+     *
+     * Extra keys in the actual value's document(s) will be ignored.
+     *
+     * @param array|object $expectedDocument
+     * @param array|object $actualDocument
+     */
+    public static function assertDocumentsMatch($expectedDocument, $actualDocument, string $message = ''): void
+    {
+        $constraint = new DocumentsMatchConstraint($expectedDocument, true, true);
+
+        static::assertThat($actualDocument, $constraint, $message);
+    }
+
     /**
      * Assert omitted top-level fields in command documents.
      *

tests/SpecTests/SearchIndexSpecTest.php

@@ -58,7 +58,7 @@ public function testCreateAndListSearchIndexes(): void
 
         $this->assertCount(1, $indexes);
         $this->assertSame($name, $indexes[0]->name);
-        $this->assertDocumentsMatch($mapping, $indexes[0]->latestDefinition);
+        $this->assertSameDocument($mapping, $indexes[0]->latestDefinition);
     }
 
     /**
@@ -84,7 +84,7 @@ public function testCreateMultipleIndexesInBatch(): void
         foreach ($names as $key => $name) {
             $index = $indexes[$key];
             $this->assertSame($name, $index->name);
-            $this->assertDocumentsMatch($mapping, $index->latestDefinition);
+            $this->assertSameDocument($mapping, $index->latestDefinition);
         }
     }
 
@@ -141,7 +141,7 @@ public function testUpdateSearchIndex(): void
 
         $this->assertCount(1, $indexes);
         $this->assertSame($name, $indexes[0]->name);
-        $this->assertDocumentsMatch($mapping, $indexes[0]->latestDefinition);
+        $this->assertSameDocument($mapping, $indexes[0]->latestDefinition);
     }
 
     /**