You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ck...@apache.org on 2020/12/06 22:10:09 UTC
[logging-log4j2] branch release-2.x updated: Update
AbstractLoggerTest uncommenting java8 tests
This is an automated email from the ASF dual-hosted git repository.
ckozak 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 88edda6 Update AbstractLoggerTest uncommenting java8 tests
88edda6 is described below
commit 88edda6dd1564dcbe0d42d2ae476956f8bf8dfbf
Author: Carter Kozak <ck...@apache.org>
AuthorDate: Sun Nov 29 14:51:46 2020 -0500
Update AbstractLoggerTest uncommenting java8 tests
---
log4j-jul/pom.xml | 5 ++
.../logging/log4j/jul/AbstractLoggerTest.java | 84 +++++++++++-----------
2 files changed, 45 insertions(+), 44 deletions(-)
diff --git a/log4j-jul/pom.xml b/log4j-jul/pom.xml
index 2b694b2..ea15019 100644
--- a/log4j-jul/pom.xml
+++ b/log4j-jul/pom.xml
@@ -57,6 +57,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
diff --git a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/AbstractLoggerTest.java b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/AbstractLoggerTest.java
index ef69728..a90c338 100644
--- a/log4j-jul/src/test/java/org/apache/logging/log4j/jul/AbstractLoggerTest.java
+++ b/log4j-jul/src/test/java/org/apache/logging/log4j/jul/AbstractLoggerTest.java
@@ -26,10 +26,7 @@ import org.apache.logging.log4j.core.impl.Log4jLogEvent;
import org.apache.logging.log4j.test.appender.ListAppender;
import org.junit.Test;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
/**
*
@@ -43,7 +40,7 @@ public abstract class AbstractLoggerTest {
@Test
public void testGetName() throws Exception {
- assertThat(logger.getName(), equalTo(LOGGER_NAME));
+ assertThat(logger.getName()).isEqualTo(LOGGER_NAME);
}
@Test
@@ -53,35 +50,35 @@ public abstract class AbstractLoggerTest {
root.config("Test info message");
root.fine("Test info message");
final List<LogEvent> events = eventAppender.getEvents();
- assertThat(events, hasSize(3));
+ assertThat(events).hasSize(3);
for (final LogEvent event : events) {
final String message = event.getMessage().getFormattedMessage();
- assertThat(message, equalTo("Test info message"));
+ assertThat(message).isEqualTo("Test info message");
}
}
@Test
public void testGlobalLoggerName() throws Exception {
final Logger root = Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
- assertThat(root.getName(), equalTo(Logger.GLOBAL_LOGGER_NAME));
+ assertThat(root.getName()).isEqualTo(Logger.GLOBAL_LOGGER_NAME);
}
@Test
public void testIsLoggable() throws Exception {
- assertThat(logger.isLoggable(java.util.logging.Level.SEVERE), equalTo(true));
+ assertThat(logger.isLoggable(java.util.logging.Level.SEVERE)).isTrue();
}
@Test
public void testLog() throws Exception {
logger.info("Informative message here.");
final List<LogEvent> events = eventAppender.getEvents();
- assertThat(events, hasSize(1));
+ assertThat(events).hasSize(1);
final LogEvent event = events.get(0);
- assertThat(event, instanceOf(Log4jLogEvent.class));
- assertEquals(Level.INFO, event.getLevel());
- assertEquals(LOGGER_NAME, event.getLoggerName());
- assertEquals("Informative message here.", event.getMessage().getFormattedMessage());
- assertEquals(ApiLogger.class.getName(), event.getLoggerFqcn());
+ assertThat(event).isInstanceOf(Log4jLogEvent.class);
+ assertThat(event.getLevel()).isEqualTo(Level.INFO);
+ assertThat(event.getLoggerName()).isEqualTo(LOGGER_NAME);
+ assertThat(event.getMessage().getFormattedMessage()).isEqualTo("Informative message here.");
+ assertThat(event.getLoggerFqcn()).isEqualTo(ApiLogger.class.getName());
}
@Test
@@ -95,7 +92,7 @@ public abstract class AbstractLoggerTest {
logger.finer("Informative message here.");
logger.finest("Informative message here.");
final List<LogEvent> events = eventAppender.getEvents();
- assertThat(events, hasSize(0));
+ assertThat(events).isEmpty();
}
@Test
@@ -103,13 +100,13 @@ public abstract class AbstractLoggerTest {
logger.setFilter(record -> { record.setMessage("This is not the message you are looking for."); return true; });
logger.info("Informative message here.");
final List<LogEvent> events = eventAppender.getEvents();
- assertThat(events, hasSize(1));
+ assertThat(events).hasSize(1);
final LogEvent event = events.get(0);
- assertThat(event, instanceOf(Log4jLogEvent.class));
- assertEquals(Level.INFO, event.getLevel());
- assertEquals(LOGGER_NAME, event.getLoggerName());
- assertEquals("This is not the message you are looking for.", event.getMessage().getFormattedMessage());
- assertEquals(ApiLogger.class.getName(), event.getLoggerFqcn());
+ assertThat(event).isInstanceOf(Log4jLogEvent.class);
+ assertThat(event.getLevel()).isEqualTo(Level.INFO);
+ assertThat(event.getLoggerName()).isEqualTo(LOGGER_NAME);
+ assertThat(event.getMessage().getFormattedMessage()).isEqualTo("This is not the message you are looking for.");
+ assertThat(event.getLoggerFqcn()).isEqualTo(ApiLogger.class.getName());
}
@Test
@@ -117,16 +114,16 @@ public abstract class AbstractLoggerTest {
final Logger flowLogger = Logger.getLogger("TestFlow");
flowLogger.logp(java.util.logging.Level.FINER, "sourceClass", "sourceMethod", "ENTER {0}", "params");
final List<LogEvent> events = flowAppender.getEvents();
- assertEquals("ENTER params", events.get(0).getMessage().getFormattedMessage());
+ assertThat(events.get(0).getMessage().getFormattedMessage()).isEqualTo("ENTER params");
}
@Test
public void testLogUsingCustomLevel() throws Exception {
logger.config("Config level");
final List<LogEvent> events = eventAppender.getEvents();
- assertThat(events, hasSize(1));
+ assertThat(events).hasSize(1);
final LogEvent event = events.get(0);
- assertThat(event.getLevel(), equalTo(LevelTranslator.CONFIG));
+ assertThat(event.getLevel()).isEqualTo(LevelTranslator.CONFIG);
}
@Test
@@ -134,9 +131,9 @@ public abstract class AbstractLoggerTest {
final Logger log = Logger.getLogger("Test.CallerClass");
log.config("Calling from LoggerTest");
final List<String> messages = stringAppender.getMessages();
- assertThat(messages, hasSize(1));
+ assertThat(messages).hasSize(1);
final String message = messages.get(0);
- assertEquals(AbstractLoggerTest.class.getName(), message);
+ assertThat(message).isEqualTo(AbstractLoggerTest.class.getName());
}
@Test
@@ -160,10 +157,10 @@ public abstract class AbstractLoggerTest {
root.config("Test info " + string);
root.fine("Test info " + string);
final List<LogEvent> events = eventAppender.getEvents();
- assertThat(events, hasSize(3));
+ assertThat(events).hasSize(3);
for (final LogEvent event : events) {
final String message = event.getMessage().getFormattedMessage();
- assertThat(message, equalTo("Test info " + string));
+ assertThat(message).isEqualTo("Test info " + string);
}
}
@@ -175,10 +172,10 @@ public abstract class AbstractLoggerTest {
flowLogger.entering("com.example.TestSourceClass3", "testSourceMethod3(String)",
new Object[] { "TestParam0", "TestParam1" });
final List<LogEvent> events = flowAppender.getEvents();
- assertThat(events, hasSize(3));
- assertEquals("Enter", events.get(0).getMessage().getFormattedMessage());
- assertEquals("Enter params(TestParam)", events.get(1).getMessage().getFormattedMessage());
- assertEquals("Enter params(TestParam0, TestParam1)", events.get(2).getMessage().getFormattedMessage());
+ assertThat(events).hasSize(3);
+ assertThat(events.get(0).getMessage().getFormattedMessage()).isEqualTo("Enter");
+ assertThat(events.get(1).getMessage().getFormattedMessage()).isEqualTo("Enter params(TestParam)");
+ assertThat(events.get(2).getMessage().getFormattedMessage()).isEqualTo("Enter params(TestParam0, TestParam1)");
}
@Test
@@ -202,17 +199,16 @@ public abstract class AbstractLoggerTest {
}
private void testLambdaMessages(final String string) {
- // TODO FOR JAVA 8
- // final Logger root = Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
- // root.info(() -> "Test info " + string);
- // root.config(() -> "Test info " + string);
- // root.fine(() -> "Test info " + string);
- // final List<LogEvent> events = eventAppender.getEvents();
- // assertThat(events, hasSize(3));
- // for (final LogEvent event : events) {
- // final String message = event.getMessage().getFormattedMessage();
- // assertThat(message, equalTo("Test info " + string));
- // }
+ final Logger root = Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
+ root.info(() -> "Test info " + string);
+ root.config(() -> "Test info " + string);
+ root.fine(() -> "Test info " + string);
+ final List<LogEvent> events = eventAppender.getEvents();
+ assertThat(events).hasSize(3);
+ for (final LogEvent event : events) {
+ final String message = event.getMessage().getFormattedMessage();
+ assertThat(message).isEqualTo("Test info " + string);
+ }
}
}