CDRIVER-4026 Restore specified cursor behaviour (#803)

* CDRIVER-4026 Specify 5.0 cursor behaviour

Revert "Fix batchSize behaviour for getMore (#793)"

This reverts commit 5cd215b.

The spec tests in this commit are synced to commit 9da20b4b from the mongodb/specifications repository.

* Restore usage of assert_match_bson

Author: alcaeus

src/libmongoc/src/mongoc/mongoc-cursor.c

@@ -1709,7 +1709,7 @@ _mongoc_cursor_prepare_getmore_command (mongoc_cursor_t *cursor,
       bson_append_int64 (command,
                          MONGOC_CURSOR_BATCH_SIZE,
                          MONGOC_CURSOR_BATCH_SIZE_LEN,
-                         batch_size);
+                         abs (_mongoc_n_return (cursor)));
    }
 
    /* Find, getMore And killCursors Commands Spec: "In the case of a tailable

src/libmongoc/tests/json/command_monitoring/find.json

@@ -356,7 +356,7 @@
               },
               "collection": "test",
               "batchSize": {
-                "$numberLong": "3"
+                "$numberLong": "1"
               }
             },
             "command_name": "getMore",
@@ -413,8 +413,9 @@
       ]
     },
     {
-      "description": "A successful find event with a getmore and the server kills the cursor",
+      "description": "A successful find event with a getmore and the server kills the cursor (<= 4.4)",
       "ignore_if_server_version_less_than": "3.1",
+      "ignore_if_server_version_greater_than": "4.4",
       "ignore_if_topology_type": [
         "sharded"
       ],
@@ -497,7 +498,7 @@
               },
               "collection": "test",
               "batchSize": {
-                "$numberLong": "3"
+                "$numberLong": "1"
               }
             },
             "command_name": "getMore",

src/libmongoc/tests/json/unified/poc-command-monitoring.json

@@ -57,10 +57,11 @@
   ],
   "tests": [
     {
-      "description": "A successful find event with a getmore and the server kills the cursor",
+      "description": "A successful find event with a getmore and the server kills the cursor (<= 4.4)",
       "runOnRequirements": [
         {
           "minServerVersion": "3.1",
+          "maxServerVersion": "4.4.99",
           "topologies": [
             "single",
             "replicaset"

src/libmongoc/tests/test-mongoc-cursor.c

@@ -1955,28 +1955,28 @@ _test_cursor_n_return (bool find_with_opts)
                                       0,         /* skip              */
                                       3,         /* limit             */
                                       0,         /* batch_size        */
-                                      {1, 1, 1}, /* expected_n_return */
+                                      {3, 2, 1}, /* expected_n_return */
                                       {1, 1, 1}  /* reply_length      */
                                    },
                                    {
                                       0,         /* skip              */
                                       5,         /* limit             */
                                       2,         /* batch_size        */
-                                      {2, 2, 2}, /* expected_n_return */
+                                      {2, 2, 1}, /* expected_n_return */
                                       {2, 2, 1}  /* reply_length      */
                                    },
                                    {
                                       0,         /* skip              */
                                       4,         /* limit             */
                                       7,         /* batch_size        */
-                                      {4, 7, 7}, /* expected_n_return */
+                                      {4, 2, 1}, /* expected_n_return */
                                       {2, 1, 1}  /* reply_length      */
                                    },
                                    {
                                       0,            /* skip              */
                                       -3,           /* limit             */
                                       1,            /* batch_size        */
-                                      {1, 1, 1}, /* expected_n_return */
+                                      {-3, -3, -3}, /* expected_n_return */
                                       {1, 1, 1}     /* reply_length      */
                                    }};