Provide default createSession() factory method

[lttng-ust-java-tests.git] / src / test / java / org / lttng / ust / agent / integration / MultiSessionTestBase.java

diff --git a/src/test/java/org/lttng/ust/agent/integration/MultiSessionTestBase.java b/src/test/java/org/lttng/ust/agent/integration/MultiSessionTestBase.java
index f5d4c079e9b15c0916fa064bc6011aa790d5a883..1efa3a6741b8576c556c02e92abb927abe1559ae 100644 (file)
--- a/src/test/java/org/lttng/ust/agent/integration/MultiSessionTestBase.java
+++ b/src/test/java/org/lttng/ust/agent/integration/MultiSessionTestBase.java
@@ -27,13 +27,16 @@ import java.util.List;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.lttng.tools.ILttngSession;
+import org.lttng.tools.ILttngSession.Domain;
 import org.lttng.ust.agent.ILttngHandler;
-import org.lttng.ust.agent.utils.LttngSession;
-import org.lttng.ust.agent.utils.LttngSession.Domain;
+import org.lttng.ust.agent.utils.TestPrintRunner;
 
 /**
- * Tests with multiple concurrent tracing sessions
+ * Base abstract class for tests with multiple concurrent tracing sessions
  */
+@RunWith(TestPrintRunner.class)
 public abstract class MultiSessionTestBase {
 
     protected static final String EVENT_NAME_A = "EventA";
@@ -41,9 +44,9 @@ public abstract class MultiSessionTestBase {
     protected static final String EVENT_NAME_C = "EventABC";
     protected static final String EVENT_NAME_D = "EventABCD";
 
-    private LttngSession session1;
-    private LttngSession session2;
-    private LttngSession session3;
+    private ILttngSession session1;
+    private ILttngSession session2;
+    private ILttngSession session3;
 
     /* Fields defined by the sub-class */
     protected ILttngHandler handlerA;
@@ -55,13 +58,19 @@ public abstract class MultiSessionTestBase {
 
     protected abstract void sendEventsToLoggers();
 
+    /**
+     * Base test setup
+     */
     @Before
     public void testSetup() {
-        session1 = new LttngSession(null, getDomain());
-        session2 = new LttngSession(null, getDomain());
-        session3 = new LttngSession(null, getDomain());
+        session1 = ILttngSession.createSession(null, getDomain());
+        session2 = ILttngSession.createSession(null, getDomain());
+        session3 = ILttngSession.createSession(null, getDomain());
     }
 
+    /**
+     * Base test teardown
+     */
     @After
     public void testTeardown() {
         session1.close();