projects
/
lttng-ust-java-tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add 'log4j2' domain tests to the Log4j 2.x agent
[lttng-ust-java-tests.git]
/
lttng-ust-java-tests-jul
/
src
/
test
/
java
/
org
/
lttng
/
ust
/
agent
/
integration
/
context
/
JulAppContextOrderingIT.java
diff --git
a/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/context/JulAppContextOrderingIT.java
b/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/context/JulAppContextOrderingIT.java
index d3a2f6481e27ad775929b94c53ea324e5cc27358..69a1e7ef80ff978c4a81525dda6ed35aaef14faa 100644
(file)
--- a/
lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/context/JulAppContextOrderingIT.java
+++ b/
lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/context/JulAppContextOrderingIT.java
@@
-18,25
+18,26
@@
package org.lttng.ust.agent.integration.context;
package org.lttng.ust.agent.integration.context;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.io.IOException;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.junit.After;
-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.Tag;
import org.lttng.tools.ILttngSession.Domain;
import org.lttng.tools.ILttngSession.Domain;
-import org.lttng.tools.LttngToolsHelper;
import org.lttng.ust.agent.jul.LttngLogHandler;
import org.lttng.ust.agent.utils.JulTestUtils;
import org.lttng.ust.agent.jul.LttngLogHandler;
import org.lttng.ust.agent.utils.JulTestUtils;
-import org.lttng.ust.agent.utils.LttngUtils;
/**
* Implementation of {@link AppContextOrderingITBase} for the JUL API.
*/
/**
* Implementation of {@link AppContextOrderingITBase} for the JUL API.
*/
+@Tag("agent:jul")
+@Tag("domain:jul")
public class JulAppContextOrderingIT extends AppContextOrderingITBase {
private Logger logger;
public class JulAppContextOrderingIT extends AppContextOrderingITBase {
private Logger logger;
@@
-44,19
+45,23
@@
public class JulAppContextOrderingIT extends AppContextOrderingITBase {
/**
* Class setup
*/
/**
* Class setup
*/
- @Before
Class
+ @Before
All
public static void julClassSetup() {
public static void julClassSetup() {
- /* Skip tests if we can't find the JNI library or lttng-tools */
- assumeTrue(JulTestUtils.checkForJulLibrary());
- assumeTrue(LttngUtils.checkForLttngTools(Domain.JUL));
+ JulTestUtils.testClassSetup();
+ }
- LttngToolsHelper.destroyAllSessions();
+ /**
+ * Class cleanup
+ */
+ @AfterAll
+ public static void julClassCleanup() {
+ JulTestUtils.testClassCleanup();
}
/**
* Test teardown
*/
}
/**
* Test teardown
*/
- @After
+ @After
Each
public void julTeardown() {
logger.removeHandler((Handler) logHandler);
logger = null;
public void julTeardown() {
logger.removeHandler((Handler) logHandler);
logger = null;
This page took
0.023813 seconds
and
4
git commands to generate.