import java.io.IOException;
import java.util.logging.Handler;
+import java.util.logging.LogManager;
import java.util.logging.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.lttng.tools.ILttngSession;
import org.lttng.ust.agent.jul.LttngLogHandler;
import org.lttng.ust.agent.utils.JulTestUtils;
/**
* Class setup
*/
- @BeforeClass
+ @BeforeAll
public static void julClassSetup() {
JulTestUtils.testClassSetup();
}
/**
* Class cleanup
*/
- @AfterClass
+ @AfterAll
public static void julClassCleanup() {
JulTestUtils.testClassCleanup();
}
* @throws SecurityException
* @throws IOException
*/
- @Before
+ @BeforeEach
public void julSetup() throws SecurityException, IOException {
+ /* Clear the JUL logger configuration */
+ LogManager.getLogManager().reset();
+ 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 julTeardown() {
for (Logger logger : loggers) {
for (Handler handler : handlers) {