Skip to content

Commit 158f644

Browse files
jamezpjamezp
authored
Merge pull request #14 from jamezp/issue13
[#13] Migrate from JUnit 4 to JUnit 5.
2 parents a79edc8 + bb613bf commit 158f644

File tree

8 files changed

+113
-101
lines changed

8 files changed

+113
-101
lines changed

‎pom.xml‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</licenses>
4343

4444
<properties>
45-
<version.junit>4.12</version.junit>
45+
<version.org.junit>5.7.0</version.org.junit>
4646
<version.org.apache.logging.log4j>2.13.3</version.org.apache.logging.log4j>
4747
<version.org.jboss.logmanager.jboss-logmanager>2.1.17.Final</version.org.jboss.logmanager.jboss-logmanager>
4848

@@ -52,6 +52,18 @@
5252
<jdk.min.version>1.8</jdk.min.version>
5353
</properties>
5454

55+
<dependencyManagement>
56+
<dependencies>
57+
<dependency>
58+
<groupId>org.junit</groupId>
59+
<artifactId>junit-bom</artifactId>
60+
<version>${version.org.junit}</version>
61+
<type>pom</type>
62+
<scope>import</scope>
63+
</dependency>
64+
</dependencies>
65+
</dependencyManagement>
66+
5567
<dependencies>
5668
<dependency>
5769
<groupId>org.apache.logging.log4j</groupId>
@@ -66,9 +78,8 @@
6678

6779
<!-- Test dependencies -->
6880
<dependency>
69-
<groupId>junit</groupId>
70-
<artifactId>junit</artifactId>
71-
<version>${version.junit}</version>
81+
<groupId>org.junit.jupiter</groupId>
82+
<artifactId>junit-jupiter</artifactId>
7283
<scope>test</scope>
7384
</dependency>
7485
</dependencies>

‎src/test/java/org/jboss/logmanager/log4j/AbstractTestCase.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
import org.jboss.logmanager.ExtLogRecord;
2828
import org.jboss.logmanager.LogContext;
2929
import org.jboss.logmanager.LogContextSelector;
30-
import org.junit.After;
31-
import org.junit.Before;
30+
import org.junit.jupiter.api.AfterEach;
31+
import org.junit.jupiter.api.BeforeEach;
3232

3333
/**
3434
* @author <a href="mailto:[email protected]">James R. Perkins</a>
@@ -48,12 +48,12 @@ public LogContext getLogContext() {
4848
}
4949
}
5050

51-
@Before
51+
@BeforeEach
5252
public void logContextSetup() {
5353
LogContext.setLogContextSelector(new TestLogContextSelector(LogContext.create()));
5454
}
5555

56-
@After
56+
@AfterEach
5757
public void resetLogContext() {
5858
LogContext.setLogContextSelector(LogContext.DEFAULT_LOG_CONTEXT_SELECTOR);
5959
}

‎src/test/java/org/jboss/logmanager/log4j/LevelTranslatorTestCase.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
package org.jboss.logmanager.log4j;
2121

2222
import org.apache.logging.log4j.Level;
23-
import org.junit.Assert;
24-
import org.junit.Test;
23+
import org.junit.jupiter.api.Assertions;
24+
import org.junit.jupiter.api.Test;
2525

2626
/**
2727
* @author <a href="mailto:[email protected]">James R. Perkins</a>
@@ -79,22 +79,22 @@ public void testAll() {
7979

8080
@Test
8181
public void testNull() {
82-
Assert.assertEquals("Expected null log4j level to map to INFO",
83-
org.jboss.logmanager.Level.DEBUG, levelTranslator.translateLevel((Level) null));
84-
Assert.assertEquals("Expected null JUL level to map to INFO",
85-
Level.DEBUG, levelTranslator.translateLevel((java.util.logging.Level) null));
86-
Assert.assertEquals("Expected a -1 effective level to map to INFO",
87-
Level.DEBUG, levelTranslator.translateLevel(-1));
82+
Assertions.assertEquals(org.jboss.logmanager.Level.DEBUG, levelTranslator.translateLevel((Level) null),
83+
"Expected null log4j level to map to INFO");
84+
Assertions.assertEquals(Level.DEBUG, levelTranslator.translateLevel((java.util.logging.Level) null),
85+
"Expected null JUL level to map to INFO");
86+
Assertions.assertEquals(Level.DEBUG, levelTranslator.translateLevel(-1), "" +
87+
"Expected a -1 effective level to map to INFO");
8888
}
8989

9090
private void testLevel(final Level log4jLevel, final java.util.logging.Level julLevel) {
9191
testLevel(log4jLevel, julLevel, julLevel);
9292
}
9393

9494
private void testLevel(final Level log4jLevel, final java.util.logging.Level julLevel, final java.util.logging.Level expectedJulLevel) {
95-
Assert.assertEquals(String.format("Expected log4j level %s to equal JUL level %s", log4jLevel, julLevel),
96-
log4jLevel, levelTranslator.translateLevel(julLevel));
97-
Assert.assertEquals(String.format("Expected JUL level %s to equal log4j level %s", julLevel, log4jLevel),
98-
expectedJulLevel, levelTranslator.translateLevel(log4jLevel));
95+
Assertions.assertEquals(log4jLevel, levelTranslator.translateLevel(julLevel),
96+
String.format("Expected log4j level %s to equal JUL level %s", log4jLevel, julLevel));
97+
Assertions.assertEquals(expectedJulLevel, levelTranslator.translateLevel(log4jLevel),
98+
String.format("Expected JUL level %s to equal log4j level %s", julLevel, log4jLevel));
9999
}
100100
}

‎src/test/java/org/jboss/logmanager/log4j/LoggerContextFactoryTestCase.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
import org.apache.logging.log4j.LogManager;
2323
import org.apache.logging.log4j.spi.LoggerContextFactory;
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
/**
2828
* @author <a href="mailto:[email protected]">James R. Perkins</a>
@@ -32,6 +32,6 @@ public class LoggerContextFactoryTestCase {
3232
@Test
3333
public void testCorrectFactory() {
3434
final LoggerContextFactory factory = LogManager.getFactory();
35-
Assert.assertEquals(JBossLoggerContextFactory.class, factory.getClass());
35+
Assertions.assertEquals(JBossLoggerContextFactory.class, factory.getClass());
3636
}
3737
}

‎src/test/java/org/jboss/logmanager/log4j/LoggerContextTestCase.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.apache.logging.log4j.Logger;
2424
import org.apache.logging.log4j.message.StringFormatterMessageFactory;
2525
import org.apache.logging.log4j.spi.LoggerContext;
26-
import org.junit.Assert;
27-
import org.junit.Test;
26+
import org.junit.jupiter.api.Assertions;
27+
import org.junit.jupiter.api.Test;
2828

2929
/**
3030
* @author <a href="mailto:[email protected]">James R. Perkins</a>
@@ -35,16 +35,16 @@ public class LoggerContextTestCase extends AbstractTestCase {
3535
public void testHasLogger() {
3636
final LoggerContext loggerContext = LogManager.getContext();
3737
final Logger logger = LogManager.getFormatterLogger(LoggerTestCase.class);
38-
Assert.assertFalse(loggerContext.hasLogger("org.jboss.logmanager"));
39-
Assert.assertFalse(loggerContext.hasLogger(logger.getName()));
40-
Assert.assertTrue(loggerContext.hasLogger(logger.getName(), StringFormatterMessageFactory.INSTANCE));
41-
Assert.assertTrue(loggerContext.hasLogger(logger.getName(), StringFormatterMessageFactory.class));
38+
Assertions.assertFalse(loggerContext.hasLogger("org.jboss.logmanager"));
39+
Assertions.assertFalse(loggerContext.hasLogger(logger.getName()));
40+
Assertions.assertTrue(loggerContext.hasLogger(logger.getName(), StringFormatterMessageFactory.INSTANCE));
41+
Assertions.assertTrue(loggerContext.hasLogger(logger.getName(), StringFormatterMessageFactory.class));
4242
}
4343

4444
@Test
4545
public void testExternalContext() {
4646
final Object externalContext = new Object();
4747
final LoggerContext loggerContext = LogManager.getContext(LoggerContextTestCase.class.getClassLoader(), true, externalContext);
48-
Assert.assertEquals(externalContext, loggerContext.getExternalContext());
48+
Assertions.assertEquals(externalContext, loggerContext.getExternalContext());
4949
}
5050
}

‎src/test/java/org/jboss/logmanager/log4j/LoggerTestCase.java‎

Lines changed: 51 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
import org.apache.logging.log4j.message.MessageFactory;
3535
import org.apache.logging.log4j.message.MessageFactory2;
3636
import org.jboss.logmanager.ExtLogRecord;
37-
import org.junit.After;
38-
import org.junit.Assert;
39-
import org.junit.Before;
40-
import org.junit.Test;
37+
import org.junit.jupiter.api.AfterEach;
38+
import org.junit.jupiter.api.Assertions;
39+
import org.junit.jupiter.api.BeforeEach;
40+
import org.junit.jupiter.api.Test;
4141

4242
/**
4343
* @author <a href="mailto:[email protected]">James R. Perkins</a>
@@ -49,7 +49,7 @@ public class LoggerTestCase extends AbstractTestCase {
4949
private TestQueueHandler handler;
5050
private org.jboss.logmanager.Logger lmLogger;
5151

52-
@Before
52+
@BeforeEach
5353
public void setup() {
5454
lmLogger = org.jboss.logmanager.Logger.getLogger("org.jboss.logmanager.log4j");
5555
lmLogger.setLevel(java.util.logging.Level.INFO);
@@ -58,7 +58,7 @@ public void setup() {
5858
this.handler = handler;
5959
}
6060

61-
@After
61+
@AfterEach
6262
public void tearDown() {
6363
handler.close();
6464
lmLogger.removeHandler(handler);
@@ -69,46 +69,47 @@ public void testNamedLogger() {
6969
final Logger logger = LogManager.getLogger(loggerName);
7070
logger.info("Test message");
7171
ExtLogRecord record = handler.poll();
72-
Assert.assertNotNull(record);
73-
Assert.assertEquals("Test message", record.getMessage());
72+
Assertions.assertNotNull(record);
73+
Assertions.assertEquals("Test message", record.getMessage());
7474

7575
logger.info("Test message parameter {}", 1);
7676
record = handler.poll();
77-
Assert.assertNotNull(record);
78-
Assert.assertEquals("Test message parameter 1", record.getMessage());
77+
Assertions.assertNotNull(record);
78+
Assertions.assertEquals("Test message parameter 1", record.getMessage());
7979
}
8080

81+
@SuppressWarnings("PlaceholderCountMatchesArgumentCount")
8182
@Test
8283
public void testNamedFormatterLogger() {
8384
final Logger logger = LogManager.getFormatterLogger(loggerName);
8485
logger.info("Test message parameter %s", 1);
8586
final ExtLogRecord record = handler.poll();
86-
Assert.assertNotNull(record);
87-
Assert.assertEquals("Test message parameter 1", record.getMessage());
87+
Assertions.assertNotNull(record);
88+
Assertions.assertEquals("Test message parameter 1", record.getMessage());
8889
}
8990

9091
@Test
9192
public void testCurrentClassLogger() {
9293
final String expectedName = LoggerTestCase.class.getName();
9394
final Logger logger = LogManager.getLogger();
94-
Assert.assertEquals(expectedName, logger.getName());
95+
Assertions.assertEquals(expectedName, logger.getName());
9596
logger.info("Test message");
9697
final ExtLogRecord record = handler.poll();
97-
Assert.assertNotNull(record);
98-
Assert.assertEquals("Test message", record.getMessage());
99-
Assert.assertEquals(expectedName, record.getLoggerName());
98+
Assertions.assertNotNull(record);
99+
Assertions.assertEquals("Test message", record.getMessage());
100+
Assertions.assertEquals(expectedName, record.getLoggerName());
100101
}
101102

102103
@Test
103104
public void testObjectLogger() {
104105
final String expectedName = LoggerTestCase.class.getName();
105106
final Logger logger = LogManager.getLogger(this);
106-
Assert.assertEquals(expectedName, logger.getName());
107+
Assertions.assertEquals(expectedName, logger.getName());
107108
logger.info("Test message");
108109
final ExtLogRecord record = handler.poll();
109-
Assert.assertNotNull(record);
110-
Assert.assertEquals("Test message", record.getMessage());
111-
Assert.assertEquals(expectedName, record.getLoggerName());
110+
Assertions.assertNotNull(record);
111+
Assertions.assertEquals("Test message", record.getMessage());
112+
Assertions.assertEquals(expectedName, record.getLoggerName());
112113
}
113114

114115
@Test
@@ -117,12 +118,12 @@ public void testCurrentClassMessageFactoryLogger() {
117118
final String expectedName = LoggerTestCase.class.getName();
118119
final MessageFactory messageFactory = new TestMessageFactory(prefix);
119120
final Logger logger = LogManager.getLogger(messageFactory);
120-
Assert.assertEquals(expectedName, logger.getName());
121+
Assertions.assertEquals(expectedName, logger.getName());
121122
logger.info("Test message");
122123
final ExtLogRecord record = handler.poll();
123-
Assert.assertNotNull(record);
124-
Assert.assertEquals(prefix + "Test message", record.getMessage());
125-
Assert.assertEquals(expectedName, record.getLoggerName());
124+
Assertions.assertNotNull(record);
125+
Assertions.assertEquals(prefix + "Test message", record.getMessage());
126+
Assertions.assertEquals(expectedName, record.getLoggerName());
126127
}
127128

128129
@Test
@@ -131,12 +132,12 @@ public void testObjectMessageFactoryLogger() {
131132
final String expectedName = LoggerTestCase.class.getName();
132133
final MessageFactory messageFactory = new TestMessageFactory(prefix);
133134
final Logger logger = LogManager.getLogger(this, messageFactory);
134-
Assert.assertEquals(expectedName, logger.getName());
135+
Assertions.assertEquals(expectedName, logger.getName());
135136
logger.info("Test message");
136137
final ExtLogRecord record = handler.poll();
137-
Assert.assertNotNull(record);
138-
Assert.assertEquals(prefix + "Test message", record.getMessage());
139-
Assert.assertEquals(expectedName, record.getLoggerName());
138+
Assertions.assertNotNull(record);
139+
Assertions.assertEquals(prefix + "Test message", record.getMessage());
140+
Assertions.assertEquals(expectedName, record.getLoggerName());
140141
}
141142

142143
@Test
@@ -145,12 +146,12 @@ public void testNamedMessageFactoryLogger() {
145146
final String expectedName = loggerName;
146147
final MessageFactory messageFactory = new TestMessageFactory(prefix);
147148
final Logger logger = LogManager.getLogger(loggerName, messageFactory);
148-
Assert.assertEquals(expectedName, logger.getName());
149+
Assertions.assertEquals(expectedName, logger.getName());
149150
logger.info("Test message");
150151
final ExtLogRecord record = handler.poll();
151-
Assert.assertNotNull(record);
152-
Assert.assertEquals(prefix + "Test message", record.getMessage());
153-
Assert.assertEquals(expectedName, record.getLoggerName());
152+
Assertions.assertNotNull(record);
153+
Assertions.assertEquals(prefix + "Test message", record.getMessage());
154+
Assertions.assertEquals(expectedName, record.getLoggerName());
154155
}
155156

156157
@Test
@@ -159,12 +160,12 @@ public void tesTypeMessageFactoryLogger() {
159160
final String expectedName = LoggerTestCase.class.getName();
160161
final MessageFactory messageFactory = new TestMessageFactory(prefix);
161162
final Logger logger = LogManager.getLogger(LoggerTestCase.class, messageFactory);
162-
Assert.assertEquals(expectedName, logger.getName());
163+
Assertions.assertEquals(expectedName, logger.getName());
163164
logger.info("Test message");
164165
final ExtLogRecord record = handler.poll();
165-
Assert.assertNotNull(record);
166-
Assert.assertEquals(prefix + "Test message", record.getMessage());
167-
Assert.assertEquals(expectedName, record.getLoggerName());
166+
Assertions.assertNotNull(record);
167+
Assertions.assertEquals(prefix + "Test message", record.getMessage());
168+
Assertions.assertEquals(expectedName, record.getLoggerName());
168169
}
169170

170171
@Test
@@ -220,26 +221,26 @@ public void testOffEnabled() {
220221
private void testLevelEnabled(final Logger logger, final Level level) {
221222
final String msg = String.format("Expected level %s to be enabled on logger %s", level, logger);
222223
final String markerMsg = String.format("Expected level %s to be enabled on logger %s with marker %s", level, logger, marker);
223-
Assert.assertTrue(msg, logger.isEnabled(level));
224-
Assert.assertTrue(markerMsg, logger.isEnabled(level, marker));
224+
Assertions.assertTrue(logger.isEnabled(level), msg);
225+
Assertions.assertTrue(logger.isEnabled(level, marker), markerMsg);
225226
if (level.equals(Level.FATAL)) {
226-
Assert.assertTrue(msg, logger.isFatalEnabled());
227-
Assert.assertTrue(markerMsg, logger.isFatalEnabled(marker));
227+
Assertions.assertTrue(logger.isFatalEnabled(), msg);
228+
Assertions.assertTrue(logger.isFatalEnabled(marker), markerMsg);
228229
} else if (level.equals(Level.ERROR)) {
229-
Assert.assertTrue(msg, logger.isErrorEnabled());
230-
Assert.assertTrue(markerMsg, logger.isErrorEnabled(marker));
230+
Assertions.assertTrue(logger.isErrorEnabled(), msg);
231+
Assertions.assertTrue(logger.isErrorEnabled(marker), markerMsg);
231232
} else if (level.equals(Level.WARN)) {
232-
Assert.assertTrue(msg, logger.isWarnEnabled());
233-
Assert.assertTrue(markerMsg, logger.isWarnEnabled(marker));
233+
Assertions.assertTrue(logger.isWarnEnabled(), msg);
234+
Assertions.assertTrue(logger.isWarnEnabled(marker), markerMsg);
234235
} else if (level.equals(Level.INFO)) {
235-
Assert.assertTrue(msg, logger.isInfoEnabled());
236-
Assert.assertTrue(markerMsg, logger.isInfoEnabled(marker));
236+
Assertions.assertTrue(logger.isInfoEnabled(), msg);
237+
Assertions.assertTrue(logger.isInfoEnabled(marker), markerMsg);
237238
} else if (level.equals(Level.DEBUG)) {
238-
Assert.assertTrue(msg, logger.isDebugEnabled());
239-
Assert.assertTrue(markerMsg, logger.isDebugEnabled(marker));
239+
Assertions.assertTrue(logger.isDebugEnabled(), msg);
240+
Assertions.assertTrue(logger.isDebugEnabled(marker), markerMsg);
240241
} else if (level.equals(Level.TRACE)) {
241-
Assert.assertTrue(msg, logger.isTraceEnabled());
242-
Assert.assertTrue(markerMsg, logger.isTraceEnabled(marker));
242+
Assertions.assertTrue(logger.isTraceEnabled(), msg);
243+
Assertions.assertTrue(logger.isTraceEnabled(marker), markerMsg);
243244
}
244245
}
245246

0 commit comments

Comments
 (0)