package org.lttng.ust.agent.integration.events;
-import static org.junit.Assert.assertTrue;
-
import java.io.IOException;
import org.apache.log4j.Appender;
+import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.lttng.tools.ILttngSession.Domain;
+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.lttng.tools.ILttngSession;
-import org.lttng.tools.LttngToolsHelper;
-import org.lttng.ust.agent.integration.events.ListEventsITBase;
import org.lttng.ust.agent.log4j.LttngLogAppender;
import org.lttng.ust.agent.utils.Log4jTestUtils;
-import org.lttng.ust.agent.utils.LttngUtils;
/**
* Test suite for the list events command for the log4j domain
private Appender[] appenders;
/**
- * Test class setup
+ * Class setup
*/
- @BeforeClass
- public static void testClassSetup() {
- /* Make sure we can find the JNI library and lttng-tools */
- assertTrue(Log4jTestUtils.checkForLog4jLibrary());
- assertTrue(LttngUtils.checkForLttngTools(Domain.LOG4J));
+ @BeforeAll
+ public static void log4jClassSetup() {
+ Log4jTestUtils.testClassSetup();
+ }
- LttngToolsHelper.destroyAllSessions();
+ /**
+ * Class cleanup
+ */
+ @AfterAll
+ public static void log4jClassCleanup() {
+ Log4jTestUtils.testClassCleanup();
}
/**
* @throws SecurityException
* @throws IOException
*/
- @Before
+ @BeforeEach
public void log4jSetup() throws SecurityException, IOException {
+ /* Try clearing the log4j logger configuration */
+ LogManager.resetConfiguration();
+ System.gc();
+
loggers = new Logger[] {
Logger.getLogger(LOGGER_NAME_1),
Logger.getLogger(LOGGER_NAME_2),
/**
* Test teardown. Detach and close all log handlers.
*/
- @After
+ @AfterEach
public void log4jTeardown() {
for (Logger logger : loggers) {
for (Appender appender : appenders) {