Skip to content

Commit 8043b35

Browse files
rozzarozza
authored
Update DatabaseTestCase to Junit 5 (#1238)
JAVA-5220
1 parent fd8352f commit 8043b35

21 files changed

+92
-89
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package com.mongodb.reactivestreams.client;
1818

1919
import org.bson.Document;
20-
import org.junit.After;
21-
import org.junit.Before;
20+
import org.junit.jupiter.api.AfterEach;
21+
import org.junit.jupiter.api.BeforeEach;
2222

2323
import static com.mongodb.ClusterFixture.getDefaultDatabaseName;
2424
import static com.mongodb.reactivestreams.client.Fixture.drop;
@@ -32,15 +32,15 @@ public class DatabaseTestCase {
3232
protected MongoCollection<Document> collection;
3333
//CHECKSTYLE:ON
3434

35-
@Before
35+
@BeforeEach
3636
public void setUp() {
3737
client = getMongoClient();
3838
database = client.getDatabase(getDefaultDatabaseName());
3939
collection = database.getCollection(getClass().getName());
4040
drop(collection.getNamespace());
4141
}
4242

43-
@After
43+
@AfterEach
4444
public void tearDown() {
4545
if (collection != null) {
4646
drop(collection.getNamespace());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.mongodb.client.RetryableWritesProseTest;
2020
import com.mongodb.reactivestreams.client.syncadapter.SyncMongoClient;
21-
import org.junit.Test;
21+
import org.junit.jupiter.api.Test;
2222

2323
import java.util.concurrent.ExecutionException;
2424
import java.util.concurrent.TimeoutException;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import com.mongodb.reactivestreams.client.syncadapter.SyncMongoClient;
2323
import org.bson.Document;
2424
import org.bson.codecs.DocumentCodec;
25-
import org.junit.Before;
26-
import org.junit.Test;
25+
import org.junit.jupiter.api.BeforeEach;
26+
import org.junit.jupiter.api.Test;
2727
import reactor.core.publisher.Mono;
2828

2929
import java.util.concurrent.ExecutionException;
@@ -35,9 +35,9 @@
3535
import static com.mongodb.ClusterFixture.isSharded;
3636
import static com.mongodb.ClusterFixture.serverVersionAtLeast;
3737
import static com.mongodb.ClusterFixture.serverVersionLessThan;
38-
import static org.junit.Assert.assertEquals;
39-
import static org.junit.Assert.assertTrue;
40-
import static org.junit.Assume.assumeTrue;
38+
import static org.junit.jupiter.api.Assertions.assertEquals;
39+
import static org.junit.jupiter.api.Assertions.assertTrue;
40+
import static org.junit.jupiter.api.Assumptions.assumeTrue;
4141

4242
/**
4343
* See
@@ -46,7 +46,7 @@
4646
public class RetryableWritesProseTest extends DatabaseTestCase {
4747
private CollectionHelper<Document> collectionHelper;
4848

49-
@Before
49+
@BeforeEach
5050
@Override
5151
public void setUp() {
5252
super.setUp();

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,32 @@
1919
import com.mongodb.ClientSessionOptions;
2020
import com.mongodb.MongoClientException;
2121
import org.bson.Document;
22-
import org.junit.Before;
23-
import org.junit.Test;
22+
import org.junit.jupiter.api.BeforeEach;
23+
import org.junit.jupiter.api.Test;
2424
import reactor.core.publisher.Mono;
2525

2626
import static com.mongodb.ClusterFixture.TIMEOUT_DURATION;
2727
import static com.mongodb.ClusterFixture.isSharded;
2828
import static com.mongodb.ClusterFixture.serverVersionLessThan;
29-
import static org.junit.Assume.assumeTrue;
29+
import static org.junit.jupiter.api.Assertions.assertThrows;
30+
import static org.junit.jupiter.api.Assumptions.assumeTrue;
3031

3132
public class TransactionFailureTest extends DatabaseTestCase {
3233
public TransactionFailureTest() {
3334
}
3435

35-
@Before
36+
@BeforeEach
3637
public void setUp() {
3738
assumeTrue(canRunTests());
3839
super.setUp();
3940
}
4041

41-
@Test(expected = MongoClientException.class)
42+
@Test
4243
public void testTransactionFails() {
43-
4444
try (ClientSession clientSession = createSession()) {
4545
clientSession.startTransaction();
46-
Mono.from(collection.insertOne(clientSession, Document.parse("{_id: 1, a: 1}"))).block(TIMEOUT_DURATION);
46+
assertThrows(MongoClientException.class, () ->
47+
Mono.from(collection.insertOne(clientSession, Document.parse("{_id: 1, a: 1}"))).block(TIMEOUT_DURATION));
4748
}
4849
}
4950

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import org.bson.BsonString;
2626
import org.bson.Document;
2727
import org.bson.codecs.DocumentCodec;
28-
import org.junit.Before;
29-
import org.junit.Test;
28+
import org.junit.jupiter.api.BeforeEach;
29+
import org.junit.jupiter.api.Test;
3030
import reactor.core.publisher.Mono;
3131

3232
import static com.mongodb.ClusterFixture.TIMEOUT_DURATION;
@@ -35,16 +35,16 @@
3535
import static com.mongodb.reactivestreams.client.Fixture.getDefaultDatabaseName;
3636
import static java.lang.String.format;
3737
import static java.util.Arrays.asList;
38-
import static org.junit.Assert.assertEquals;
39-
import static org.junit.Assert.fail;
40-
import static org.junit.Assume.assumeTrue;
38+
import static org.junit.jupiter.api.Assertions.assertEquals;
39+
import static org.junit.jupiter.api.Assertions.fail;
40+
import static org.junit.jupiter.api.Assumptions.assumeTrue;
4141

4242
// See https://github.com/mongodb/specifications/tree/master/source/change-streams/tests/README.rst#prose-tests
4343
public class WriteConcernProseTest extends DatabaseTestCase {
4444
private BsonDocument failPointDocument;
4545
private CollectionHelper<Document> collectionHelper;
4646

47-
@Before
47+
@BeforeEach
4848
@Override
4949
public void setUp() {
5050
assumeTrue(canRunTests());

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import org.bson.BsonType;
3333
import org.bson.Document;
3434
import org.bson.conversions.Bson;
35-
import org.junit.After;
36-
import org.junit.Test;
35+
import org.junit.jupiter.api.AfterEach;
36+
import org.junit.jupiter.api.Test;
3737

3838
import java.util.ArrayList;
3939
import java.util.Arrays;
@@ -79,9 +79,9 @@
7979
import static com.mongodb.client.model.Updates.set;
8080
import static java.util.Arrays.asList;
8181
import static java.util.Collections.singletonList;
82-
import static org.junit.Assert.assertEquals;
83-
import static org.junit.Assert.assertTrue;
84-
import static org.junit.Assume.assumeTrue;
82+
import static org.junit.jupiter.api.Assertions.assertEquals;
83+
import static org.junit.jupiter.api.Assertions.assertTrue;
84+
import static org.junit.jupiter.api.Assumptions.assumeTrue;
8585

8686
// imports required for change streams
8787
// end required change streams imports
@@ -738,7 +738,7 @@ public void testCreateIndexes() {
738738
// End Index Example 2
739739
}
740740

741-
@After
741+
@AfterEach
742742
public void tearDown() {
743743
collection.drop();
744744
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.mongodb.client.AggregateIterable;
2020
import org.bson.Document;
21-
import org.junit.Test;
21+
import org.junit.jupiter.api.Test;
2222

2323
import static java.util.Arrays.asList;
2424

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package primer;
1818

19-
import org.junit.Test;
19+
import org.junit.jupiter.api.Test;
2020

2121
// @imports: start
2222
import org.bson.Document;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package primer;
1818

19-
import org.junit.Test;
19+
import org.junit.jupiter.api.Test;
2020

2121
// @imports: start
2222
import org.bson.Document;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.mongodb.client.FindIterable;
2020
import org.bson.Document;
21-
import org.junit.Test;
21+
import org.junit.jupiter.api.Test;
2222

2323
import static com.mongodb.client.model.Filters.and;
2424
import static com.mongodb.client.model.Filters.eq;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package primer;
1818

19-
import org.junit.Test;
19+
import org.junit.jupiter.api.Test;
2020

2121
// @import: start
2222
import org.bson.Document;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package primer;
1818

19-
import org.junit.Test;
19+
import org.junit.jupiter.api.Test;
2020

2121
// @import: start
2222
import org.bson.Document;

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,29 +34,30 @@
3434
import org.bson.BsonInt32;
3535
import org.bson.BsonString;
3636
import org.bson.Document;
37-
import org.junit.Before;
38-
import org.junit.Test;
37+
import org.junit.jupiter.api.BeforeEach;
38+
import org.junit.jupiter.api.Test;
3939

4040
import java.lang.reflect.Field;
4141

4242
import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
4343
import static com.mongodb.ClusterFixture.serverVersionAtLeast;
4444
import static com.mongodb.ClusterFixture.serverVersionLessThan;
45-
import static com.mongodb.client.model.Updates.set;
4645
import static com.mongodb.client.CrudTestHelper.repeat;
46+
import static com.mongodb.client.model.Updates.set;
4747
import static java.util.Arrays.asList;
48-
import static org.junit.Assert.assertEquals;
49-
import static org.junit.Assert.assertNotEquals;
50-
import static org.junit.Assert.assertNotNull;
51-
import static org.junit.Assert.assertNull;
52-
import static org.junit.Assert.assertTrue;
53-
import static org.junit.Assume.assumeTrue;
48+
import static org.junit.jupiter.api.Assertions.assertEquals;
49+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
50+
import static org.junit.jupiter.api.Assertions.assertNotNull;
51+
import static org.junit.jupiter.api.Assertions.assertNull;
52+
import static org.junit.jupiter.api.Assertions.assertTrue;
53+
import static org.junit.jupiter.api.Assumptions.assumeTrue;
54+
5455

5556
// See https://github.com/mongodb/specifications/tree/master/source/change-streams/tests/README.rst#prose-tests
5657
public class ChangeStreamProseTest extends DatabaseTestCase {
5758
private BsonDocument failPointDocument;
5859

59-
@Before
60+
@BeforeEach
6061
@Override
6162
public void setUp() {
6263
assumeTrue(canRunTests());

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,27 @@
2727
import org.bson.BsonInt32;
2828
import org.bson.BsonString;
2929
import org.bson.Document;
30-
import org.junit.Before;
31-
import org.junit.Test;
30+
import org.junit.jupiter.api.BeforeEach;
31+
import org.junit.jupiter.api.Test;
3232

3333
import static com.mongodb.ClusterFixture.isDiscoverableReplicaSet;
3434
import static com.mongodb.ClusterFixture.serverVersionAtLeast;
3535
import static java.lang.String.format;
3636
import static java.util.Arrays.asList;
37-
import static org.junit.Assert.assertEquals;
38-
import static org.junit.Assert.assertFalse;
39-
import static org.junit.Assert.assertNotNull;
40-
import static org.junit.Assert.assertTrue;
41-
import static org.junit.Assert.fail;
42-
import static org.junit.Assume.assumeTrue;
37+
import static org.junit.jupiter.api.Assertions.assertEquals;
38+
import static org.junit.jupiter.api.Assertions.assertFalse;
39+
import static org.junit.jupiter.api.Assertions.assertNotNull;
40+
import static org.junit.jupiter.api.Assertions.assertTrue;
41+
import static org.junit.jupiter.api.Assertions.fail;
42+
import static org.junit.jupiter.api.Assumptions.assumeTrue;
4343

4444
/**
4545
* See https://github.com/mongodb/specifications/blob/master/source/crud/tests/README.rst#prose-tests
4646
*/
4747
public class CrudProseTest extends DatabaseTestCase {
4848
private BsonDocument failPointDocument;
4949

50-
@Before
50+
@BeforeEach
5151
@Override
5252
public void setUp() {
5353
super.setUp();

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.bson.BsonDocumentWrapper;
2424
import org.bson.Document;
2525
import org.bson.codecs.DocumentCodec;
26-
import org.junit.After;
27-
import org.junit.Before;
26+
import org.junit.jupiter.api.AfterEach;
27+
import org.junit.jupiter.api.BeforeEach;
2828

2929
import static com.mongodb.client.Fixture.getDefaultDatabaseName;
3030
import static com.mongodb.client.Fixture.getMongoClient;
@@ -38,15 +38,15 @@ public class DatabaseTestCase {
3838
protected MongoCollection<Document> collection;
3939
//CHECKSTYLE:ON
4040

41-
@Before
41+
@BeforeEach
4242
public void setUp() {
4343
client = getMongoClient();
4444
database = client.getDatabase(getDefaultDatabaseName());
4545
collection = database.getCollection(getClass().getName());
4646
collection.drop();
4747
}
4848

49-
@After
49+
@AfterEach
5050
public void tearDown() {
5151
if (collection != null) {
5252
collection.drop();

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.bson.codecs.pojo.entities.conventions.BsonRepresentationModel;
3434
import org.bson.json.JsonObject;
3535
import org.bson.types.ObjectId;
36-
import org.junit.Test;
36+
import org.junit.jupiter.api.Test;
3737

3838
import java.util.ArrayList;
3939
import java.util.Collections;
@@ -47,10 +47,10 @@
4747
import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
4848
import static org.hamcrest.CoreMatchers.is;
4949
import static org.hamcrest.MatcherAssert.assertThat;
50-
import static org.junit.Assert.assertEquals;
51-
import static org.junit.Assert.assertNotNull;
52-
import static org.junit.Assert.assertTrue;
53-
import static org.junit.Assume.assumeFalse;
50+
import static org.junit.jupiter.api.Assertions.assertEquals;
51+
import static org.junit.jupiter.api.Assertions.assertNotNull;
52+
import static org.junit.jupiter.api.Assertions.assertTrue;
53+
import static org.junit.jupiter.api.Assumptions.assumeFalse;
5454

5555
public class MongoCollectionTest extends DatabaseTestCase {
5656

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.mongodb.client;
1818

19-
import org.junit.Test;
19+
import org.junit.jupiter.api.Test;
2020

2121
import java.util.concurrent.ExecutionException;
2222
import java.util.concurrent.TimeoutException;

0 commit comments

Comments
 (0)