[logging-log4j2] branch release-2.x updated: Sort files before testing helps not fail on Windows.

[ggregory]

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 ea601f5  Sort files before testing helps not fail on Windows.
ea601f5 is described below

commit ea601f51b7f6571bfdeaab7b267185dd701ef068
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Wed Nov 11 11:23:16 2020 -0500

    Sort files before testing helps not fail on Windows.
---
 .../RollingDirectSizeTimeNewDirectoryTest.java        | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingDirectSizeTimeNewDirectoryTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingDirectSizeTimeNewDirectoryTest.java
index 9afbfa9..91b8cb4 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingDirectSizeTimeNewDirectoryTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingDirectSizeTimeNewDirectoryTest.java
@@ -16,6 +16,12 @@
  */
 package org.apache.logging.log4j.core.appender.rolling;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.util.Arrays;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.filefilter.TrueFileFilter;
 import org.apache.logging.log4j.Logger;
@@ -24,12 +30,6 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
 
-import java.io.File;
-import java.util.Arrays;
-import java.util.Iterator;
-
-import static org.junit.Assert.*;
-
 public class RollingDirectSizeTimeNewDirectoryTest {
 
     private static final String CONFIG = 
"log4j-rolling-size-time-new-directory.xml";
@@ -74,6 +74,7 @@ public class RollingDirectSizeTimeNewDirectoryTest {
 
                 File logFolder = logFolders[logFolderIndex];
                 File[] logFiles = logFolder.listFiles();
+                Arrays.sort(logFiles);
                 assertTrue(
                         "no files found in folder: " + logFolder,
                         logFiles != null && logFiles.length > 0);
@@ -90,13 +91,9 @@ public class RollingDirectSizeTimeNewDirectoryTest {
 
         } catch (AssertionError error) {
             System.out.format("log directory (%s) contents:%n", DIR);
-            final Iterator<File> fileIterator =
-                    FileUtils.iterateFilesAndDirs(
-                            logDir, TrueFileFilter.TRUE, TrueFileFilter.TRUE);
             int totalFileCount = 0;
-            while (fileIterator.hasNext()) {
+            for (final File file : FileUtils.listFilesAndDirs(logDir, 
TrueFileFilter.TRUE, TrueFileFilter.TRUE)) {
                 totalFileCount++;
-                final File file = fileIterator.next();
                 System.out.format("-> %s (%d)%n", file, file.length());
             }
             System.out.format("total file count: %d%n", totalFileCount);