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.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
+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;
import org.lttng.ust.agent.log4j.LttngLogAppender;
import org.lttng.ust.agent.utils.Log4jTestUtils;
/**
* Test suite for the list events command for the log4j domain
*/
+@Tag("agent:log4j")
+@Tag("domain:log4j")
public class Log4jListEventsIT extends ListEventsITBase {
private Logger[] loggers;
/**
* Class setup
*/
- @BeforeClass
+ @BeforeAll
public static void log4jClassSetup() {
Log4jTestUtils.testClassSetup();
}
/**
* Class cleanup
*/
- @AfterClass
+ @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) {