Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e446410

Browse files
committedOct 1, 2024
refactor: Migrate rollingfile tests to junit5
Signed-off-by: Ninette Adhikari <ninette.adhikari@gmail.com>
1 parent 37573b1 commit e446410

File tree

5 files changed

+23
-22
lines changed

5 files changed

+23
-22
lines changed
 

‎log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderOnStartupTest.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package org.apache.logging.log4j.core.appender.rolling;
1818

19-
import static org.junit.Assert.assertTrue;
19+
import static org.junit.jupiter.api.Assertions.assertTrue;
2020
import static org.junit.jupiter.api.Assumptions.assumeTrue;
2121

2222
import java.nio.file.DirectoryStream;
@@ -81,13 +81,14 @@ public void performTest(final LoggerContext loggerContext) throws Exception {
8181
if (path.toFile().getName().startsWith(ROLLED)) {
8282
rolled = true;
8383
final List<String> lines = Files.readAllLines(path);
84-
assertTrue("No messages in " + path.toFile().getName(), lines.size() > 0);
8584
assertTrue(
86-
"Missing message for " + path.toFile().getName(),
87-
lines.get(0).startsWith(PREFIX + "1"));
85+
lines.size() > 0, "No messages in " + path.toFile().getName());
86+
assertTrue(
87+
lines.get(0).startsWith(PREFIX + "1"),
88+
"Missing message for " + path.toFile().getName());
8889
}
8990
}
9091
}
91-
assertTrue("File did not roll", rolled);
92+
assertTrue(rolled, "File did not roll");
9293
}
9394
}

‎log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderAccessTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.apache.logging.log4j.core.LoggerContext;
2222
import org.apache.logging.log4j.core.appender.RollingFileAppender;
2323
import org.apache.logging.log4j.core.config.Configuration;
24-
import org.junit.Assert;
25-
import org.junit.Test;
24+
import org.junit.jupiter.api.Assertions;
25+
import org.junit.jupiter.api.Test;
2626

2727
public class RollingFileAppenderAccessTest {
2828

@@ -49,8 +49,8 @@ public void testAccessManagerWithBuilder() throws IOException {
4949
final RollingFileManager manager = appender.getManager();
5050
// Since the RolloverStrategy and TriggeringPolicy are immutable, we could also use generics to type their
5151
// access.
52-
Assert.assertNotNull(manager.getRolloverStrategy());
53-
Assert.assertNotNull(manager.getTriggeringPolicy());
52+
Assertions.assertNotNull(manager.getRolloverStrategy());
53+
Assertions.assertNotNull(manager.getTriggeringPolicy());
5454
}
5555
}
5656

@@ -84,8 +84,8 @@ public void testAccessManagerWithStrings() throws IOException {
8484
final RollingFileManager manager = appender.getManager();
8585
// Since the RolloverStrategy and TriggeringPolicy are immutable, we could also use generics to type their
8686
// access.
87-
Assert.assertNotNull(manager.getRolloverStrategy());
88-
Assert.assertNotNull(manager.getTriggeringPolicy());
87+
Assertions.assertNotNull(manager.getRolloverStrategy());
88+
Assertions.assertNotNull(manager.getTriggeringPolicy());
8989
}
9090
}
9191
}

‎log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderBuilderTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package org.apache.logging.log4j.core.appender.rolling;
1818

1919
import org.apache.logging.log4j.core.appender.RollingFileAppender;
20-
import org.junit.Assert;
21-
import org.junit.Test;
20+
import org.junit.jupiter.api.Assertions;
21+
import org.junit.jupiter.api.Test;
2222

2323
public class RollingFileAppenderBuilderTest {
2424

@@ -27,6 +27,6 @@ public class RollingFileAppenderBuilderTest {
2727
*/
2828
@Test
2929
public void testDefaultImmediateFlush() {
30-
Assert.assertTrue(RollingFileAppender.newBuilder().isImmediateFlush());
30+
Assertions.assertTrue(RollingFileAppender.newBuilder().isImmediateFlush());
3131
}
3232
}

‎log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RollingFileAppenderLayoutTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818

1919
import org.apache.logging.log4j.core.appender.RollingFileAppender;
2020
import org.apache.logging.log4j.core.config.DefaultConfiguration;
21-
import org.junit.Assert;
22-
import org.junit.Test;
21+
import org.junit.jupiter.api.Assertions;
22+
import org.junit.jupiter.api.Test;
2323

2424
public class RollingFileAppenderLayoutTest {
2525

2626
@Test
2727
public void testDefaultLayout() throws Exception {
2828
// @formatter:off
29-
Assert.assertNotNull(RollingFileAppender.newBuilder()
29+
Assertions.assertNotNull(RollingFileAppender.newBuilder()
3030
.setName(RollingFileAppenderLayoutTest.class.getName())
3131
.setConfiguration(new DefaultConfiguration())
3232
.withFileName("log.txt")

‎log4j-core-test/src/test/java/org/apache/logging/log4j/core/appender/rolling/RolloverFilePatternTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
*/
1717
package org.apache.logging.log4j.core.appender.rolling;
1818

19-
import static org.junit.Assert.assertEquals;
20-
import static org.junit.Assert.assertFalse;
21-
import static org.junit.Assert.assertNull;
22-
import static org.junit.Assert.assertTrue;
19+
import static org.junit.jupiter.api.Assertions.assertEquals;
20+
import static org.junit.jupiter.api.Assertions.assertFalse;
21+
import static org.junit.jupiter.api.Assertions.assertNull;
22+
import static org.junit.jupiter.api.Assertions.assertTrue;
2323

2424
import java.util.regex.Matcher;
25-
import org.junit.Test;
25+
import org.junit.jupiter.api.Test;
2626

2727
/**
2828
* Test getEligibleFiles method.

0 commit comments

Comments
 (0)
Please sign in to comment.