Update DatabaseTestCase to Junit 5 (#1238)

JAVA-5220

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

@@ -17,8 +17,8 @@
 package com.mongodb.reactivestreams.client;
 
 import org.bson.Document;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 import static com.mongodb.ClusterFixture.getDefaultDatabaseName;
 import static com.mongodb.reactivestreams.client.Fixture.drop;
@@ -32,15 +32,15 @@ public class DatabaseTestCase {
     protected MongoCollection<Document> collection;
     //CHECKSTYLE:ON
 
-    @Before
+    @BeforeEach
     public void setUp() {
         client =  getMongoClient();
         database = client.getDatabase(getDefaultDatabaseName());
         collection = database.getCollection(getClass().getName());
         drop(collection.getNamespace());
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         if (collection != null) {
             drop(collection.getNamespace());

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

@@ -18,7 +18,7 @@
 
 import com.mongodb.client.RetryableWritesProseTest;
 import com.mongodb.reactivestreams.client.syncadapter.SyncMongoClient;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;

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

@@ -22,8 +22,8 @@
 import com.mongodb.reactivestreams.client.syncadapter.SyncMongoClient;
 import org.bson.Document;
 import org.bson.codecs.DocumentCodec;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 
 import java.util.concurrent.ExecutionException;
@@ -35,9 +35,9 @@
 import static com.mongodb.ClusterFixture.isSharded;
 import static com.mongodb.ClusterFixture.serverVersionAtLeast;
 import static com.mongodb.ClusterFixture.serverVersionLessThan;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 /**
  * See
@@ -46,7 +46,7 @@
 public class RetryableWritesProseTest extends DatabaseTestCase {
     private CollectionHelper<Document> collectionHelper;
 
-    @Before
+    @BeforeEach
     @Override
     public void setUp() {
         super.setUp();

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

@@ -19,31 +19,32 @@
 import com.mongodb.ClientSessionOptions;
 import com.mongodb.MongoClientException;
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 
 import static com.mongodb.ClusterFixture.TIMEOUT_DURATION;
 import static com.mongodb.ClusterFixture.isSharded;
 import static com.mongodb.ClusterFixture.serverVersionLessThan;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 public class TransactionFailureTest extends DatabaseTestCase {
     public TransactionFailureTest() {
     }
 
-    @Before
+    @BeforeEach
     public void setUp() {
         assumeTrue(canRunTests());
         super.setUp();
     }
 
-    @Test(expected = MongoClientException.class)
+    @Test
     public void testTransactionFails() {
-
         try (ClientSession clientSession = createSession()) {
             clientSession.startTransaction();
-            Mono.from(collection.insertOne(clientSession, Document.parse("{_id: 1, a: 1}"))).block(TIMEOUT_DURATION);
+            assertThrows(MongoClientException.class, () ->
+                    Mono.from(collection.insertOne(clientSession, Document.parse("{_id: 1, a: 1}"))).block(TIMEOUT_DURATION));
         }
     }
 

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

@@ -25,8 +25,8 @@
 import org.bson.BsonString;
 import org.bson.Document;
 import org.bson.codecs.DocumentCodec;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import reactor.core.publisher.Mono;
 
 import static com.mongodb.ClusterFixture.TIMEOUT_DURATION;
@@ -35,16 +35,16 @@
 import static com.mongodb.reactivestreams.client.Fixture.getDefaultDatabaseName;
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 // See https://github.com/mongodb/specifications/tree/master/source/change-streams/tests/README.rst#prose-tests
 public class WriteConcernProseTest extends DatabaseTestCase {
     private BsonDocument failPointDocument;
     private CollectionHelper<Document> collectionHelper;
 
-    @Before
+    @BeforeEach
     @Override
     public void setUp() {
         assumeTrue(canRunTests());

driver-sync/src/examples/documentation/DocumentationSamples.java

@@ -32,8 +32,8 @@
 import org.bson.BsonType;
 import org.bson.Document;
 import org.bson.conversions.Bson;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -79,9 +79,9 @@
 import static com.mongodb.client.model.Updates.set;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 // imports required for change streams
 // end required change streams imports
@@ -738,7 +738,7 @@ public void testCreateIndexes() {
         // End Index Example 2
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         collection.drop();
     }

driver-sync/src/examples/primer/AggregatePrimer.java

@@ -18,7 +18,7 @@
 
 import com.mongodb.client.AggregateIterable;
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.util.Arrays.asList;
 

driver-sync/src/examples/primer/IndexesPrimer.java

@@ -16,7 +16,7 @@
 
 package primer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 // @imports: start
 import org.bson.Document;

driver-sync/src/examples/primer/InsertPrimer.java

@@ -16,7 +16,7 @@
 
 package primer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 // @imports: start
 import org.bson.Document;

driver-sync/src/examples/primer/QueryPrimer.java

@@ -18,7 +18,7 @@
 
 import com.mongodb.client.FindIterable;
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static com.mongodb.client.model.Filters.and;
 import static com.mongodb.client.model.Filters.eq;

driver-sync/src/examples/primer/RemovePrimer.java

@@ -16,7 +16,7 @@
 
 package primer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 // @import: start
 import org.bson.Document;

driver-sync/src/examples/primer/UpdatePrimer.java

@@ -16,7 +16,7 @@
 
 package primer;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 // @import: start
 import org.bson.Document;

driver-sync/src/test/functional/com/mongodb/client/ChangeStreamProseTest.java

@@ -34,29 +34,30 @@
 import org.bson.BsonInt32;
 import org.bson.BsonString;
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Field;
 
 import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
 import static com.mongodb.ClusterFixture.serverVersionAtLeast;
 import static com.mongodb.ClusterFixture.serverVersionLessThan;
-import static com.mongodb.client.model.Updates.set;
 import static com.mongodb.client.CrudTestHelper.repeat;
+import static com.mongodb.client.model.Updates.set;
 import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
 
 // See https://github.com/mongodb/specifications/tree/master/source/change-streams/tests/README.rst#prose-tests
 public class ChangeStreamProseTest extends DatabaseTestCase {
     private BsonDocument failPointDocument;
 
-    @Before
+    @BeforeEach
     @Override
     public void setUp() {
         assumeTrue(canRunTests());

driver-sync/src/test/functional/com/mongodb/client/CrudProseTest.java

@@ -27,27 +27,27 @@
 import org.bson.BsonInt32;
 import org.bson.BsonString;
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
 import static com.mongodb.ClusterFixture.serverVersionAtLeast;
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 /**
  * See https://github.com/mongodb/specifications/blob/master/source/crud/tests/README.rst#prose-tests
  */
 public class CrudProseTest extends DatabaseTestCase {
     private BsonDocument failPointDocument;
 
-    @Before
+    @BeforeEach
     @Override
     public void setUp() {
         super.setUp();

driver-sync/src/test/functional/com/mongodb/client/DatabaseTestCase.java

@@ -23,8 +23,8 @@
 import org.bson.BsonDocumentWrapper;
 import org.bson.Document;
 import org.bson.codecs.DocumentCodec;
-import org.junit.After;
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 
 import static com.mongodb.client.Fixture.getDefaultDatabaseName;
 import static com.mongodb.client.Fixture.getMongoClient;
@@ -38,15 +38,15 @@ public class DatabaseTestCase {
     protected MongoCollection<Document> collection;
     //CHECKSTYLE:ON
 
-    @Before
+    @BeforeEach
     public void setUp() {
         client =  getMongoClient();
         database = client.getDatabase(getDefaultDatabaseName());
         collection = database.getCollection(getClass().getName());
         collection.drop();
     }
 
-    @After
+    @AfterEach
     public void tearDown() {
         if (collection != null) {
             collection.drop();

driver-sync/src/test/functional/com/mongodb/client/MongoCollectionTest.java

@@ -33,7 +33,7 @@
 import org.bson.codecs.pojo.entities.conventions.BsonRepresentationModel;
 import org.bson.json.JsonObject;
 import org.bson.types.ObjectId;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -47,10 +47,10 @@
 import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 public class MongoCollectionTest extends DatabaseTestCase {
 

driver-sync/src/test/functional/com/mongodb/client/RetryableReadsProseTest.java

@@ -16,7 +16,7 @@
 
 package com.mongodb.client;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;