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
Bump log4j2 test dependencies
[lttng-ust-java-tests.git]
/
lttng-ust-java-tests-common
/
src
/
main
/
java
/
org
/
lttng
/
ust
/
agent
/
integration
/
events
/
EnabledEventsITBase.java
diff --git
a/lttng-ust-java-tests-common/src/main/java/org/lttng/ust/agent/integration/events/EnabledEventsITBase.java
b/lttng-ust-java-tests-common/src/main/java/org/lttng/ust/agent/integration/events/EnabledEventsITBase.java
index 99ce2a3ccf3fc7023b183b8dcf0b2987e77b0737..25ebc9e7b3fbe436c0223eff88b2dbe755310970 100644
(file)
--- a/
lttng-ust-java-tests-common/src/main/java/org/lttng/ust/agent/integration/events/EnabledEventsITBase.java
+++ b/
lttng-ust-java-tests-common/src/main/java/org/lttng/ust/agent/integration/events/EnabledEventsITBase.java
@@
-18,27
+18,27
@@
package org.lttng.ust.agent.integration.events;
package org.lttng.ust.agent.integration.events;
-import static org.junit.
Assert
.assertEquals;
-import static org.junit.
Assert
.assertNotNull;
-import static org.junit.
Assert
.assertTrue;
+import static org.junit.
jupiter.api.Assertions
.assertEquals;
+import static org.junit.
jupiter.api.Assertions
.assertNotNull;
+import static org.junit.
jupiter.api.Assertions
.assertTrue;
import java.util.Arrays;
import java.util.List;
import java.util.Arrays;
import java.util.List;
-import org.junit.
After
;
-import org.junit.
Before
;
-import org.junit.Test;
-import org.junit.
runner.Run
With;
+import org.junit.
jupiter.api.AfterEach
;
+import org.junit.
jupiter.api.BeforeEach
;
+import org.junit.
jupiter.api.
Test;
+import org.junit.
jupiter.api.extension.Extend
With;
import org.lttng.tools.ILttngSession;
import org.lttng.tools.ILttngSession.Domain;
import org.lttng.ust.agent.ILttngHandler;
import org.lttng.tools.ILttngSession;
import org.lttng.tools.ILttngSession.Domain;
import org.lttng.ust.agent.ILttngHandler;
-import org.lttng.ust.agent.utils.TestPrint
Runner
;
+import org.lttng.ust.agent.utils.TestPrint
Extension
;
/**
* Base abstract class to implement all sorts of integration tests verifying the
* presence of enabled events in resulting traces.
*/
/**
* Base abstract class to implement all sorts of integration tests verifying the
* presence of enabled events in resulting traces.
*/
-@
RunWith(TestPrintRunner
.class)
+@
ExtendWith(TestPrintExtension
.class)
public abstract class EnabledEventsITBase {
protected static final String EVENT_NAME_A = "EventA";
public abstract class EnabledEventsITBase {
protected static final String EVENT_NAME_A = "EventA";
@@
-55,6
+55,8
@@
public abstract class EnabledEventsITBase {
protected abstract Domain getDomain();
protected abstract Domain getDomain();
+ protected abstract boolean closeHandlers();
+
protected abstract void sendEventsToLoggers();
/**
protected abstract void sendEventsToLoggers();
/**
@@
-65,7
+67,7
@@
public abstract class EnabledEventsITBase {
/**
* Base test setup
*/
/**
* Base test setup
*/
- @Before
+ @Before
Each
public void testSetup() {
session = ILttngSession.createSession(null, getDomain());
}
public void testSetup() {
session = ILttngSession.createSession(null, getDomain());
}
@@
-73,13
+75,15
@@
public abstract class EnabledEventsITBase {
/**
* Base test teardown
*/
/**
* Base test teardown
*/
- @After
+ @After
Each
public void testTeardown() {
session.close();
public void testTeardown() {
session.close();
- handlerA.close();
- handlerB.close();
- handlerC.close();
+ if (closeHandlers()) {
+ handlerA.close();
+ handlerB.close();
+ handlerC.close();
+ }
handlerA = null;
handlerB = null;
handlerA = null;
handlerB = null;
This page took
0.023398 seconds
and
4
git commands to generate.