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%2FLog4jAppContextIT.java;h=1eea96dedf267b9302b1ce4511bc54a7d9769aec;hb=eca27046b6f32c55dc7ceccb0821431c9be9f3af;hp=00e8b37be0b617a1905f1d06e8ec144cf0f2e110;hpb=88282100495351d3bbdc08743cf6fc6c311163bb;p=lttng-ust-java-tests.git diff --git a/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/context/Log4jAppContextIT.java b/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/context/Log4jAppContextIT.java index 00e8b37..1eea96d 100644 --- a/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/context/Log4jAppContextIT.java +++ b/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/context/Log4jAppContextIT.java @@ -18,8 +18,6 @@ package org.lttng.ust.agent.integration.context; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import org.apache.log4j.Appender; @@ -30,10 +28,8 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.lttng.tools.ILttngSession.Domain; -import org.lttng.tools.LttngToolsHelper; import org.lttng.ust.agent.log4j.LttngLogAppender; import org.lttng.ust.agent.utils.Log4jTestUtils; -import org.lttng.ust.agent.utils.LttngUtils; /** * Enabled app contexts test for the LTTng-UST JUL log handler. @@ -48,20 +44,16 @@ public class Log4jAppContextIT extends AppContextITBase { * Class setup */ @BeforeClass - public static void julClassSetup() { - /* Make sure we can find the JNI library and lttng-tools */ - assertTrue(Log4jTestUtils.checkForLog4jLibrary()); - assertTrue(LttngUtils.checkForLttngTools(Domain.LOG4J)); - - LttngToolsHelper.destroyAllSessions(); + public static void log4jClassSetup() { + Log4jTestUtils.testClassSetup(); } /** * Class cleanup */ @AfterClass - public static void julClassCleanup() { - LttngToolsHelper.deleteAllTraces(); + public static void log4jClassCleanup() { + Log4jTestUtils.testClassCleanup(); } /**