Ensure that all tests that write to system.profile collection drop it before and after the test.

Otherwise it creates ordering dependencies between the tests.

Author: jyemin

driver-async/src/test/functional/com/mongodb/async/client/MongoClientsSpecification.groovy

@@ -206,19 +206,25 @@ class MongoClientsSpecification extends FunctionalSpecification {
         def client = MongoClients.create(getMongoClientBuilderFromConnectionString().applicationName(appName).build(), driverInfo)
         def database = client.getDatabase(getDatabaseName())
         def collection = database.getCollection(getCollectionName())
+
+        def profileCollection = database.getCollection('system.profile')
+        run(profileCollection.&drop)
         run(database.&runCommand, new Document('profile', 2))
 
         when:
         run(collection.&count)
 
         then:
-        Document profileDocument = run(database.getCollection('system.profile').find().&first)
+        Document profileDocument = run(profileCollection.find().&first)
         profileDocument.get('appName') == appName
 
         cleanup:
         if (database != null) {
             run(database.&runCommand, new Document('profile', 0))
         }
+        if (profileCollection != null) {
+            run(profileCollection.&drop)
+        }
         client?.close()
     }
 }

driver/src/test/functional/com/mongodb/DBCursorTest.java

@@ -400,29 +400,34 @@ public void testSettingACommentInsertsCommentIntoProfileCollectionWhenProfilingI
         assumeThat(isSharded(), is(false));
 
         // given
-        database.command(new BasicDBObject("profile", 2));
         String expectedComment = "test comment";
 
-        // when
-        DBCursor cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
-                          .comment(expectedComment);
-        while (cursor.hasNext()) {
-            cursor.next();
-        }
-
-        // then
         DBCollection profileCollection = database.getCollection("system.profile");
-        assertEquals(1, profileCollection.count());
+        profileCollection.drop();
+
+        database.command(new BasicDBObject("profile", 2));
 
-        DBObject profileDocument = profileCollection.findOne();
-        if (serverVersionAtLeast(asList(3, 1, 7))) {
-            assertEquals(expectedComment, ((DBObject) profileDocument.get("query")).get("comment"));
-        } else {
-            assertEquals(expectedComment, ((DBObject) profileDocument.get("query")).get("$comment"));
+        try {
+            // when
+            DBCursor cursor = new DBCursor(collection, new BasicDBObject(), new BasicDBObject(), ReadPreference.primary())
+                              .comment(expectedComment);
+            while (cursor.hasNext()) {
+                cursor.next();
+            }
+
+            // then
+            assertEquals(1, profileCollection.count());
+
+            DBObject profileDocument = profileCollection.findOne();
+            if (serverVersionAtLeast(asList(3, 1, 7))) {
+                assertEquals(expectedComment, ((DBObject) profileDocument.get("query")).get("comment"));
+            } else {
+                assertEquals(expectedComment, ((DBObject) profileDocument.get("query")).get("$comment"));
+            }
+        } finally {
+            database.command(new BasicDBObject("profile", 0));
+            profileCollection.drop();
         }
-        // finally
-        database.command(new BasicDBObject("profile", 0));
-        profileCollection.drop();
     }
 
     @Test

driver/src/test/functional/com/mongodb/MongoClientsSpecification.groovy

@@ -34,19 +34,22 @@ class MongoClientsSpecification extends FunctionalSpecification {
         def client = new MongoClient(getMongoClientURI(MongoClientOptions.builder().applicationName(appName)), driverInfo)
         def database = client.getDatabase(getDatabaseName())
         def collection = database.getCollection(getCollectionName())
+
+        def profileCollection = database.getCollection('system.profile')
+        profileCollection.drop()
+
         database.runCommand(new Document('profile', 2))
 
         when:
         collection.count()
 
         then:
-        Document profileDocument = database.getCollection('system.profile').find().first()
+        Document profileDocument = profileCollection.find().first()
         profileDocument.get('appName') == appName
 
         cleanup:
-        if (database != null) {
-            database.runCommand(new Document('profile', 0))
-        }
+        database?.runCommand(new Document('profile', 0))
+        profileCollection?.drop()
         client?.close()
     }