Skip to content

Commit dc996d5

Browse files
committed
Fix MongoDbProviderTest
1 parent b9006b5 commit dc996d5

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

log4j-mongodb/src/test/java/org/apache/logging/log4j/mongodb/MongoDbProviderTest.java

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
*/
1717
package org.apache.logging.log4j.mongodb;
1818

19-
import static org.junit.jupiter.api.Assertions.assertEquals;
20-
import static org.junit.jupiter.api.Assertions.assertNotNull;
21-
import static org.junit.jupiter.api.Assertions.assertNull;
19+
import static org.assertj.core.api.Assertions.assertThat;
20+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
2221

2322
import com.mongodb.MongoNamespace;
2423
import com.mongodb.client.MongoCollection;
@@ -42,35 +41,38 @@ void createProviderWithDatabaseAndCollectionProvidedViaConfig() {
4241
.setDatabaseName(DB_NAME)
4342
.setCollectionName(COLL_NAME)
4443
.build();
45-
assertNotNull(provider);
4644
final MongoNamespace namespace = getNamespace(provider.getConnection());
47-
assertEquals(COLL_NAME, namespace.getCollectionName());
48-
assertEquals(DB_NAME, namespace.getDatabaseName());
45+
assertThat(namespace.getCollectionName()).isEqualTo(COLL_NAME);
46+
assertThat(namespace.getDatabaseName()).isEqualTo(DB_NAME);
4947
}
5048

5149
@Test
5250
void createProviderWithoutDatabaseName() {
53-
final MongoDbProvider provider =
54-
MongoDbProvider.newBuilder().setConnectionStringSource(CS_WO_DB).build();
55-
assertNull(provider);
51+
assertThatThrownBy(() -> MongoDbProvider.newBuilder()
52+
.setConnectionStringSource(CS_WO_DB)
53+
.build())
54+
.isInstanceOf(IllegalArgumentException.class)
55+
.hasMessageStartingWith("Invalid MongoDB database name");
5656
}
5757

5858
@Test
5959
void createProviderWithoutDatabaseNameWithCollectionName() {
60-
final MongoDbProvider provider = MongoDbProvider.newBuilder()
61-
.setConnectionStringSource(CS_WO_DB)
62-
.setCollectionName(COLL_NAME)
63-
.build();
64-
assertNull(provider);
60+
assertThatThrownBy(() -> MongoDbProvider.newBuilder()
61+
.setConnectionStringSource(CS_WO_DB)
62+
.setCollectionName(COLL_NAME)
63+
.build())
64+
.isInstanceOf(IllegalArgumentException.class)
65+
.hasMessageStartingWith("Invalid MongoDB database name");
6566
}
6667

6768
@Test
6869
void createProviderWithoutCollectionName() {
69-
final MongoDbProvider provider = MongoDbProvider.newBuilder()
70-
.setConnectionStringSource(CS_WO_DB)
71-
.setDatabaseName(DB_NAME)
72-
.build();
73-
assertNull(provider);
70+
assertThatThrownBy(() -> MongoDbProvider.newBuilder()
71+
.setConnectionStringSource(CS_WO_DB)
72+
.setDatabaseName(DB_NAME)
73+
.build())
74+
.isInstanceOf(IllegalArgumentException.class)
75+
.hasMessageStartingWith("Invalid MongoDB collection name");
7476
}
7577

7678
@Test
@@ -79,10 +81,9 @@ void createProviderWithDatabaseOnConnectionString() {
7981
.setConnectionStringSource(CS_W_DB)
8082
.setCollectionName(COLL_NAME)
8183
.build();
82-
assertNotNull(provider);
8384
final MongoNamespace namespace = getNamespace(provider.getConnection());
84-
assertEquals(COLL_NAME, namespace.getCollectionName());
85-
assertEquals("logging", namespace.getDatabaseName());
85+
assertThat(namespace.getCollectionName()).isEqualTo(COLL_NAME);
86+
assertThat(namespace.getDatabaseName()).isEqualTo("logging");
8687
}
8788

8889
@Test
@@ -92,10 +93,9 @@ void createProviderConfigOverridesConnectionString() {
9293
.setCollectionName(COLL_NAME)
9394
.setDatabaseName(DB_NAME)
9495
.build();
95-
assertNotNull(provider);
9696
final MongoNamespace namespace = getNamespace(provider.getConnection());
97-
assertEquals(COLL_NAME, namespace.getCollectionName());
98-
assertEquals(DB_NAME, namespace.getDatabaseName());
97+
assertThat(namespace.getCollectionName()).isEqualTo(COLL_NAME);
98+
assertThat(namespace.getDatabaseName()).isEqualTo(DB_NAME);
9999
}
100100

101101
private static MongoNamespace getNamespace(final MongoDbConnection connection) {

0 commit comments

Comments
 (0)