You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2019/02/02 18:08:31 UTC

[logging-log4j2] branch master updated: LOG4J-2009 - modify test to match expected behavior

This is an automated email from the ASF dual-hosted git repository.

rgoers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/master by this push:
     new 2a8416c  LOG4J-2009 - modify test to match expected behavior
2a8416c is described below

commit 2a8416ce47b7adb93c4575b29ee7a5717ea5de73
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sat Feb 2 11:08:22 2019 -0700

    LOG4J-2009 - modify test to match expected behavior
---
 .../core/appender/rolling/RollingFileAppenderUpdateDataTest.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderUpdateDataTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderUpdateDataTest.java
index b73b6b1..397679e 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderUpdateDataTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderUpdateDataTest.java
@@ -77,15 +77,16 @@ public class RollingFileAppenderUpdateDataTest {
     }
 
     @Test
-    @Ignore
     public void testNotClosingLoggerContext() {
         // initial config with indexed rollover
         final LoggerContext loggerContext1 = Configurator.initialize(buildConfigA().build());
-        validateAppender(loggerContext1, "target-rolling-update-date/foo.log.%i");
+        validateAppender(loggerContext1, "target/rolling-update-date/foo.log.%i");
 
         // rebuild config with date based rollover
         final LoggerContext loggerContext2 = Configurator.initialize(buildConfigB().build());
-        validateAppender(loggerContext2, "target/rolling-update-date/foo.log.%d{yyyy-MM-dd-HH:mm:ss}.%i");
+        Assert.assertNotNull("No LoggerContext", loggerContext2);
+        Assert.assertTrue("Expected same logger context to be returned", loggerContext1 == loggerContext2);
+		validateAppender(loggerContext1, "target/rolling-update-date/foo.log.%i");
     }
 
     private void validateAppender(final LoggerContext loggerContext, final String expectedFilePattern) {