Commit e8eb6283 authored by Jeremy Mikola's avatar Jeremy Mikola

MongoDB\Manager no longer has single write methods

See: PHPC-465, HHVM-129
parent a033aca8
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
namespace MongoDB\Tests; namespace MongoDB\Tests;
use MongoDB\Client; use MongoDB\Client;
use MongoDB\Driver\BulkWrite;
use MongoDB\Driver\Command; use MongoDB\Driver\Command;
use MongoDB\Model\DatabaseInfo; use MongoDB\Model\DatabaseInfo;
...@@ -23,7 +24,10 @@ class ClientFunctionalTest extends FunctionalTestCase ...@@ -23,7 +24,10 @@ class ClientFunctionalTest extends FunctionalTestCase
public function testDropDatabase() public function testDropDatabase()
{ {
$writeResult = $this->manager->executeInsert($this->getNamespace(), array('x' => 1)); $bulkWrite = new BulkWrite();
$bulkWrite->insert(['x' => 1]);
$writeResult = $this->manager->executeBulkWrite($this->getNamespace(), $bulkWrite);
$this->assertEquals(1, $writeResult->getInsertedCount()); $this->assertEquals(1, $writeResult->getInsertedCount());
$commandResult = $this->client->dropDatabase($this->getDatabaseName()); $commandResult = $this->client->dropDatabase($this->getDatabaseName());
...@@ -33,7 +37,10 @@ class ClientFunctionalTest extends FunctionalTestCase ...@@ -33,7 +37,10 @@ class ClientFunctionalTest extends FunctionalTestCase
public function testListDatabases() public function testListDatabases()
{ {
$writeResult = $this->manager->executeInsert($this->getNamespace(), array('x' => 1)); $bulkWrite = new BulkWrite();
$bulkWrite->insert(['x' => 1]);
$writeResult = $this->manager->executeBulkWrite($this->getNamespace(), $bulkWrite);
$this->assertEquals(1, $writeResult->getInsertedCount()); $this->assertEquals(1, $writeResult->getInsertedCount());
$databases = $this->client->listDatabases(); $databases = $this->client->listDatabases();
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
namespace MongoDB\Tests\Database; namespace MongoDB\Tests\Database;
use MongoDB\Driver\BulkWrite;
use MongoDB\Model\CollectionInfo; use MongoDB\Model\CollectionInfo;
use InvalidArgumentException; use InvalidArgumentException;
...@@ -39,7 +40,10 @@ class CollectionManagementFunctionalTest extends FunctionalTestCase ...@@ -39,7 +40,10 @@ class CollectionManagementFunctionalTest extends FunctionalTestCase
public function testDropCollection() public function testDropCollection()
{ {
$writeResult = $this->manager->executeInsert($this->getNamespace(), array('x' => 1)); $bulkWrite = new BulkWrite();
$bulkWrite->insert(['x' => 1]);
$writeResult = $this->manager->executeBulkWrite($this->getNamespace(), $bulkWrite);
$this->assertEquals(1, $writeResult->getInsertedCount()); $this->assertEquals(1, $writeResult->getInsertedCount());
$commandResult = $this->database->dropCollection($this->getCollectionName()); $commandResult = $this->database->dropCollection($this->getCollectionName());
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
namespace MongoDB\Tests\Database; namespace MongoDB\Tests\Database;
use MongoDB\Database; use MongoDB\Database;
use MongoDB\Driver\BulkWrite;
/** /**
* Functional tests for the Database class. * Functional tests for the Database class.
...@@ -39,7 +40,10 @@ class DatabaseFunctionalTest extends FunctionalTestCase ...@@ -39,7 +40,10 @@ class DatabaseFunctionalTest extends FunctionalTestCase
public function testDrop() public function testDrop()
{ {
$writeResult = $this->manager->executeInsert($this->getNamespace(), array('x' => 1)); $bulkWrite = new BulkWrite();
$bulkWrite->insert(['x' => 1]);
$writeResult = $this->manager->executeBulkWrite($this->getNamespace(), $bulkWrite);
$this->assertEquals(1, $writeResult->getInsertedCount()); $this->assertEquals(1, $writeResult->getInsertedCount());
$commandResult = $this->database->drop(); $commandResult = $this->database->drop();
......
...@@ -4,16 +4,19 @@ namespace MongoDB\Tests\Operation; ...@@ -4,16 +4,19 @@ namespace MongoDB\Tests\Operation;
use MongoDB\Driver\Server; use MongoDB\Driver\Server;
use MongoDB\Operation\DropCollection; use MongoDB\Operation\DropCollection;
use MongoDB\Operation\InsertOne;
use MongoDB\Operation\ListCollections; use MongoDB\Operation\ListCollections;
class DropCollectionFunctionalTest extends FunctionalTestCase class DropCollectionFunctionalTest extends FunctionalTestCase
{ {
public function testDropExistingCollection() public function testDropExistingCollection()
{ {
$writeResult = $this->manager->executeInsert($this->getNamespace(), array('x' => 1)); $server = $this->getPrimaryServer();
$insertOne = new InsertOne($this->getDatabaseName(), $this->getCollectionName(), ['x' => 1]);
$writeResult = $insertOne->execute($server);
$this->assertEquals(1, $writeResult->getInsertedCount()); $this->assertEquals(1, $writeResult->getInsertedCount());
$server = $this->getPrimaryServer();
$operation = new DropCollection($this->getDatabaseName(), $this->getCollectionName()); $operation = new DropCollection($this->getDatabaseName(), $this->getCollectionName());
$operation->execute($server); $operation->execute($server);
......
...@@ -4,16 +4,19 @@ namespace MongoDB\Tests\Operation; ...@@ -4,16 +4,19 @@ namespace MongoDB\Tests\Operation;
use MongoDB\Driver\Server; use MongoDB\Driver\Server;
use MongoDB\Operation\DropDatabase; use MongoDB\Operation\DropDatabase;
use MongoDB\Operation\InsertOne;
use MongoDB\Operation\ListDatabases; use MongoDB\Operation\ListDatabases;
class DropDatabaseFunctionalTest extends FunctionalTestCase class DropDatabaseFunctionalTest extends FunctionalTestCase
{ {
public function testDropExistingDatabase() public function testDropExistingDatabase()
{ {
$writeResult = $this->manager->executeInsert($this->getNamespace(), array('x' => 1)); $server = $this->getPrimaryServer();
$insertOne = new InsertOne($this->getDatabaseName(), $this->getCollectionName(), ['x' => 1]);
$writeResult = $insertOne->execute($server);
$this->assertEquals(1, $writeResult->getInsertedCount()); $this->assertEquals(1, $writeResult->getInsertedCount());
$server = $this->getPrimaryServer();
$operation = new DropDatabase($this->getDatabaseName()); $operation = new DropDatabase($this->getDatabaseName());
$operation->execute($server); $operation->execute($server);
......
...@@ -4,6 +4,7 @@ namespace MongoDB\Tests\Operation; ...@@ -4,6 +4,7 @@ namespace MongoDB\Tests\Operation;
use MongoDB\Driver\Server; use MongoDB\Driver\Server;
use MongoDB\Operation\DropDatabase; use MongoDB\Operation\DropDatabase;
use MongoDB\Operation\InsertOne;
use MongoDB\Operation\ListCollections; use MongoDB\Operation\ListCollections;
class ListCollectionsFunctionalTest extends FunctionalTestCase class ListCollectionsFunctionalTest extends FunctionalTestCase
...@@ -15,7 +16,8 @@ class ListCollectionsFunctionalTest extends FunctionalTestCase ...@@ -15,7 +16,8 @@ class ListCollectionsFunctionalTest extends FunctionalTestCase
$operation = new DropDatabase($this->getDatabaseName()); $operation = new DropDatabase($this->getDatabaseName());
$operation->execute($server); $operation->execute($server);
$writeResult = $this->manager->executeInsert($this->getNamespace(), ['x' => 1]); $insertOne = new InsertOne($this->getDatabaseName(), $this->getCollectionName(), ['x' => 1]);
$writeResult = $insertOne->execute($server);
$this->assertEquals(1, $writeResult->getInsertedCount()); $this->assertEquals(1, $writeResult->getInsertedCount());
$operation = new ListCollections($this->getDatabaseName(), ['filter' => ['name' => $this->getCollectionName()]]); $operation = new ListCollections($this->getDatabaseName(), ['filter' => ['name' => $this->getCollectionName()]]);
......
...@@ -4,6 +4,7 @@ namespace MongoDB\Tests\Operation; ...@@ -4,6 +4,7 @@ namespace MongoDB\Tests\Operation;
use MongoDB\Driver\Server; use MongoDB\Driver\Server;
use MongoDB\Operation\DropCollection; use MongoDB\Operation\DropCollection;
use MongoDB\Operation\InsertOne;
use MongoDB\Operation\ListIndexes; use MongoDB\Operation\ListIndexes;
class ListIndexesFunctionalTest extends FunctionalTestCase class ListIndexesFunctionalTest extends FunctionalTestCase
...@@ -15,7 +16,8 @@ class ListIndexesFunctionalTest extends FunctionalTestCase ...@@ -15,7 +16,8 @@ class ListIndexesFunctionalTest extends FunctionalTestCase
$operation = new DropCollection($this->getDatabaseName(), $this->getCollectionName()); $operation = new DropCollection($this->getDatabaseName(), $this->getCollectionName());
$operation->execute($server); $operation->execute($server);
$writeResult = $this->manager->executeInsert($this->getNamespace(), ['x' => 1]); $insertOne = new InsertOne($this->getDatabaseName(), $this->getCollectionName(), ['x' => 1]);
$writeResult = $insertOne->execute($server);
$this->assertEquals(1, $writeResult->getInsertedCount()); $this->assertEquals(1, $writeResult->getInsertedCount());
$operation = new ListIndexes($this->getDatabaseName(), $this->getCollectionName()); $operation = new ListIndexes($this->getDatabaseName(), $this->getCollectionName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment