[logging-log4j2] branch master updated: Fix unit test

[rgoers]

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 af7923be22 Fix unit test
af7923be22 is described below

commit af7923be2246eea3b129b54a79622e0b0fc8fa55
Author: rgoers <ralph.go...@dslextreme.com>
AuthorDate: Mon Jul 4 10:27:47 2022 -0700

    Fix unit test
---
 .../rolling/RollingDirectTimeNewDirectoryTest.java | 26 ++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git 
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingDirectTimeNewDirectoryTest.java
 
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingDirectTimeNewDirectoryTest.java
index 4d7b022723..315798750f 100644
--- 
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingDirectTimeNewDirectoryTest.java
+++ 
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingDirectTimeNewDirectoryTest.java
@@ -34,7 +34,7 @@ import java.util.concurrent.CountDownLatch;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-public class RollingDirectTimeNewDirectoryTest extends 
AbstractRollingListenerTest {
+public class RollingDirectTimeNewDirectoryTest implements RolloverListener {
 
     private static final String CONFIG = "log4j-rolling-folder-direct.xml";
 
@@ -50,14 +50,18 @@ public class RollingDirectTimeNewDirectoryTest extends 
AbstractRollingListenerTe
 
         final Logger logger = 
context.getLogger(RollingDirectTimeNewDirectoryTest.class.getName());
 
-        for (int i = 0; i < 1000; i++) {
-            currentTimeMillis.incrementAndGet();
-            logger.info("nHq6p9kgfvWfjzDRYbZp");
-        }
-        currentTimeMillis.addAndGet(500);
-        for (int i = 0; i < 1000; i++) {
-            currentTimeMillis.incrementAndGet();
-            logger.info("nHq6p9kgfvWfjzDRYbZp");
+        for (int count = 0; count < 2; ++count) {
+            long start = System.currentTimeMillis();
+            for (int i = 0; i < 50; i++) {
+                logger.info("nHq6p9kgfvWfjzDRYbZp");
+            }
+            long end = System.currentTimeMillis();
+            if (end < start + 1000) {
+                Thread.sleep(start + 1000 - end);
+            }
+            for (int i = 0; i < 50; i++) {
+                logger.info("nHq6p9kgfvWfjzDRYbZp");
+            }
         }
 
         rollover.await();
@@ -101,6 +105,10 @@ public class RollingDirectTimeNewDirectoryTest extends 
AbstractRollingListenerTe
 
     }
 
+    @Override
+    public void rolloverTriggered(String fileName) {
+    }
+
     @Override
     public void rolloverComplete(final String fileName) {
         rollover.countDown();