This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new e362e7b Refactor magic strings into test constants.
e362e7b is described below
commit e362e7bb7c8b844d07b557a0953fa41282c66c62
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Feb 7 12:05:19 2022 -0500
Refactor magic strings into test constants.
---
.../org/apache/logging/log4j/mongodb3/MongoDb3AuthFailureTest.java | 4 ++--
.../java/org/apache/logging/log4j/mongodb3/MongoDb3CappedTest.java | 4 ++--
.../org/apache/logging/log4j/mongodb3/MongoDb3MapMessageTest.java | 4 ++--
.../src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3Test.java | 4 ++--
.../java/org/apache/logging/log4j/mongodb3/MongoDb3TestConstants.java | 2 ++
log4j-mongodb3/src/test/resources/log4j2-mongodb-auth-failure.xml | 2 +-
log4j-mongodb3/src/test/resources/log4j2-mongodb-capped.xml | 2 +-
log4j-mongodb3/src/test/resources/log4j2-mongodb-map-message.xml | 2 +-
log4j-mongodb3/src/test/resources/log4j2-mongodb.xml | 2 +-
9 files changed, 14 insertions(+), 12 deletions(-)
diff --git
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3AuthFailureTest.java
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3AuthFailureTest.java
index 844be9b..b19cb39 100644
---
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3AuthFailureTest.java
+++
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3AuthFailureTest.java
@@ -61,9 +61,9 @@ public class MongoDb3AuthFailureTest {
final Logger logger = LogManager.getLogger();
logger.info("Hello log");
try (final MongoClient mongoClient = mongoDbTestRule.getMongoClient())
{
- final MongoDatabase database = mongoClient.getDatabase("test");
+ final MongoDatabase database =
mongoClient.getDatabase(MongoDb3TestConstants.DATABASE_NAME);
Assert.assertNotNull(database);
- final MongoCollection<Document> collection =
database.getCollection("applog");
+ final MongoCollection<Document> collection =
database.getCollection(MongoDb3TestConstants.DATABASE_NAME);
Assert.assertNotNull(collection);
final Document first = collection.find().first();
Assert.assertNull(first);
diff --git
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3CappedTest.java
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3CappedTest.java
index 9c53651..15ac09e 100644
---
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3CappedTest.java
+++
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3CappedTest.java
@@ -58,9 +58,9 @@ public class MongoDb3CappedTest {
logger.info("Hello log");
@SuppressWarnings("resource") // Mongo client is managed by the test
rule.
final MongoClient mongoClient = mongoDbTestRule.getMongoClient();
- final MongoDatabase database = mongoClient.getDatabase("test");
+ final MongoDatabase database =
mongoClient.getDatabase(MongoDb3TestConstants.DATABASE_NAME);
Assert.assertNotNull(database);
- final MongoCollection<Document> collection =
database.getCollection("applog");
+ final MongoCollection<Document> collection =
database.getCollection(MongoDb3TestConstants.COLLECTION_NAME);
Assert.assertNotNull(collection);
final Document first = collection.find().first();
Assert.assertNotNull(first);
diff --git
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3MapMessageTest.java
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3MapMessageTest.java
index 5583b72..d20a1ca 100644
---
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3MapMessageTest.java
+++
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3MapMessageTest.java
@@ -62,9 +62,9 @@ public class MongoDb3MapMessageTest {
logger.info(mapMessage);
//
try (final MongoClient mongoClient = mongoDbTestRule.getMongoClient())
{
- final MongoDatabase database = mongoClient.getDatabase("test");
+ final MongoDatabase database =
mongoClient.getDatabase(MongoDb3TestConstants.DATABASE_NAME);
Assert.assertNotNull(database);
- final MongoCollection<Document> collection =
database.getCollection("applog");
+ final MongoCollection<Document> collection =
database.getCollection(MongoDb3TestConstants.COLLECTION_NAME);
Assert.assertNotNull(collection);
final Document first = collection.find().first();
Assert.assertNotNull(first);
diff --git
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3Test.java
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3Test.java
index 231e273..f37826e 100644
---
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3Test.java
+++
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3Test.java
@@ -56,9 +56,9 @@ public class MongoDb3Test {
logger.info("Hello log 1");
logger.info("Hello log 2", new RuntimeException("Hello ex 2"));
try (final MongoClient mongoClient = mongoDbTestRule.getMongoClient())
{
- final MongoDatabase database = mongoClient.getDatabase("test");
+ final MongoDatabase database =
mongoClient.getDatabase(MongoDb3TestConstants.DATABASE_NAME);
Assert.assertNotNull(database);
- final MongoCollection<Document> collection =
database.getCollection("applog");
+ final MongoCollection<Document> collection =
database.getCollection(MongoDb3TestConstants.COLLECTION_NAME);
Assert.assertNotNull(collection);
final FindIterable<Document> found = collection.find();
final Document first = found.first();
diff --git
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestConstants.java
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestConstants.java
index cfae3e4..fff9394 100644
---
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestConstants.java
+++
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestConstants.java
@@ -20,5 +20,7 @@ package org.apache.logging.log4j.mongodb3;
public class MongoDb3TestConstants {
public static final String SYS_PROP_NAME_PORT = "MongoDBTestPort";
+ static final String COLLECTION_NAME = "testCollection";
+ static final String DATABASE_NAME = "testDb";
}
diff --git a/log4j-mongodb3/src/test/resources/log4j2-mongodb-auth-failure.xml
b/log4j-mongodb3/src/test/resources/log4j2-mongodb-auth-failure.xml
index 6603582..0c18b0f 100644
--- a/log4j-mongodb3/src/test/resources/log4j2-mongodb-auth-failure.xml
+++ b/log4j-mongodb3/src/test/resources/log4j2-mongodb-auth-failure.xml
@@ -19,7 +19,7 @@
<Configuration status="WARN">
<Appenders>
<NoSql name="MongoDbAppender">
- <MongoDb3 databaseName="test" collectionName="applog" server="localhost"
userName="log4jUser" password="12345678"
+ <MongoDb3 databaseName="testDb" collectionName="testCollection"
server="localhost" userName="log4jUser" password="12345678"
port="${sys:MongoDBTestPort:-27017}" />
</NoSql>
</Appenders>
diff --git a/log4j-mongodb3/src/test/resources/log4j2-mongodb-capped.xml
b/log4j-mongodb3/src/test/resources/log4j2-mongodb-capped.xml
index 9ff6dbc..e5c07d3 100644
--- a/log4j-mongodb3/src/test/resources/log4j2-mongodb-capped.xml
+++ b/log4j-mongodb3/src/test/resources/log4j2-mongodb-capped.xml
@@ -19,7 +19,7 @@
<Configuration status="WARN">
<Appenders>
<NoSql name="MongoDbAppender">
- <MongoDb3 databaseName="test" collectionName="applog" server="localhost"
capped="true" collectionSize="1073741824"
+ <MongoDb3 databaseName="testDb" collectionName="testCollection"
server="localhost" capped="true" collectionSize="1073741824"
port="${sys:MongoDBTestPort:-27017}" />
</NoSql>
</Appenders>
diff --git a/log4j-mongodb3/src/test/resources/log4j2-mongodb-map-message.xml
b/log4j-mongodb3/src/test/resources/log4j2-mongodb-map-message.xml
index eec81af..1e89f86 100644
--- a/log4j-mongodb3/src/test/resources/log4j2-mongodb-map-message.xml
+++ b/log4j-mongodb3/src/test/resources/log4j2-mongodb-map-message.xml
@@ -19,7 +19,7 @@
<Configuration status="WARN">
<Appenders>
<NoSql name="MongoDbAppender">
- <MongoDb3 databaseName="test" collectionName="applog" server="localhost"
+ <MongoDb3 databaseName="testDb" collectionName="testCollection"
server="localhost"
port="${sys:MongoDBTestPort:-27017}" />
<MessageLayout />
</NoSql>
diff --git a/log4j-mongodb3/src/test/resources/log4j2-mongodb.xml
b/log4j-mongodb3/src/test/resources/log4j2-mongodb.xml
index 9819b64..be71562 100644
--- a/log4j-mongodb3/src/test/resources/log4j2-mongodb.xml
+++ b/log4j-mongodb3/src/test/resources/log4j2-mongodb.xml
@@ -19,7 +19,7 @@
<Configuration status="WARN">
<Appenders>
<NoSql name="MongoDbAppender">
- <MongoDb3 databaseName="test" collectionName="applog" server="localhost"
+ <MongoDb3 databaseName="testDb" collectionName="testCollection"
server="localhost"
port="${sys:MongoDBTestPort:-27017}" />
</NoSql>
</Appenders>
