From be86c9846cea8a285ba875bcb8d398519c095dbd Mon Sep 17 00:00:00 2001 From: "tomasz.kowalczewski" Date: Fri, 12 Mar 2021 20:08:31 +0100 Subject: [PATCH] Re #36: Renamed logging configuration file to not include log4j2 in the name (names will be same across logback and log4j2 test suites). --- .../test/java/pl/tkowalcz/tjahzi/log4j2/AllocationTest.java | 2 +- .../tkowalcz/tjahzi/log4j2/LokiAppenderMonitoringTest.java | 2 +- .../pl/tkowalcz/tjahzi/log4j2/LokiAppenderShutdownTest.java | 2 +- .../java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderTest.java | 5 ++--- ...nfiguration.xml => basic-appender-test-configuration.xml} | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) rename log4j2-appender/src/test/resources/{basic-appender-test-log4j2-configuration.xml => basic-appender-test-configuration.xml} (87%) diff --git a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/AllocationTest.java b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/AllocationTest.java index 508a30f..8ad1b42 100644 --- a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/AllocationTest.java +++ b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/AllocationTest.java @@ -57,7 +57,7 @@ public class AllocationTest { URI uri = getClass() .getClassLoader() - .getResource("basic-appender-test-log4j2-configuration.xml") + .getResource("basic-appender-test-configuration.xml") .toURI(); ((org.apache.logging.log4j.core.LoggerContext) LogManager.getContext(false)) diff --git a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderMonitoringTest.java b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderMonitoringTest.java index abd007d..4bdbd95 100644 --- a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderMonitoringTest.java +++ b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderMonitoringTest.java @@ -23,7 +23,7 @@ class LokiAppenderMonitoringTest { // Given URI uri = getClass() .getClassLoader() - .getResource("basic-appender-test-log4j2-configuration.xml") + .getResource("basic-appender-test-configuration.xml") .toURI(); LoggerContext context = (LoggerContext) LogManager.getContext(false); diff --git a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderShutdownTest.java b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderShutdownTest.java index abea607..7dd0744 100644 --- a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderShutdownTest.java +++ b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderShutdownTest.java @@ -40,7 +40,7 @@ class LokiAppenderShutdownTest { URI uri = getClass() .getClassLoader() - .getResource("basic-appender-test-log4j2-configuration.xml") + .getResource("basic-appender-test-configuration.xml") .toURI(); ((org.apache.logging.log4j.core.LoggerContext) LogManager.getContext(false)) diff --git a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderTest.java b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderTest.java index 023dac9..baf8834 100644 --- a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderTest.java +++ b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/LokiAppenderTest.java @@ -17,7 +17,6 @@ import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; import java.net.URI; -import java.net.URISyntaxException; import java.util.List; import java.util.concurrent.TimeUnit; @@ -41,14 +40,14 @@ class LokiAppenderTest { .withExposedPorts(3100); @Test - void shouldSendData() throws URISyntaxException { + void shouldSendData() throws Exception { // Given System.setProperty("loki.host", loki.getHost()); System.setProperty("loki.port", loki.getFirstMappedPort().toString()); URI uri = getClass() .getClassLoader() - .getResource("basic-appender-test-log4j2-configuration.xml") + .getResource("basic-appender-test-configuration.xml") .toURI(); ((org.apache.logging.log4j.core.LoggerContext) LogManager.getContext(false)) diff --git a/log4j2-appender/src/test/resources/basic-appender-test-log4j2-configuration.xml b/log4j2-appender/src/test/resources/basic-appender-test-configuration.xml similarity index 87% rename from log4j2-appender/src/test/resources/basic-appender-test-log4j2-configuration.xml rename to log4j2-appender/src/test/resources/basic-appender-test-configuration.xml index b481161..ce125fc 100644 --- a/log4j2-appender/src/test/resources/basic-appender-test-log4j2-configuration.xml +++ b/log4j2-appender/src/test/resources/basic-appender-test-configuration.xml @@ -1,5 +1,5 @@ - +