Clean up async MongoClient instances in tests

Author: jyemin

driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionBypassAutoEncryptionTest.java

@@ -31,17 +31,16 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import static reactivestreams.helpers.SubscriberHelpers.ObservableSubscriber;
-import static reactivestreams.helpers.SubscriberHelpers.OperationSubscriber;
 
 import java.security.SecureRandom;
 import java.util.HashMap;
 import java.util.Map;
 
-
 import static com.mongodb.ClusterFixture.serverVersionAtLeast;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assume.assumeTrue;
+import static reactivestreams.helpers.SubscriberHelpers.ObservableSubscriber;
+import static reactivestreams.helpers.SubscriberHelpers.OperationSubscriber;
 
 public class ClientSideEncryptionBypassAutoEncryptionTest {
     private MongoClient clientEncrypted;
@@ -117,5 +116,8 @@ public void after() throws Throwable {
             Fixture.dropDatabase(Fixture.getDefaultDatabaseName());
             clientEncrypted.close();
         }
+        if (clientEncryption != null) {
+            clientEncryption.close();
+        }
     }
 }

driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionTest.java

@@ -25,6 +25,7 @@
 import com.mongodb.reactivestreams.client.syncadapter.SyncMongoClient;
 import org.bson.BsonArray;
 import org.bson.BsonDocument;
+import org.junit.After;
 
 public class ClientSideEncryptionTest extends AbstractClientSideEncryptionTest {
 
@@ -49,4 +50,11 @@ protected void createMongoClient(final AutoEncryptionSettings autoEncryptionSett
     protected MongoDatabase getDatabase(final String databaseName) {
         return mongoClient.getDatabase(databaseName);
     }
+
+    @After
+    public void cleanUp() {
+        if (mongoClient != null) {
+            mongoClient.close();
+        }
+    }
 }

driver-scala/src/it/scala/org/mongodb/scala/ClientSideEncryptionTest.scala

@@ -16,11 +16,11 @@
 
 package org.mongodb.scala
 
-import com.mongodb.client.{ AbstractClientSideEncryptionTest, Fixture }
+import com.mongodb.client.{AbstractClientSideEncryptionTest, Fixture}
 import com.mongodb.event.CommandListener
+import org.bson.{BsonArray, BsonDocument}
+import org.junit.After
 import org.mongodb.scala.syncadapter.SyncMongoClient
-import org.bson.BsonArray
-import org.bson.BsonDocument
 
 class ClientSideEncryptionTest(
     val filename: String,
@@ -48,4 +48,9 @@ class ClientSideEncryptionTest(
 
   override protected def getDatabase(databaseName: String): com.mongodb.client.MongoDatabase =
     mongoClient.getDatabase(databaseName)
+
+  @After
+  def cleanUp(): Unit = {
+    if (mongoClient != null) mongoClient.close()
+  }
 }