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

diff --git a/lttng-ust-java-tests-log4j2/src/test/java/org/lttng/ust/agent/integration/events/Log4j2MultiSessionIT.java b/lttng-ust-java-tests-log4j2/src/test/java/org/lttng/ust/agent/integration/events/Log4j2MultiSessionIT.java
index 36eb435..1d2c998 100644
--- a/lttng-ust-java-tests-log4j2/src/test/java/org/lttng/ust/agent/integration/events/Log4j2MultiSessionIT.java
+++ b/lttng-ust-java-tests-log4j2/src/test/java/org/lttng/ust/agent/integration/events/Log4j2MultiSessionIT.java
@@ -18,107 +18,19 @@
 
 package org.lttng.ust.agent.integration.events;
 
-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;
+
 
 /**
  * Log4j tests for multiple concurrent tracing sessions
  */
-public class Log4j2MultiSessionIT extends MultiSessionITBase {
-
-    private static final String APPENDER_NAME_A = "LttngA";
-    private static final String APPENDER_NAME_B = "LttngB";
-    private static final String APPENDER_NAME_C = "LttngC";
-    private static final String APPENDER_NAME_D = "LttngD";
-
-    private static final Domain DOMAIN = Domain.LOG4J;
-
-    private Log4j2TestContext testContext;
-
-    private Logger loggerA;
-    private Logger loggerB;
-    private Logger loggerC;
-    private Logger loggerD;
-
-    /**
-     * 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.Log4j2MultiSessionIT.xml");
-
-        testContext.beforeTest();
-
-        loggerA = testContext.getLoggerContext().getLogger(EVENT_NAME_A);
-        loggerB = testContext.getLoggerContext().getLogger(EVENT_NAME_B);
-        loggerC = testContext.getLoggerContext().getLogger(EVENT_NAME_C);
-        loggerD = testContext.getLoggerContext().getLogger(EVENT_NAME_D);
-
-        handlerA = (ILttngHandler) loggerA.getAppenders().get(APPENDER_NAME_A);
-        handlerB = (ILttngHandler) loggerB.getAppenders().get(APPENDER_NAME_B);
-        handlerC = (ILttngHandler) loggerC.getAppenders().get(APPENDER_NAME_C);
-        handlerD = (ILttngHandler) loggerD.getAppenders().get(APPENDER_NAME_D);
-    }
-
-    /**
-     * Test teardown
-     */
-    @AfterEach
-    public void log4j2Teardown() {
-        loggerA = null;
-        loggerB = null;
-        loggerC = null;
-        loggerD = null;
-
-        testContext.afterTest();
-    }
+@Tag("agent:log4j2")
+@Tag("domain:log4j2")
+public class Log4j2MultiSessionIT extends Log4j2MultiSessionITBase {
 
     @Override
     protected Domain getDomain() {
-        return DOMAIN;
-    }
-
-    @Override
-    protected boolean closeHandlers()
-    {
-        return false;
-    }
-
-    @Override
-    protected void sendEventsToLoggers() {
-        Log4j2TestUtils.send10Events(loggerA);
-        Log4j2TestUtils.send10Events(loggerB);
-        Log4j2TestUtils.send10Events(loggerC);
-        Log4j2TestUtils.send10Events(loggerD);
+        return Domain.LOG4J2;
     }
 }