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
Put common setup code in the utils classes
[lttng-ust-java-tests.git]
/
lttng-ust-java-tests-log4j
/
src
/
test
/
java
/
org
/
lttng
/
ust
/
agent
/
integration
/
context
/
Log4jAppContextOrderingIT.java
diff --git
a/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/context/Log4jAppContextOrderingIT.java
b/lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/context/Log4jAppContextOrderingIT.java
index 59b7d1bee6cd2b5276213c4704edfbfd5f05cc60..44a93a829893613b68d99b368cacb82b7d300b3e 100644
(file)
--- a/
lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/context/Log4jAppContextOrderingIT.java
+++ b/
lttng-ust-java-tests-log4j/src/test/java/org/lttng/ust/agent/integration/context/Log4jAppContextOrderingIT.java
@@
-18,7
+18,6
@@
package org.lttng.ust.agent.integration.context;
package org.lttng.ust.agent.integration.context;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.IOException;
import static org.junit.Assert.fail;
import java.io.IOException;
@@
-27,12
+26,11
@@
import org.apache.log4j.Appender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.After;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.lttng.tools.ILttngSession.Domain;
import org.junit.BeforeClass;
import org.lttng.tools.ILttngSession.Domain;
-import org.lttng.tools.LttngToolsHelper;
import org.lttng.ust.agent.log4j.LttngLogAppender;
import org.lttng.ust.agent.utils.Log4jTestUtils;
import org.lttng.ust.agent.log4j.LttngLogAppender;
import org.lttng.ust.agent.utils.Log4jTestUtils;
-import org.lttng.ust.agent.utils.LttngUtils;
/**
* Implementation of {@link AppContextOrderingITBase} for the log4j API.
/**
* Implementation of {@link AppContextOrderingITBase} for the log4j API.
@@
-46,11
+44,15
@@
public class Log4jAppContextOrderingIT extends AppContextOrderingITBase {
*/
@BeforeClass
public static void log4jClassSetup() {
*/
@BeforeClass
public static void log4jClassSetup() {
- /* Make sure we can find the JNI library and lttng-tools */
- assertTrue(Log4jTestUtils.checkForLog4jLibrary());
- assertTrue(LttngUtils.checkForLttngTools(Domain.LOG4J));
+ Log4jTestUtils.testClassSetup();
+ }
- LttngToolsHelper.destroyAllSessions();
+ /**
+ * Class cleanup
+ */
+ @AfterClass
+ public static void log4jClassCleanup() {
+ Log4jTestUtils.testClassCleanup();
}
/**
}
/**
This page took
0.023985 seconds
and
4
git commands to generate.