Refactor killing of change stream cursor to private method

Author: jmikola

tests/Operation/WatchFunctionalTest.php

@@ -2,6 +2,7 @@
 
 namespace MongoDB\Tests\Operation;
 
+use MongoDB\ChangeStream;
 use MongoDB\Client;
 use MongoDB\Driver\Manager;
 use MongoDB\Driver\ReadPreference;
@@ -52,8 +53,7 @@ public function testResume()
 
         $this->assertSameDocument($expectedResult, $changeStream->current());
 
-        $operation = new DatabaseCommand($this->getDatabaseName(), ["killCursors" => $this->getCollectionName(), "cursors" => [$changeStream->getCursorId()]]);
-        $operation->execute($this->getPrimaryServer());
+        $this->killChangeStreamCursor($changeStream);
 
         $this->insertDocument(['_id' => 3, 'x' => 'baz']);
 
@@ -150,8 +150,7 @@ public function testNoChangeAfterResumeBeforeInsert()
 
         $this->assertSameDocument($expectedResult, $changeStream->current());
 
-        $operation = new DatabaseCommand($this->getDatabaseName(), ["killCursors" => $this->getCollectionName(), "cursors" => [$changeStream->getCursorId()]]);
-        $operation->execute($this->getPrimaryServer());
+        $this->killChangeStreamCursor($changeStream);
 
         $changeStream->next();
         $this->assertNull($changeStream->current());
@@ -176,8 +175,7 @@ public function testResumeAfterKillThenNoOperations()
         $operation = new Watch($this->manager, $this->getDatabaseName(), $this->getCollectionName(), []);
         $changeStream = $operation->execute($this->getPrimaryServer());
 
-        $operation = new DatabaseCommand($this->getDatabaseName(), ["killCursors" => $this->getCollectionName(), "cursors" => [$changeStream->getCursorId()]]);
-        $operation->execute($this->getPrimaryServer());
+        $this->killChangeStreamCursor($changeStream);
 
         $changeStream->next();
         $this->assertNull($changeStream->current());
@@ -188,8 +186,7 @@ public function testResumeAfterKillThenOperation()
         $operation = new Watch($this->manager, $this->getDatabaseName(), $this->getCollectionName(), []);
         $changeStream = $operation->execute($this->getPrimaryServer());
 
-        $operation = new DatabaseCommand($this->getDatabaseName(), ["killCursors" => $this->getCollectionName(), "cursors" => [$changeStream->getCursorId()]]);
-        $operation->execute($this->getPrimaryServer());
+        $this->killChangeStreamCursor($changeStream);
 
         $this->insertDocument(['_id' => 1, 'x' => 'foo']);
 
@@ -214,8 +211,7 @@ public function testKey()
         $changeStream->next();
         $this->assertNull($changeStream->key());
 
-        $operation = new DatabaseCommand($this->getDatabaseName(), ["killCursors" => $this->getCollectionName(), "cursors" => [$changeStream->getCursorId()]]);
-        $operation->execute($this->getPrimaryServer());
+        $this->killChangeStreamCursor($changeStream);
 
         $changeStream->next();
         $this->assertNull($changeStream->key());
@@ -318,4 +314,15 @@ private function insertDocument($document)
         $writeResult = $insertOne->execute($this->getPrimaryServer());
         $this->assertEquals(1, $writeResult->getInsertedCount());
     }
+
+    private function killChangeStreamCursor(ChangeStream $changeStream)
+    {
+        $command = [
+            'killCursors' => $this->getCollectionName(),
+            'cursors' => [ $changeStream->getCursorId() ],
+        ];
+
+        $operation = new DatabaseCommand($this->getDatabaseName(), $command);
+        $operation->execute($this->getPrimaryServer());
+    }
 }