SWIFT-710 Audit tests to ensure all are re-enabled (#397)

Author: kmahar

Tests/LinuxMain.swift

@@ -190,6 +190,21 @@ extension MongoCollection_BulkWriteTests {
     ]
 }
 
+extension MongoCollection_IndexTests {
+    static var allTests = [
+        ("testCreateIndexFromModel", testCreateIndexFromModel),
+        ("testIndexOptions", testIndexOptions),
+        ("testCreateIndexesFromModels", testCreateIndexesFromModels),
+        ("testCreateIndexFromKeys", testCreateIndexFromKeys),
+        ("testDropIndexByName", testDropIndexByName),
+        ("testDropIndexByModel", testDropIndexByModel),
+        ("testDropIndexByKeys", testDropIndexByKeys),
+        ("testDropAllIndexes", testDropAllIndexes),
+        ("testListIndexNames", testListIndexNames),
+        ("testCreateDropIndexByModelWithMaxTimeMS", testCreateDropIndexByModelWithMaxTimeMS),
+    ]
+}
+
 extension MongoCursorTests {
     static var allTests = [
         ("testNonTailableCursor", testNonTailableCursor),
@@ -329,6 +344,7 @@ XCTMain([
     testCase(MongoClientTests.allTests),
     testCase(MongoCollectionTests.allTests),
     testCase(MongoCollection_BulkWriteTests.allTests),
+    testCase(MongoCollection_IndexTests.allTests),
     testCase(MongoCursorTests.allTests),
     testCase(MongoDatabaseTests.allTests),
     testCase(OptionsTests.allTests),

Tests/MongoSwiftSyncTests/CommandMonitoringTests.swift

@@ -111,15 +111,29 @@ private struct CMTestFile: Decodable {
     }
 }
 
+extension ReadPreference.Mode: Decodable {}
+
+extension ReadPreference: Decodable {
+    public convenience init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        let mode = try container.decode(Mode.self, forKey: .mode)
+        self.init(mode)
+    }
+
+    private enum CodingKeys: String, CodingKey {
+        case mode
+    }
+}
+
 /// A struct to hold the data for a single test from a CMTestFile.
 private struct CMTest: Decodable {
     struct Operation: Decodable {
         let name: String
         let args: Document
-        let readPreference: Document?
+        let readPreference: ReadPreference?
 
         enum CodingKeys: String, CodingKey {
-            case name, args = "arguments", readPreference
+            case name, args = "arguments", readPreference = "read_preference"
         }
     }
 
@@ -148,12 +162,12 @@ private struct CMTest: Decodable {
     // events won't match up.
     // swiftlint:disable cyclomatic_complexity
     func doOperation(withCollection collection: MongoCollection<Document>) throws {
-        // TODO: SWIFT-31: use readPreferences for commands if provided
         let filter: Document = self.op.args["filter"]?.documentValue ?? [:]
 
         switch self.op.name {
         case "count":
-            _ = try? collection.countDocuments(filter)
+            let options = CountDocumentsOptions(readPreference: self.op.readPreference)
+            _ = try? collection.countDocuments(filter, options: options)
         case "deleteMany":
             _ = try? collection.deleteMany(filter)
         case "deleteOne":
@@ -173,6 +187,7 @@ private struct CMTest: Decodable {
                 max: modifiers?["$max"]?.documentValue,
                 maxTimeMS: modifiers?["$maxTimeMS"]?.asInt64(),
                 min: modifiers?["$min"]?.documentValue,
+                readPreference: self.op.readPreference,
                 returnKey: modifiers?["$returnKey"]?.boolValue,
                 showRecordId: modifiers?["$showDiskLoc"]?.boolValue,
                 skip: self.op.args["skip"]?.asInt64(),

…edTests/MongoCollection+IndexTests.swift …ncTests/MongoCollection+IndexTests.swiftTests/DisabledTests/MongoCollection+IndexTests.swift renamed to Tests/MongoSwiftSyncTests/MongoCollection+IndexTests.swift Tests/DisabledTests/MongoCollection+IndexTests.swift renamed to Tests/MongoSwiftSyncTests/MongoCollection+IndexTests.swift

@@ -1,4 +1,4 @@
-import MongoSwift
+import MongoSwiftSync
 import Nimble
 import TestsCommon
 import XCTest
@@ -161,8 +161,7 @@ final class MongoCollection_IndexTests: MongoSwiftTestCase {
         let model = IndexModel(keys: ["cat": 1])
         expect(try self.coll.createIndex(model)).to(equal("cat_1"))
 
-        let res = try self.coll.dropIndex(model)
-        expect(res["ok"]?.asDouble()).to(equal(1.0))
+        expect(try self.coll.dropIndex(model)).toNot(throwError())
 
         // now there should only be _id_ left
         let indexes = try coll.listIndexes()
@@ -175,8 +174,7 @@ final class MongoCollection_IndexTests: MongoSwiftTestCase {
         let model = IndexModel(keys: ["cat": 1])
         expect(try self.coll.createIndex(model)).to(equal("cat_1"))
 
-        let res = try self.coll.dropIndex(["cat": 1])
-        expect(res["ok"]?.asDouble()).to(equal(1.0))
+        expect(try self.coll.dropIndex(["cat": 1])).toNot(throwError())
 
         // now there should only be _id_ left
         let indexes = try coll.listIndexes()
@@ -189,8 +187,7 @@ final class MongoCollection_IndexTests: MongoSwiftTestCase {
         let model = IndexModel(keys: ["cat": 1])
         expect(try self.coll.createIndex(model)).to(equal("cat_1"))
 
-        let res = try self.coll.dropIndexes()
-        expect(res["ok"]?.asDouble()).to(equal(1.0))
+        expect(try self.coll.dropIndexes()).toNot(throwError())
 
         // now there should only be _id_ left
         let indexes = try coll.listIndexes()
@@ -236,8 +233,7 @@ final class MongoCollection_IndexTests: MongoSwiftTestCase {
         expect(try collection.createIndex(model, options: createIndexOpts)).to(equal("cat_1"))
 
         let dropIndexOpts = DropIndexOptions(maxTimeMS: maxTimeMS, writeConcern: wc)
-        let res = try collection.dropIndex(model, options: dropIndexOpts)
-        expect(res["ok"]?.asDouble()).to(equal(1.0))
+        expect(try collection.dropIndex(model, options: dropIndexOpts)).toNot(throwError())
 
         // now there should only be _id_ left
         let indexes = try coll.listIndexes()

Tests/MongoSwiftSyncTests/ReadWriteConcernOperationTests.swift

@@ -182,17 +182,16 @@ final class ReadWriteConcernOperationTests: MongoSwiftTestCase {
         expect(try coll.deleteMany(["x": 9], options: DeleteOptions(writeConcern: wc1))).toNot(throwError())
         expect(try coll.deleteMany(["x": 10], options: DeleteOptions(writeConcern: wc3))).toNot(throwError())
 
-        // TODO: SWIFT-702: uncomment these assertions
-        // expect(try coll.createIndex(
-        //     ["x": 1],
-        //     options: CreateIndexOptions(writeConcern: wc1)
-        // )).toNot(throwError())
-        // expect(try coll.createIndexes(
-        //     [IndexModel(keys: ["x": -1])],
-        //     options: CreateIndexOptions(writeConcern: wc3)
-        // )).toNot(throwError())
-
-        // expect(try coll.dropIndex(["x": 1], options: DropIndexOptions(writeConcern: wc1))).toNot(throwError())
-        // expect(try coll.dropIndexes(options: DropIndexOptions(writeConcern: wc3))).toNot(throwError())
+        expect(try coll.createIndex(
+            ["x": 1],
+            options: CreateIndexOptions(writeConcern: wc1)
+        )).toNot(throwError())
+        expect(try coll.createIndexes(
+            [IndexModel(keys: ["x": -1])],
+            options: CreateIndexOptions(writeConcern: wc3)
+        )).toNot(throwError())
+
+        expect(try coll.dropIndex(["x": 1], options: DropIndexOptions(writeConcern: wc1))).toNot(throwError())
+        expect(try coll.dropIndexes(options: DropIndexOptions(writeConcern: wc3))).toNot(throwError())
     }
 }