X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-ust-java-tests-log4j2%2Fsrc%2Ftest%2Fjava%2Forg%2Flttng%2Fust%2Fagent%2Fintegration%2Fcontext%2FLog4j2AppContextIT.java;h=f215aa43809b3158d55f2089874c34f662187fac;hb=9db2c69aaa0ba078f044266dae8e0b92a6e98357;hp=7a00b4b2fe91eec78cb596f6076ec3164bc40d55;hpb=7a4f0255e3d52ad76b194fb2e83bcdc6f641549e;p=lttng-ust-java-tests.git

diff --git a/lttng-ust-java-tests-log4j2/src/test/java/org/lttng/ust/agent/integration/context/Log4j2AppContextIT.java b/lttng-ust-java-tests-log4j2/src/test/java/org/lttng/ust/agent/integration/context/Log4j2AppContextIT.java
index 7a00b4b..f215aa4 100644
--- a/lttng-ust-java-tests-log4j2/src/test/java/org/lttng/ust/agent/integration/context/Log4j2AppContextIT.java
+++ b/lttng-ust-java-tests-log4j2/src/test/java/org/lttng/ust/agent/integration/context/Log4j2AppContextIT.java
@@ -18,84 +18,19 @@
 
 package org.lttng.ust.agent.integration.context;
 
-import java.io.IOException;
-
-import org.apache.logging.log4j.core.Logger;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
 import org.lttng.tools.ILttngSession.Domain;
-import org.lttng.ust.agent.ILttngHandler;
-import org.lttng.ust.agent.utils.Log4j2TestContext;
-import org.lttng.ust.agent.utils.Log4j2TestUtils;
+
 
 /**
  * Enabled app contexts test for the LTTng-UST Log4j 2.x log handler.
  */
-public class Log4j2AppContextIT extends AppContextITBase {
-
-    private static final Domain DOMAIN = Domain.LOG4J;
-
-    private Log4j2TestContext testContext;
-    private Logger logger;
-
-    /**
-     * Class setup
-     */
-    @BeforeAll
-    public static void log4j2ClassSetup() {
-        Log4j2TestUtils.testClassSetup();
-    }
-
-    /**
-     * Class cleanup
-     */
-    @AfterAll
-    public static void log4j2ClassCleanup() {
-        Log4j2TestUtils.testClassCleanup();
-    }
-
-    /**
-     * Test setup
-     *
-     * @throws SecurityException
-     * @throws IOException
-     */
-    @SuppressWarnings("resource")
-    @BeforeEach
-    public void log4j2Setup() throws SecurityException, IOException {
-        testContext = new Log4j2TestContext("log4j2.Log4j2AppContextIT.xml");
-
-        testContext.beforeTest();
-
-        logger = testContext.getLoggerContext().getLogger(EVENT_NAME);
-
-        logHandler = (ILttngHandler) logger.getAppenders().get("Lttng");
-    }
-
-    /**
-     * Test teardown
-     */
-    @AfterEach
-    public void log4j2Teardown() {
-        testContext.afterTest();
-        logger = null;
-    }
+@Tag("agent:log4j2")
+@Tag("domain:log4j2")
+public class Log4j2AppContextIT extends Log4j2AppContextITBase {
 
     @Override
     protected Domain getDomain() {
-        return DOMAIN;
-    }
-
-    @Override
-    protected boolean closeHandlers()
-    {
-        return false;
-    }
-
-    @Override
-    protected void sendEventsToLoggers() {
-        Log4j2TestUtils.send10Events(logger);
+        return Domain.LOG4J2;
     }
 }