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 ce63b3d Rename test classes from MongoDB* to MongopDb3*.
new ae2afdd Merge branch 'release-2.x' of
https://gitbox.apache.org/repos/asf/logging-log4j2 into release-2.x
ce63b3d is described below
commit ce63b3db83ad36fabfc3f69cc7276ac6477b1c94
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Feb 7 11:57:31 2022 -0500
Rename test classes from MongoDB* to MongopDb3*.
---
...ongoDbAuthFailureTest.java => MongoDb3AuthFailureTest.java} | 10 +++++-----
.../{MongoDbCappedTest.java => MongoDb3CappedTest.java} | 10 +++++-----
...{MongoDbMapMessageTest.java => MongoDb3MapMessageTest.java} | 10 +++++-----
.../log4j/mongodb3/{MongoDbTest.java => MongoDb3Test.java} | 8 ++++----
.../{TestConstants.java => MongoDb3TestConstants.java} | 2 +-
.../mongodb3/{MongoDbTestRule.java => MongoDb3TestRule.java} | 6 +++---
...goDbTestTestRuleTest.java => MongoDb3TestTestRuleTest.java} | 10 +++++-----
7 files changed, 28 insertions(+), 28 deletions(-)
diff --git
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbAuthFailureTest.java
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3AuthFailureTest.java
similarity index 88%
rename from
log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbAuthFailureTest.java
rename to
log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3AuthFailureTest.java
index 8ad224c..844be9b 100644
---
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbAuthFailureTest.java
+++
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3AuthFailureTest.java
@@ -20,7 +20,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.categories.Appenders;
import org.apache.logging.log4j.junit.LoggerContextRule;
-import org.apache.logging.log4j.mongodb3.MongoDbTestRule.LoggingTarget;
+import org.apache.logging.log4j.mongodb3.MongoDb3TestRule.LoggingTarget;
import org.apache.logging.log4j.test.AvailablePortSystemPropertyTestRule;
import org.apache.logging.log4j.test.RuleChainFactory;
import org.bson.Document;
@@ -42,15 +42,15 @@ import com.mongodb.client.MongoDatabase;
*/
@Ignore("TODO Set up the log4j user in MongoDB")
@Category(Appenders.MongoDb.class)
-public class MongoDbAuthFailureTest {
+public class MongoDb3AuthFailureTest {
private static LoggerContextRule loggerContextTestRule = new
LoggerContextRule("log4j2-mongodb-auth-failure.xml");
private static final AvailablePortSystemPropertyTestRule
mongoDbPortTestRule = AvailablePortSystemPropertyTestRule
- .create(TestConstants.SYS_PROP_NAME_PORT);
+ .create(MongoDb3TestConstants.SYS_PROP_NAME_PORT);
- private static final MongoDbTestRule mongoDbTestRule = new
MongoDbTestRule(mongoDbPortTestRule.getName(),
- MongoDbAuthFailureTest.class, LoggingTarget.NULL);
+ private static final MongoDb3TestRule mongoDbTestRule = new
MongoDb3TestRule(mongoDbPortTestRule.getName(),
+ MongoDb3AuthFailureTest.class, LoggingTarget.NULL);
@ClassRule
public static RuleChain ruleChain =
RuleChainFactory.create(mongoDbPortTestRule, mongoDbTestRule,
diff --git
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbCappedTest.java
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3CappedTest.java
similarity index 88%
rename from
log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbCappedTest.java
rename to
log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3CappedTest.java
index 48d260a..9c53651 100644
---
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbCappedTest.java
+++
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3CappedTest.java
@@ -20,7 +20,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.categories.Appenders;
import org.apache.logging.log4j.junit.LoggerContextRule;
-import org.apache.logging.log4j.mongodb3.MongoDbTestRule.LoggingTarget;
+import org.apache.logging.log4j.mongodb3.MongoDb3TestRule.LoggingTarget;
import org.apache.logging.log4j.test.AvailablePortSystemPropertyTestRule;
import org.apache.logging.log4j.test.RuleChainFactory;
import org.bson.Document;
@@ -38,15 +38,15 @@ import com.mongodb.client.MongoDatabase;
*
*/
@Category(Appenders.MongoDb.class)
-public class MongoDbCappedTest {
+public class MongoDb3CappedTest {
private static LoggerContextRule loggerContextTestRule = new
LoggerContextRule("log4j2-mongodb-capped.xml");
private static final AvailablePortSystemPropertyTestRule
mongoDbPortTestRule = AvailablePortSystemPropertyTestRule
- .create(TestConstants.SYS_PROP_NAME_PORT);
+ .create(MongoDb3TestConstants.SYS_PROP_NAME_PORT);
- private static final MongoDbTestRule mongoDbTestRule = new
MongoDbTestRule(mongoDbPortTestRule.getName(),
- MongoDbCappedTest.class, LoggingTarget.NULL);
+ private static final MongoDb3TestRule mongoDbTestRule = new
MongoDb3TestRule(mongoDbPortTestRule.getName(),
+ MongoDb3CappedTest.class, LoggingTarget.NULL);
@ClassRule
public static RuleChain ruleChain =
RuleChainFactory.create(mongoDbPortTestRule, mongoDbTestRule,
diff --git
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbMapMessageTest.java
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3MapMessageTest.java
similarity index 89%
rename from
log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbMapMessageTest.java
rename to
log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3MapMessageTest.java
index 0cba9f3..5583b72 100644
---
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbMapMessageTest.java
+++
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3MapMessageTest.java
@@ -21,7 +21,7 @@ import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.categories.Appenders;
import org.apache.logging.log4j.junit.LoggerContextRule;
import org.apache.logging.log4j.message.MapMessage;
-import org.apache.logging.log4j.mongodb3.MongoDbTestRule.LoggingTarget;
+import org.apache.logging.log4j.mongodb3.MongoDb3TestRule.LoggingTarget;
import org.apache.logging.log4j.test.AvailablePortSystemPropertyTestRule;
import org.apache.logging.log4j.test.RuleChainFactory;
import org.bson.Document;
@@ -39,15 +39,15 @@ import com.mongodb.client.MongoDatabase;
*
*/
@Category(Appenders.MongoDb.class)
-public class MongoDbMapMessageTest {
+public class MongoDb3MapMessageTest {
private static LoggerContextRule loggerContextTestRule = new
LoggerContextRule("log4j2-mongodb-map-message.xml");
private static final AvailablePortSystemPropertyTestRule
mongoDbPortTestRule = AvailablePortSystemPropertyTestRule
- .create(TestConstants.SYS_PROP_NAME_PORT);
+ .create(MongoDb3TestConstants.SYS_PROP_NAME_PORT);
- private static final MongoDbTestRule mongoDbTestRule = new
MongoDbTestRule(mongoDbPortTestRule.getName(),
- MongoDbMapMessageTest.class, LoggingTarget.NULL);
+ private static final MongoDb3TestRule mongoDbTestRule = new
MongoDb3TestRule(mongoDbPortTestRule.getName(),
+ MongoDb3MapMessageTest.class, LoggingTarget.NULL);
@ClassRule
public static RuleChain ruleChain =
RuleChainFactory.create(mongoDbPortTestRule, mongoDbTestRule,
diff --git
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTest.java
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3Test.java
similarity index 90%
rename from
log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTest.java
rename to
log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3Test.java
index fb0d05a..231e273 100644
---
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTest.java
+++
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3Test.java
@@ -20,7 +20,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.categories.Appenders;
import org.apache.logging.log4j.junit.LoggerContextRule;
-import org.apache.logging.log4j.mongodb3.MongoDbTestRule.LoggingTarget;
+import org.apache.logging.log4j.mongodb3.MongoDb3TestRule.LoggingTarget;
import org.apache.logging.log4j.test.AvailablePortSystemPropertyTestRule;
import org.apache.logging.log4j.test.RuleChainFactory;
import org.bson.Document;
@@ -39,13 +39,13 @@ import com.mongodb.client.MongoDatabase;
*
*/
@Category(Appenders.MongoDb.class)
-public class MongoDbTest {
+public class MongoDb3Test {
private static LoggerContextRule loggerContextTestRule = new
LoggerContextRule("log4j2-mongodb.xml");
- private static final AvailablePortSystemPropertyTestRule
mongoDbPortTestRule =
AvailablePortSystemPropertyTestRule.create(TestConstants.SYS_PROP_NAME_PORT);
+ private static final AvailablePortSystemPropertyTestRule
mongoDbPortTestRule =
AvailablePortSystemPropertyTestRule.create(MongoDb3TestConstants.SYS_PROP_NAME_PORT);
- private static final MongoDbTestRule mongoDbTestRule = new
MongoDbTestRule(mongoDbPortTestRule.getName(), MongoDbTest.class,
LoggingTarget.NULL);
+ private static final MongoDb3TestRule mongoDbTestRule = new
MongoDb3TestRule(mongoDbPortTestRule.getName(), MongoDb3Test.class,
LoggingTarget.NULL);
@ClassRule
public static RuleChain ruleChain =
RuleChainFactory.create(mongoDbPortTestRule, mongoDbTestRule,
loggerContextTestRule);
diff --git
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/TestConstants.java
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestConstants.java
similarity index 96%
rename from
log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/TestConstants.java
rename to
log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestConstants.java
index 3e7e0f3..cfae3e4 100644
---
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/TestConstants.java
+++
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestConstants.java
@@ -17,7 +17,7 @@
package org.apache.logging.log4j.mongodb3;
-public class TestConstants {
+public class MongoDb3TestConstants {
public static final String SYS_PROP_NAME_PORT = "MongoDBTestPort";
diff --git
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestRule.java
similarity index 97%
rename from
log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java
rename to
log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestRule.java
index fd69a5a..8066d6a 100644
---
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestRule.java
+++
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestRule.java
@@ -44,7 +44,7 @@ import de.flapdoodle.embed.process.runtime.Network;
*
* TODO Move this class to Apache Commons Testing.
*/
-public class MongoDbTestRule implements TestRule {
+public class MongoDb3TestRule implements TestRule {
public enum LoggingTarget {
CONSOLE, NULL;
@@ -66,7 +66,7 @@ public class MongoDbTestRule implements TestRule {
}
switch (loggingTarget) {
case NULL:
- final Logger logger =
LoggerFactory.getLogger(MongoDbTestRule.class.getName());
+ final Logger logger =
LoggerFactory.getLogger(MongoDb3TestRule.class.getName());
// @formatter:off
return MongodStarter.getInstance(
Defaults
@@ -107,7 +107,7 @@ public class MongoDbTestRule implements TestRule {
* @param defaultLoggingTarget
* The logging target.
*/
- public MongoDbTestRule(final String portSystemPropertyName, final Class<?>
clazz,
+ public MongoDb3TestRule(final String portSystemPropertyName, final
Class<?> clazz,
final LoggingTarget defaultLoggingTarget) {
this.portSystemPropertyName =
Objects.requireNonNull(portSystemPropertyName, "portSystemPropertyName");
this.loggingTarget = LoggingTarget.getLoggingTarget(clazz.getName() +
"." + LoggingTarget.class.getSimpleName(),
diff --git
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestTestRuleTest.java
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestTestRuleTest.java
similarity index 88%
rename from
log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestTestRuleTest.java
rename to
log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestTestRuleTest.java
index 8a3a4d9..7d94d2a 100644
---
a/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDbTestTestRuleTest.java
+++
b/log4j-mongodb3/src/test/java/org/apache/logging/log4j/mongodb3/MongoDb3TestTestRuleTest.java
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.mongodb3;
import org.apache.commons.lang3.JavaVersion;
import org.apache.commons.lang3.SystemUtils;
-import org.apache.logging.log4j.mongodb3.MongoDbTestRule.LoggingTarget;
+import org.apache.logging.log4j.mongodb3.MongoDb3TestRule.LoggingTarget;
import org.apache.logging.log4j.test.AvailablePortSystemPropertyTestRule;
import org.apache.logging.log4j.test.RuleChainFactory;
import org.junit.Assert;
@@ -38,13 +38,13 @@ import com.mongodb.client.MongoIterable;
* The test framework {@code de.flapdoodle.embed.mongo} requires Java 8.
* </p>
*/
-public class MongoDbTestTestRuleTest {
+public class MongoDb3TestTestRuleTest {
private static final AvailablePortSystemPropertyTestRule
mongoDbPortTestRule = AvailablePortSystemPropertyTestRule
- .create(TestConstants.SYS_PROP_NAME_PORT);
+ .create(MongoDb3TestConstants.SYS_PROP_NAME_PORT);
- private static final MongoDbTestRule mongoDbTestRule = new
MongoDbTestRule(mongoDbPortTestRule.getName(),
- MongoDbTestTestRuleTest.class, LoggingTarget.NULL);
+ private static final MongoDb3TestRule mongoDbTestRule = new
MongoDb3TestRule(mongoDbPortTestRule.getName(),
+ MongoDb3TestTestRuleTest.class, LoggingTarget.NULL);
@ClassRule
public static RuleChain mongoDbChain =
RuleChainFactory.create(mongoDbPortTestRule, mongoDbTestRule);
