RUST-670 Expect unified test format operations to succeed

src/coll/options.rs

@@ -509,7 +509,7 @@ pub struct CountOptions {
     ///
     /// This options maps to the `maxTimeMS` MongoDB query option, so the duration will be sent
     /// across the wire as an integer number of milliseconds.
-    #[serde(deserialize_with = "deserialize_duration_from_u64_millis")]
+    #[serde(default, deserialize_with = "deserialize_duration_from_u64_millis")]
     pub max_time: Option<Duration>,
 
     /// The number of documents to skip before counting.
@@ -548,6 +548,7 @@ pub struct EstimatedDocumentCountOptions {
     /// This options maps to the `maxTimeMS` MongoDB query option, so the duration will be sent
     /// across the wire as an integer number of milliseconds.
     #[serde(
+        default,
         serialize_with = "serialize_duration_as_int_millis",
         rename = "maxTimeMS",
         deserialize_with = "deserialize_duration_from_u64_millis"
@@ -577,6 +578,7 @@ pub struct DistinctOptions {
     /// This options maps to the `maxTimeMS` MongoDB query option, so the duration will be sent
     /// across the wire as an integer number of milliseconds.
     #[serde(
+        default,
         serialize_with = "serialize_duration_as_int_millis",
         rename = "maxTimeMS",
         deserialize_with = "deserialize_duration_from_u64_millis"

src/error.rs

@@ -1,6 +1,10 @@
 //! Contains the `Error` and `Result` types that `mongodb` uses.
 
-use std::{collections::{HashMap, HashSet}, fmt::{self, Debug}, sync::Arc};
+use std::{
+    collections::{HashMap, HashSet},
+    fmt::{self, Debug},
+    sync::Arc,
+};
 
 use bson::Bson;
 use serde::Deserialize;
@@ -58,8 +62,7 @@ impl Error {
         ErrorKind::ConnectionPoolCleared {
             message: format!(
                 "Connection pool for {} cleared because another operation failed with: {}",
-                address,
-                cause
+                address, cause
             ),
         }
         .into()

src/is_master.rs

@@ -14,7 +14,11 @@ use crate::{
 /// Construct an isMaster command.
 pub(crate) fn is_master_command(api: Option<&ServerApi>) -> Command {
     let command_name = if api.is_some() { "hello" } else { "isMaster" };
-    let mut command = Command::new(command_name.into(), "admin".into(), doc! { command_name: 1 });
+    let mut command = Command::new(
+        command_name.into(),
+        "admin".into(),
+        doc! { command_name: 1 },
+    );
     if let Some(server_api) = api {
         command.set_server_api(server_api);
     }
@@ -28,8 +32,8 @@ pub(crate) async fn run_is_master(
     command: Command,
     conn: &mut Connection,
 ) -> Result<IsMasterReply> {
-    if !command.name.eq_ignore_ascii_case("ismaster") &&
-        !command.name.eq_ignore_ascii_case("hello") {
+    if !command.name.eq_ignore_ascii_case("ismaster") && !command.name.eq_ignore_ascii_case("hello")
+    {
         return Err(ErrorKind::Internal {
             message: format!("invalid ismaster command: {}", command.name),
         }

src/results.rs

@@ -147,7 +147,10 @@ pub struct DatabaseSpecification {
     pub name: String,
 
     /// The amount of disk space in bytes that is consumed by the database.
-    #[serde(deserialize_with = "crate::bson_util::deserialize_u64_from_bson_number")]
+    #[serde(
+        deserialize_with = "crate::bson_util::deserialize_u64_from_bson_number",
+        serialize_with = "crate::bson::serde_helpers::serialize_u64_as_i64"
+    )]
     pub size_on_disk: u64,
 
     /// Whether the database has any data.

src/test/mod.rs

@@ -11,7 +11,7 @@ mod spec;
 mod util;
 
 pub(crate) use self::{
-    spec::{run_spec_test, RunOn, Topology},
+    spec::{run_single_test, run_spec_test, RunOn, Topology},
     util::{
         assert_matches,
         CmapEvent,

src/test/spec/json/unified-test-format/valid-fail/assertNumberConnectionsCheckedOut.json

@@ -0,0 +1,63 @@
+{
+  "description": "assertNumberConnectionsCheckedOut",
+  "schemaVersion": "1.3",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "useMultipleMongoses": true
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "operation fails if client field is not specified",
+      "operations": [
+        {
+          "name": "assertNumberConnectionsCheckedOut",
+          "object": "testRunner",
+          "arguments": {
+            "connections": 1
+          }
+        }
+      ]
+    },
+    {
+      "description": "operation fails if connections field is not specified",
+      "operations": [
+        {
+          "name": "assertNumberConnectionsCheckedOut",
+          "object": "testRunner",
+          "arguments": {
+            "client": "client0"
+          }
+        }
+      ]
+    },
+    {
+      "description": "operation fails if client entity does not exist",
+      "operations": [
+        {
+          "name": "assertNumberConnectionsCheckedOut",
+          "object": "testRunner",
+          "arguments": {
+            "client": "client1"
+          }
+        }
+      ]
+    },
+    {
+      "description": "operation fails if number of connections is incorrect",
+      "operations": [
+        {
+          "name": "assertNumberConnectionsCheckedOut",
+          "object": "testRunner",
+          "arguments": {
+            "client": "client0",
+            "connections": 1
+          }
+        }
+      ]
+    }
+  ]
+}

src/test/spec/json/unified-test-format/valid-fail/assertNumberConnectionsCheckedOut.yml

@@ -0,0 +1,38 @@
+description: assertNumberConnectionsCheckedOut
+
+schemaVersion: '1.3'
+
+createEntities:
+  - client:
+      id: &client0 client0
+      useMultipleMongoses: true
+
+tests:
+  - description: operation fails if client field is not specified
+    operations:
+      - name: assertNumberConnectionsCheckedOut
+        object: testRunner
+        arguments:
+          connections: 1
+
+  - description: operation fails if connections field is not specified
+    operations:
+      - name: assertNumberConnectionsCheckedOut
+        object: testRunner
+        arguments:
+          client: *client0
+
+  - description: operation fails if client entity does not exist
+    operations:
+      - name: assertNumberConnectionsCheckedOut
+        object: testRunner
+        arguments:
+          client: client1
+
+  - description: operation fails if number of connections is incorrect
+    operations:
+      - name: assertNumberConnectionsCheckedOut
+        object: testRunner
+        arguments:
+          client: *client0
+          connections: 1

src/test/spec/json/unified-test-format/valid-fail/entity-bucket-database-undefined.json

@@ -0,0 +1,18 @@
+{
+  "description": "entity-bucket-database-undefined",
+  "schemaVersion": "1.0",
+  "createEntities": [
+    {
+      "bucket": {
+        "id": "bucket0",
+        "database": "foo"
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": []
+    }
+  ]
+}

src/test/spec/json/unified-test-format/valid-fail/entity-bucket-database-undefined.yml

@@ -0,0 +1,12 @@
+description: "entity-bucket-database-undefined"
+
+schemaVersion: "1.0"
+
+createEntities:
+  - bucket:
+      id: &bucket0 "bucket0"
+      database: "foo"
+
+tests:
+  - description: "foo"
+    operations: []

src/test/spec/json/unified-test-format/valid-fail/entity-client-apiVersion-unsupported.json

@@ -0,0 +1,20 @@
+{
+  "description": "entity-client-apiVersion-unsupported",
+  "schemaVersion": "1.1",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "serverApi": {
+          "version": "server_will_never_support_this_api_version"
+        }
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": []
+    }
+  ]
+}

src/test/spec/json/unified-test-format/valid-fail/entity-client-apiVersion-unsupported.yml

@@ -0,0 +1,13 @@
+description: "entity-client-apiVersion-unsupported"
+
+schemaVersion: "1.1"
+
+createEntities:
+  - client:
+      id: &client0 client0
+      serverApi:
+        version: "server_will_never_support_this_api_version"
+
+tests:
+  - description: "foo"
+    operations: []

src/test/spec/json/unified-test-format/valid-fail/entity-client-storeEventsAsEntities-conflict_with_client_id.json

@@ -0,0 +1,28 @@
+{
+  "description": "entity-client-storeEventsAsEntities-conflict_with_client_id",
+  "schemaVersion": "1.2",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "storeEventsAsEntities": [
+          {
+            "id": "client0",
+            "events": [
+              "PoolCreatedEvent",
+              "PoolReadyEvent",
+              "PoolClearedEvent",
+              "PoolClosedEvent"
+            ]
+          }
+        ]
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": []
+    }
+  ]
+}

src/test/spec/json/unified-test-format/valid-fail/entity-client-storeEventsAsEntities-conflict_with_client_id.yml

@@ -0,0 +1,16 @@
+description: "entity-client-storeEventsAsEntities-conflict_with_client_id"
+
+schemaVersion: "1.2"
+
+createEntities:
+  - client:
+      id: &client0 client0
+      storeEventsAsEntities:
+        # Using the client ID here will ensure that test runners also detect
+        # conflicts with the same entity being defined
+        - id: *client0
+          events: ["PoolCreatedEvent", "PoolReadyEvent", "PoolClearedEvent", "PoolClosedEvent"]
+
+tests:
+  - description: "foo"
+    operations: []

src/test/spec/json/unified-test-format/valid-fail/entity-client-storeEventsAsEntities-conflict_within_different_array.json

@@ -0,0 +1,43 @@
+{
+  "description": "entity-client-storeEventsAsEntities-conflict_within_different_array",
+  "schemaVersion": "1.2",
+  "createEntities": [
+    {
+      "client": {
+        "id": "client0",
+        "storeEventsAsEntities": [
+          {
+            "id": "events",
+            "events": [
+              "PoolCreatedEvent",
+              "PoolReadyEvent",
+              "PoolClearedEvent",
+              "PoolClosedEvent"
+            ]
+          }
+        ]
+      }
+    },
+    {
+      "client": {
+        "id": "client1",
+        "storeEventsAsEntities": [
+          {
+            "id": "events",
+            "events": [
+              "CommandStartedEvent",
+              "CommandSucceededEvent",
+              "CommandFailedEvent"
+            ]
+          }
+        ]
+      }
+    }
+  ],
+  "tests": [
+    {
+      "description": "foo",
+      "operations": []
+    }
+  ]
+}

src/test/spec/json/unified-test-format/valid-fail/entity-client-storeEventsAsEntities-conflict_within_different_array.yml

@@ -0,0 +1,19 @@
+description: "entity-client-storeEventsAsEntities-conflict_within_different_array"
+
+schemaVersion: "1.2"
+
+createEntities:
+  - client:
+      id: &client0 client0
+      storeEventsAsEntities:
+        - id: &events events
+          events: ["PoolCreatedEvent", "PoolReadyEvent", "PoolClearedEvent", "PoolClosedEvent"]
+  - client:
+      id: &client1 client1
+      storeEventsAsEntities:
+        - id: *events
+          events: ["CommandStartedEvent", "CommandSucceededEvent", "CommandFailedEvent"]
+
+tests:
+  - description: "foo"
+    operations: []