Create collection before change stream tests

tests/DocumentationExamplesTest.php

@@ -930,6 +930,7 @@ class DocumentationExamplesTest extends FunctionalTestCase
 
         $db = new Database($this->manager, $this->getDatabaseName());
         $db->dropCollection('inventory');
+        $db->createCollection('inventory');
 
         // Start Changestream Example 1
         $changeStream = $db->inventory->watch();

tests/Operation/WatchFunctionalTest.php

@@ -29,19 +29,18 @@ class WatchFunctionalTest extends FunctionalTestCase
         parent::setUp();
 
         $this->skipIfChangeStreamIsNotSupported();
+        $this->createCollection();
     }
 
     public function testNextResumesAfterCursorNotFound()
     {
-        $this->insertDocument(['_id' => 1, 'x' => 'foo']);
-
         $operation = new Watch($this->manager, $this->getDatabaseName(), $this->getCollectionName(), [], $this->defaultOptions);
         $changeStream = $operation->execute($this->getPrimaryServer());
 
         $changeStream->rewind();
         $this->assertFalse($changeStream->valid());
 
-        $this->insertDocument(['_id' => 2, 'x' => 'bar']);
+        $this->insertDocument(['_id' => 1, 'x' => 'foo']);
 
         $changeStream->next();
         $this->assertTrue($changeStream->valid());
@@ -49,16 +48,16 @@ class WatchFunctionalTest extends FunctionalTestCase
         $expectedResult = [
             '_id' => $changeStream->current()->_id,
             'operationType' => 'insert',
-            'fullDocument' => ['_id' => 2, 'x' => 'bar'],
+            'fullDocument' => ['_id' => 1, 'x' => 'foo'],
             'ns' => ['db' => $this->getDatabaseName(), 'coll' => $this->getCollectionName()],
-            'documentKey' => ['_id' => 2],
+            'documentKey' => ['_id' => 1],
         ];
 
         $this->assertMatchesDocument($expectedResult, $changeStream->current());
 
         $this->killChangeStreamCursor($changeStream);
 
-        $this->insertDocument(['_id' => 3, 'x' => 'baz']);
+        $this->insertDocument(['_id' => 2, 'x' => 'bar']);
 
         $changeStream->next();
         $this->assertTrue($changeStream->valid());
@@ -66,9 +65,9 @@ class WatchFunctionalTest extends FunctionalTestCase
         $expectedResult = [
             '_id' => $changeStream->current()->_id,
             'operationType' => 'insert',
-            'fullDocument' => ['_id' => 3, 'x' => 'baz'],
+            'fullDocument' => ['_id' => 2, 'x' => 'bar'],
             'ns' => ['db' => $this->getDatabaseName(), 'coll' => $this->getCollectionName()],
-            'documentKey' => ['_id' => 3]
+            'documentKey' => ['_id' => 2]
         ];
 
         $this->assertMatchesDocument($expectedResult, $changeStream->current());
@@ -335,15 +334,13 @@ class WatchFunctionalTest extends FunctionalTestCase
 
     public function testNoChangeAfterResumeBeforeInsert()
     {
-        $this->insertDocument(['_id' => 1, 'x' => 'foo']);
-
         $operation = new Watch($this->manager, $this->getDatabaseName(), $this->getCollectionName(), [], $this->defaultOptions);
         $changeStream = $operation->execute($this->getPrimaryServer());
 
         $this->assertNoCommandExecuted(function() use ($changeStream) { $changeStream->rewind(); });
         $this->assertFalse($changeStream->valid());
 
-        $this->insertDocument(['_id' => 2, 'x' => 'bar']);
+        $this->insertDocument(['_id' => 1, 'x' => 'foo']);
 
         $changeStream->next();
         $this->assertTrue($changeStream->valid());
@@ -351,9 +348,9 @@ class WatchFunctionalTest extends FunctionalTestCase
         $expectedResult = [
             '_id' => $changeStream->current()->_id,
             'operationType' => 'insert',
-            'fullDocument' => ['_id' => 2, 'x' => 'bar'],
+            'fullDocument' => ['_id' => 1, 'x' => 'foo'],
             'ns' => ['db' => $this->getDatabaseName(), 'coll' => $this->getCollectionName()],
-            'documentKey' => ['_id' => 2],
+            'documentKey' => ['_id' => 1],
         ];
 
         $this->assertMatchesDocument($expectedResult, $changeStream->current());
@@ -363,7 +360,7 @@ class WatchFunctionalTest extends FunctionalTestCase
         $changeStream->next();
         $this->assertFalse($changeStream->valid());
 
-        $this->insertDocument(['_id' => 3, 'x' => 'baz']);
+        $this->insertDocument(['_id' => 2, 'x' => 'bar']);
 
         $changeStream->next();
         $this->assertTrue($changeStream->valid());
@@ -371,9 +368,9 @@ class WatchFunctionalTest extends FunctionalTestCase
         $expectedResult = [
             '_id' => $changeStream->current()->_id,
             'operationType' => 'insert',
-            'fullDocument' => ['_id' => 3, 'x' => 'baz'],
+            'fullDocument' => ['_id' => 2, 'x' => 'bar'],
             'ns' => ['db' => $this->getDatabaseName(), 'coll' => $this->getCollectionName()],
-            'documentKey' => ['_id' => 3],
+            'documentKey' => ['_id' => 2],
         ];
 
         $this->assertMatchesDocument($expectedResult, $changeStream->current());
@@ -381,9 +378,6 @@ class WatchFunctionalTest extends FunctionalTestCase
 
     public function testResumeMultipleTimesInSuccession()
     {
-        $operation = new CreateCollection($this->getDatabaseName(), $this->getCollectionName());
-        $operation->execute($this->getPrimaryServer());
-
         $operation = new Watch($this->manager, $this->getDatabaseName(), $this->getCollectionName(), [], $this->defaultOptions);
         $changeStream = $operation->execute($this->getPrimaryServer());
 
@@ -966,9 +960,6 @@ class WatchFunctionalTest extends FunctionalTestCase
 
     public function testSessionFreed()
     {
-        // Create collection so we can drop it later
-        $this->createCollection();
-
         $operation = new Watch($this->manager, $this->getDatabaseName(), $this->getCollectionName(), [], $this->defaultOptions);
         $changeStream = $operation->execute($this->getPrimaryServer());