remove old v2 runner

Author: isabelatkinson

src/test/mod.rs

@@ -10,15 +10,7 @@ mod spec;
 mod util;
 
 pub(crate) use self::{
-    spec::{
-        run_spec_test,
-        run_v2_test,
-        AnyTestOperation,
-        OperationObject,
-        RunOn,
-        TestEvent,
-        Topology,
-    },
+    spec::{run_spec_test, RunOn, Topology},
     util::{
         assert_matches,
         CmapEvent,

src/test/spec/crud_v2.rs

@@ -1,6 +1,8 @@
 use tokio::sync::RwLockWriteGuard;
 
-use crate::test::{run_spec_test, run_v2_test, LOCK};
+use crate::test::{run_spec_test, LOCK};
+
+use super::run_v2_test;
 
 #[cfg_attr(feature = "tokio-runtime", tokio::test)]
 #[cfg_attr(feature = "async-std-runtime", async_std::test)]

src/test/spec/mod.rs

@@ -11,9 +11,9 @@ mod ocsp;
 mod read_write_concern;
 mod retryable_reads;
 mod retryable_writes;
-mod runner;
 mod sessions;
 mod unified_runner;
+mod v2_runner;
 
 use std::{
     convert::TryFrom,
@@ -24,16 +24,8 @@ use std::{
 };
 
 pub use self::{
-    runner::{
-        run_v2_test,
-        AnyTestOperation,
-        OperationObject,
-        RunOn,
-        TestData,
-        TestEvent,
-        TestFile,
-    },
     unified_runner::Topology,
+    v2_runner::{operation::Operation, run_v2_test, test_file::RunOn},
 };
 
 use serde::de::DeserializeOwned;

src/test/spec/retryable_reads.rs

@@ -1,6 +1,8 @@
 use tokio::sync::RwLockWriteGuard;
 
-use crate::test::{run_spec_test, run_v2_test, LOCK};
+use crate::test::{run_spec_test, LOCK};
+
+use super::run_v2_test;
 
 #[cfg_attr(feature = "tokio-runtime", tokio::test(flavor = "multi_thread"))]
 #[cfg_attr(feature = "async-std-runtime", async_std::test)]

src/test/spec/retryable_writes/mod.rs

@@ -81,14 +81,10 @@ async fn run_spec_tests() {
                     .unwrap();
             }
 
-            let result = client
-                .run_collection_operation(
-                    &test_case.operation,
-                    &db_name,
-                    &coll_name,
-                    Some(options.clone()),
-                )
-                .await;
+            let coll = client
+                .database(&db_name)
+                .collection_with_options(&coll_name, options.clone());
+            let result = test_case.operation.execute_on_collection(&coll, None).await;
 
             if let Some(error) = test_case.outcome.error {
                 assert_eq!(

src/test/spec/retryable_writes/test_file.rs

@@ -1,6 +1,6 @@
 use serde::Deserialize;
 
-use super::super::{AnyTestOperation, RunOn};
+use super::super::{Operation, RunOn};
 use crate::{
     bson::{Bson, Document},
     options::ClientOptions,
@@ -21,7 +21,7 @@ pub struct TestCase {
     pub client_options: Option<ClientOptions>,
     pub use_multiple_mongoses: Option<bool>,
     pub fail_point: Option<Document>,
-    pub operation: AnyTestOperation,
+    pub operation: Operation,
     pub outcome: Outcome,
 }