import java.util.logging.LogManager;
import java.util.logging.Logger;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+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.Domain;
import org.lttng.ust.agent.jul.LttngLogHandler;
import org.lttng.ust.agent.utils.JulTestUtils;
*
* @author Alexandre Montplaisir
*/
-@RunWith(Parameterized.class)
public class JulLoggerHierarchyListIT extends LoggerHierachyListITBase {
private Logger parentLogger;
private Handler parentHandler;
private Handler childHandler;
- /**
- * Test constructor
- *
- * @param parentLoggerActive
- * Parent logger has been instantiated
- * @param parentLoggerHasHandler
- * Parent logger has a LTTng handler attached to it
- * @param childLoggerActive
- * Child logger has been instantiated
- * @param childLoggerHasHandler
- * Child logger has a LTTng handler attached to it
- */
- public JulLoggerHierarchyListIT(boolean parentLoggerActive,
- boolean parentLoggerHasHandler,
- boolean childLoggerActive,
- boolean childLoggerHasHandler) {
- /* Set by parameters defined in the base class */
- super(parentLoggerActive,
- parentLoggerHasHandler,
- childLoggerActive,
- childLoggerHasHandler);
- }
-
// ------------------------------------------------------------------------
// Maintenance
// ------------------------------------------------------------------------
/**
* Class setup
*/
- @BeforeClass
+ @BeforeAll
public static void julClassSetup() {
JulTestUtils.testClassSetup();
}
/**
* Class cleanup
*/
- @AfterClass
+ @AfterAll
public static void julClassCleanup() {
JulTestUtils.testClassCleanup();
}
/**
- *
+ * Test setup
+ */
+ @SuppressWarnings("static-method")
+ @BeforeEach
+ public void setup() {
+ /*
+ * Kind of hackish, but it's the only way to ensure that loggers are
+ * really removed in-between tests, since LogManager does not provide a
+ * way to forcibly remove a logger, and it doesn't seem like it will any
+ * time soon, see http://bugs.java.com/view_bug.do?bug_id=4811930
+ */
+ LogManager.getLogManager().reset();
+ System.gc();
+ }
+
+ /**
+ * Test cleanup
*/
- @After
+ @AfterEach
public void cleanup() {
if (parentLogger != null) {
if (parentHandler != null) {
childLogger = null;
}
- /*
- * Kind of hackish, but it's the only way to ensure that loggers are
- * really removed in-between tests, since LogManager does not provide a
- * way to forcibly remove a logger, and it doesn't seem like it will any
- * time soon, see http://bugs.java.com/view_bug.do?bug_id=4811930
- */
LogManager.getLogManager().reset();
System.gc();
}
}
@Override
- protected void activateLoggers() throws IOException {
+ protected void activateLoggers(boolean parentLoggerActive,
+ boolean parentLoggerHasHandler,
+ boolean childLoggerActive,
+ boolean childLoggerHasHandler) throws IOException {
if (parentLoggerActive) {
parentLogger = Logger.getLogger(PARENT_LOGGER);
if (parentLoggerHasHandler) {