Fix FileOutputTest on Windows

Author: ppkarwasz

log4j-core-test/src/test/java/org/apache/logging/log4j/core/config/FileOutputTest.java

@@ -17,25 +17,27 @@
 package org.apache.logging.log4j.core.config;
 
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 
 import org.apache.logging.log4j.core.test.junit.LoggerContextSource;
-import org.apache.logging.log4j.test.junit.CleanUpFiles;
+import org.apache.logging.log4j.test.junit.TempLoggingDir;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.assertj.core.api.Assertions.assertThat;
 
-@CleanUpFiles("target/test.log") // File name MUST match the one in log4j-filetest.xml.
+/**
+ * Tests the possibility to redirect status logger output to a file.
+ */
 public class FileOutputTest {
 
+    @TempLoggingDir
+    private static Path loggingPath;
+
     @Test
-    @LoggerContextSource(value="classpath:log4j-filetest.xml")
+    @LoggerContextSource
     public void testConfig() throws IOException {
-        final Path logFile = Paths.get("target", "status.log");
-        assertTrue(Files.exists(logFile), "Status output file does not exist");
-        assertTrue(Files.size(logFile) > 0, "File is empty");
+        final Path logFile = loggingPath.resolve("status.log");
+        assertThat(logFile).exists().isNotEmptyFile();
     }
 
 }

log4j-core-test/src/test/resources/log4j-filetest.xml renamed to log4j-core-test/src/test/resources/org/apache/logging/log4j/core/config/FileOutputTest.xml

@@ -15,41 +15,13 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<Configuration status="warn" dest="target/status.log" name="XMLConfigTest">
-  <Properties>
-    <Property name="filename">target/test.log</Property>
-  </Properties>
-  <ThresholdFilter level="debug"/>
-
+<Configuration status="DEBUG" dest="${test:logging.path}/status.log" name="FileOutputTest">
   <Appenders>
-    <Console name="STDOUT">
-      <PatternLayout pattern="%m%n"/>
-    </Console>
-    <File name="File" fileName="${filename}" bufferedIO="false">
-      <PatternLayout>
-        <Pattern>%d %p %C{1.} [%t] %m%n</Pattern>
-      </PatternLayout>
-    </File>
-    <List name="List">
-      <Filters>
-        <ThresholdFilter level="error"/>
-      </Filters>
-    </List>
+    <Console name="STDOUT"/>
   </Appenders>
 
   <Loggers>
-    <Logger name="org.apache.logging.log4j.test1" level="debug" additivity="false">
-        <ThreadContextMapFilter>
-          <KeyValuePair key="test" value="123"/>
-        </ThreadContextMapFilter>
-      <AppenderRef ref="STDOUT"/>
-    </Logger>
-
-    <Logger name="org.apache.logging.log4j.test2" level="debug" additivity="false">
-      <AppenderRef ref="File"/>
-    </Logger>
-
-    <Root level="error">
+    <Root level="ERROR">
       <AppenderRef ref="STDOUT"/>
     </Root>
   </Loggers>