Remove and update tests for compatibility

Author: GromNaN

tests/bulkwritecommand/bulkwritecommand-debug-004.phpt

@@ -18,7 +18,7 @@ echo throws(function() use ($bulk) {
 // Expected "hint" option to yield string or document but got "array"
 echo throws(function() use ($bulk) {
     $bulk->deleteOne(NS, [], ['hint' => MongoDB\BSON\PackedArray::fromPHP([])]);
-}, MongoDB\Driver\Exception\UnexpectedValueException::class), "\n";
+}, MongoDB\Driver\Exception\InvalidArgumentException::class), "\n";
 
 ?>
 ===DONE===
@@ -28,6 +28,6 @@ OK: Got MongoDB\Driver\Exception\UnexpectedValueException
 MongoDB\BSON\PackedArray cannot be serialized as a root document
 OK: Got MongoDB\Driver\Exception\UnexpectedValueException
 MongoDB\BSON\PackedArray cannot be serialized as a root document
-OK: Got MongoDB\Driver\Exception\UnexpectedValueException
-MongoDB\BSON\PackedArray cannot be serialized as a root document
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected "hint" option to yield string or document but got "array"
 ===DONE===

tests/bulkwritecommand/bulkwritecommand-deleteOne_error-004.phpt

@@ -1,29 +1,20 @@
 --TEST--
-MongoDB\Driver\BulkWriteCommand::insertOne() with invalid insert document
+MongoDB\Driver\BulkWriteCommand::insertOne() prohibits PackedArray for document
 --FILE--
 <?php
 
 require_once __DIR__ . '/../utils/basic.inc';
 
 $bulk = new MongoDB\Driver\BulkWriteCommand;
 
-// @TODO: FAILED: Expected MongoDB\Driver\Exception\InvalidArgumentException, but no exception thrown!
 echo throws(function() use ($bulk) {
-    $bulk->insertOne(NS, ['' => 1]);
-}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n\n";
-
-// @TODO: FAILED: Expected MongoDB\Driver\Exception\InvalidArgumentException, but no exception thrown!
-echo throws(function() use ($bulk) {
-    $bulk->insertOne(NS, ["\xc3\x28" => 1]);
-}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n";
+    $bulk->insertOne(NS, MongoDB\BSON\PackedArray::fromPHP([]));
+}, MongoDB\Driver\Exception\UnexpectedValueException::class), "\n";
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
-OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-invalid document for insert: empty key
-
-OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-invalid document for insert: corrupt BSON
+OK: Got MongoDB\Driver\Exception\UnexpectedValueException
+MongoDB\BSON\PackedArray cannot be serialized as a root document
 ===DONE===

tests/bulkwritecommand/bulkwritecommand-insertOne_error-001.phpt

@@ -40,10 +40,9 @@ $manager = create_test_manager();
 $document = new MyClass('foo', new MyClass('bar', new MyClass('baz')));
 
 $bulk = new MongoDB\Driver\BulkWriteCommand();
-// @TODO: Fatal error: Uncaught MongoDB\Driver\Exception\InvalidArgumentException: Invalid key '__pclass': update only works with $ operators and pipelines
 $bulk->updateOne(NS,
     ['_id' => 'foo'],
-    $document,
+    ['$set' => $document],
     ['upsert' => true]
 );
 $result = $manager->executeBulkWriteCommand($bulk);

tests/bulkwritecommand/bulkwritecommand-insertOne_error-004.phpt

@@ -13,11 +13,11 @@ class CommandLogger implements MongoDB\Driver\Monitoring\CommandSubscriber
 {
     public function commandStarted(MongoDB\Driver\Monitoring\CommandStartedEvent $event): void
     {
-        if ($event->getCommandName() !== 'update') {
+        if ($event->getCommandName() !== 'bulkWrite') {
             return;
         }
 
-        printf("update included sort: %s\n", json_encode($event->getCommand()->updates[0]->sort));
+        printf("update included sort: %s\n", json_encode($event->getCommand()->ops[0]->sort));
     }
 
     public function commandSucceeded(MongoDB\Driver\Monitoring\CommandSucceededEvent $event): void
@@ -43,9 +43,8 @@ $bulk = new MongoDB\Driver\BulkWriteCommand;
 $bulk->updateOne(NS, ['_id' => ['$gt' => 1]], ['$set' => ['x' => 11]], ['sort' => ['_id' => 1]]);
 $manager->executeBulkWriteCommand($bulk);
 
-// @TODO: Fatal error: Uncaught MongoDB\Driver\Exception\InvalidArgumentException: Invalid key 'x': update only works with $ operators and pipelines
 $bulk = new MongoDB\Driver\BulkWriteCommand;
-$bulk->updateOne(NS, ['_id' => ['$gt' => 1]], ['x' => 22], ['sort' => ['_id' => -1]]);
+$bulk->updateOne(NS, ['_id' => ['$gt' => 1]], ['$set' => ['x' => 22]], ['sort' => ['_id' => -1]]);
 $manager->executeBulkWriteCommand($bulk);
 
 $cursor = $manager->executeQuery(NS, new MongoDB\Driver\Query([]));

tests/bulkwritecommand/bulkwritecommand-updateOne-001.phpt

@@ -7,13 +7,8 @@ require_once __DIR__ . '/../utils/basic.inc';
 
 $bulk = new MongoDB\Driver\BulkWriteCommand;
 
-// @TODO: Invalid key 'y': update only works with $ operators and pipelines
 echo throws(function() use ($bulk) {
-    $bulk->updateOne(NS, ['x' => 1], ['y' => 1], ['multi' => true]);
-}, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n\n";
-
-echo throws(function() use ($bulk) {
-    $bulk->updateOne(NS, ['x' => 1], ['y' => 1], ['collation' => 1]);
+    $bulk->updateOne(NS, ['x' => 1], ['$set' => ['y' => 1]], ['collation' => 1]);
 }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n\n";
 
 echo throws(function() use ($bulk) {
@@ -24,7 +19,6 @@ echo throws(function() use ($bulk) {
     $bulk->updateOne(NS, ['x' => 1], ['$set' => ['y' => 1]], ['arrayFilters' => 1]);
 }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n\n";
 
-// @TODO: Expected "arrayFilters" option to yield array but got non-sequential keys
 echo throws(function() use ($bulk) {
     $bulk->updateOne(NS, ['x' => 1], ['$set' => ['y' => 1]], ['arrayFilters' => ['foo' => 'bar']]);
 }, 'MongoDB\Driver\Exception\InvalidArgumentException'), "\n\n";
@@ -37,9 +31,6 @@ echo throws(function() use ($bulk) {
 ===DONE===
 <?php exit(0); ?>
 --EXPECT--
-OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-Replacement document conflicts with true "multi" option
-
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Expected "collation" option to be array or object, int given
 
@@ -50,7 +41,7 @@ OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Expected "arrayFilters" option to be array or object, int given
 
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
-"arrayFilters" option has invalid keys for a BSON array
+Expected "arrayFilters" option to yield array but got non-sequential keys
 
 OK: Got MongoDB\Driver\Exception\InvalidArgumentException
 Expected "hint" option to be string, array, or object, int given

tests/bulkwritecommand/bulkwritecommand-updateOne-008.phpt

@@ -14,11 +14,9 @@ echo throws(function() use ($bulk) {
     $bulk->updateOne(NS, [], [], ['collation' => MongoDB\BSON\PackedArray::fromPHP([])]);
 }, MongoDB\Driver\Exception\UnexpectedValueException::class), "\n";
 
-// @TODO: ALMOST: Got MongoDB\Driver\Exception\InvalidArgumentException - expected MongoDB\Driver\Exception\UnexpectedValueException
-// Expected "hint" option to yield string or document but got "array"
 echo throws(function() use ($bulk) {
     $bulk->updateOne(NS, [], [], ['hint' => MongoDB\BSON\PackedArray::fromPHP([])]);
-}, MongoDB\Driver\Exception\UnexpectedValueException::class), "\n";
+}, MongoDB\Driver\Exception\InvalidArgumentException::class), "\n";
 
 ?>
 ===DONE===
@@ -28,6 +26,6 @@ OK: Got MongoDB\Driver\Exception\UnexpectedValueException
 MongoDB\BSON\PackedArray cannot be serialized as a root document
 OK: Got MongoDB\Driver\Exception\UnexpectedValueException
 MongoDB\BSON\PackedArray cannot be serialized as a root document
-OK: Got MongoDB\Driver\Exception\UnexpectedValueException
-MongoDB\BSON\PackedArray cannot be serialized as a root document
+OK: Got MongoDB\Driver\Exception\InvalidArgumentException
+Expected "hint" option to yield string or document but got "array"
 ===DONE===