X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=lttng-ust-java-tests-log4j%2Fsrc%2Ftest%2Fjava%2Forg%2Flttng%2Fust%2Fagent%2Fintegration%2Fcontext%2FLog4jAppContextOrderingIT.java;h=02e0ceaa85b605e9eb5deaf3e39a5ebe523afd95;hb=7a4f0255e3d52ad76b194fb2e83bcdc6f641549e;hp=44a93a829893613b68d99b368cacb82b7d300b3e;hpb=7bd5724a34cb45dabe914c1ee2ec83964ce1d455;p=lttng-ust-java-tests.git diff --git a/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/context/Log4jAppContextOrderingIT.java b/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/context/Log4jAppContextOrderingIT.java index 44a93a8..02e0cea 100644 --- a/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/context/Log4jAppContextOrderingIT.java +++ b/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/context/Log4jAppContextOrderingIT.java @@ -18,16 +18,16 @@ package org.lttng.ust.agent.integration.context; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import org.apache.log4j.Appender; import org.apache.log4j.Level; import org.apache.log4j.Logger; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; import org.lttng.tools.ILttngSession.Domain; import org.lttng.ust.agent.log4j.LttngLogAppender; import org.lttng.ust.agent.utils.Log4jTestUtils; @@ -42,7 +42,7 @@ public class Log4jAppContextOrderingIT extends AppContextOrderingITBase { /** * Class setup */ - @BeforeClass + @BeforeAll public static void log4jClassSetup() { Log4jTestUtils.testClassSetup(); } @@ -50,7 +50,7 @@ public class Log4jAppContextOrderingIT extends AppContextOrderingITBase { /** * Class cleanup */ - @AfterClass + @AfterAll public static void log4jClassCleanup() { Log4jTestUtils.testClassCleanup(); } @@ -58,7 +58,7 @@ public class Log4jAppContextOrderingIT extends AppContextOrderingITBase { /** * Test teardown */ - @After + @AfterEach public void log4jTeardown() { logger.removeAppender((Appender) logHandler); logger = null;