diff --git a/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LokiAppenderReloadTest.java b/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LokiAppenderReloadTest.java index de8fbc6..a08d9fa 100644 --- a/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LokiAppenderReloadTest.java +++ b/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LokiAppenderReloadTest.java @@ -16,6 +16,7 @@ import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; +import java.io.File; import java.net.URI; import java.nio.file.Files; import java.nio.file.Paths; @@ -55,7 +56,7 @@ class LokiAppenderReloadTest { .getResource("appender-test-reload-after.xml") .toURI(); - URI uri = new URI("file://" + Paths.get(uriBefore).toFile().getParent() + "/appender-test-reload.xml"); + URI uri = new File(Paths.get(uriBefore).toFile().getParent(), "appender-test-reload.xml").toURI(); Files.copy(Paths.get(uriBefore), Paths.get(uri), StandardCopyOption.REPLACE_EXISTING); LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); @@ -104,7 +105,7 @@ class LokiAppenderReloadTest { hasItems( hasItems( hasItems( - containsString("INFO LokiAppenderReloadTest - Test") + containsString("INFO p.t.t.l.LokiAppenderReloadTest - Test") ) ) ) diff --git a/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LokiAppenderShutdownTest.java b/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LokiAppenderShutdownTest.java index 7c52512..af37ab4 100644 --- a/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LokiAppenderShutdownTest.java +++ b/logback-appender/src/test/java/pl/tkowalcz/tjahzi/logback/LokiAppenderShutdownTest.java @@ -58,11 +58,11 @@ class LokiAppenderShutdownTest { String expectedLogLine = "Test"; long expectedTimestamp = System.currentTimeMillis(); - Logger logger = context.getLogger(LokiAppenderReloadTest.class); + Logger logger = context.getLogger(LokiAppenderShutdownTest.class); // When logger.info(expectedLogLine); - context.stop(); + ((LoggerContext) LoggerFactory.getILoggerFactory()).stop(); // Then RestAssured.port = loki.getFirstMappedPort(); @@ -93,7 +93,7 @@ class LokiAppenderShutdownTest { hasItems( hasItems( hasItems( - containsString("INFO LokiAppenderShutdownTest - Test") + containsString("INFO p.t.t.l.LokiAppenderShutdownTest - Test") ) ) ) diff --git a/logback-appender/src/test/resources/appender-test-reload-after.xml b/logback-appender/src/test/resources/appender-test-reload-after.xml index 916fd84..2de7979 100644 --- a/logback-appender/src/test/resources/appender-test-reload-after.xml +++ b/logback-appender/src/test/resources/appender-test-reload-after.xml @@ -1,26 +1,28 @@ - - - - - + + - - - - + 2 + 1000 - - - ${sys:loki.host} - ${sys:loki.port} + ${loki.host} + ${loki.port} - - - %X{tid} [%t] %d{MM-dd HH:mm:ss.SSS} %5p %c{1} - %m%n%exception{full} - + + %-4relative [%thread] %-5level %logger{35} - %msg%n + -
-