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
Migrate to Junit 5 Jupiter
[lttng-ust-java-tests.git]
/
lttng-ust-java-tests-jul
/
src
/
test
/
java
/
org
/
lttng
/
ust
/
agent
/
integration
/
context
/
JulAppContextIT.java
diff --git
a/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/context/JulAppContextIT.java
b/lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/context/JulAppContextIT.java
index aaecf41ec6ebd30ffd3fbfd0eb6d1061d6dbbe35..b5735f2b99610703c522334697c1f01fd04b50ef 100644
(file)
--- a/
lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/context/JulAppContextIT.java
+++ b/
lttng-ust-java-tests-jul/src/test/java/org/lttng/ust/agent/integration/context/JulAppContextIT.java
@@
-18,22
+18,18
@@
package org.lttng.ust.agent.integration.context;
package org.lttng.ust.agent.integration.context;
-import static org.junit.Assume.assumeTrue;
-
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.
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.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;
/**
* Enabled app contexts test for the LTTng-UST JUL log handler.
/**
* Enabled app contexts test for the LTTng-UST JUL log handler.
@@
-47,21
+43,17
@@
public class JulAppContextIT extends AppContextITBase {
/**
* 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));
-
- LttngToolsHelper.destroyAllSessions();
+ JulTestUtils.testClassSetup();
}
/**
* Class cleanup
*/
}
/**
* Class cleanup
*/
- @After
Class
+ @After
All
public static void julClassCleanup() {
public static void julClassCleanup() {
-
LttngToolsHelper.deleteAllTraces
();
+
JulTestUtils.testClassCleanup
();
}
/**
}
/**
@@
-70,7
+62,7
@@
public class JulAppContextIT extends AppContextITBase {
* @throws SecurityException
* @throws IOException
*/
* @throws SecurityException
* @throws IOException
*/
- @Before
+ @Before
Each
public void julSetup() throws SecurityException, IOException {
logger = Logger.getLogger(EVENT_NAME);
logger.setLevel(Level.ALL);
public void julSetup() throws SecurityException, IOException {
logger = Logger.getLogger(EVENT_NAME);
logger.setLevel(Level.ALL);
@@
-82,7
+74,7
@@
public class JulAppContextIT extends AppContextITBase {
/**
* 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;
@@
-93,6
+85,12
@@
public class JulAppContextIT extends AppContextITBase {
return DOMAIN;
}
return DOMAIN;
}
+ @Override
+ protected boolean closeHandlers()
+ {
+ return true;
+ }
+
@Override
protected void sendEventsToLoggers() {
JulTestUtils.send10EventsTo(logger);
@Override
protected void sendEventsToLoggers() {
JulTestUtils.send10EventsTo(logger);
This page took
0.024227 seconds
and
4
git commands to generate.