X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lttng%2Forg.eclipse.tracecompass.lttng2.kernel.core.tests%2Fsrc%2Forg%2Feclipse%2Ftracecompass%2Flttng2%2Fkernel%2Fcore%2Ftests%2Fanalysis%2Fkernel%2Fstatesystem%2FStateSystemInMemoryTest.java;h=287e1017a77c0d4bbda47a9c15d339c929f33339;hb=c4d57ac1c2197995871705d0e84346335fab5ced;hp=1840a7a5adad34b7d4c0e9c1b142ec97089d107f;hpb=655d677df72ef6f6ad6a870040c6a1548b32d0a7;p=deliverable%2Ftracecompass.git

diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/kernel/statesystem/StateSystemInMemoryTest.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/kernel/statesystem/StateSystemInMemoryTest.java
index 1840a7a5ad..287e1017a7 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/kernel/statesystem/StateSystemInMemoryTest.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.core.tests/src/org/eclipse/tracecompass/lttng2/kernel/core/tests/analysis/kernel/statesystem/StateSystemInMemoryTest.java
@@ -19,6 +19,7 @@ import static org.junit.Assert.fail;
 import org.eclipse.tracecompass.analysis.os.linux.core.kernelanalysis.KernelAnalysisModule;
 import org.eclipse.tracecompass.tmf.core.exceptions.TmfAnalysisException;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
+import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTraceUtils;
 import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -30,6 +31,7 @@ import org.junit.BeforeClass;
  */
 public class StateSystemInMemoryTest extends StateSystemTest {
 
+    private static CtfTmfTrace trace;
     private static TestLttngKernelAnalysisModule module;
 
     /**
@@ -37,15 +39,12 @@ public class StateSystemInMemoryTest extends StateSystemTest {
      */
     @BeforeClass
     public static void initialize() {
-        if (!testTrace.exists()) {
-            traceIsPresent = false;
-            return;
-        }
-        traceIsPresent = true;
+        CtfTmfTrace thetrace = CtfTmfTestTraceUtils.getTrace(testTrace);
+        trace = thetrace;
 
         module = new TestLttngKernelAnalysisModule();
         try {
-            assertTrue(module.setTrace(testTrace.getTrace()));
+            assertTrue(module.setTrace(thetrace));
         } catch (TmfAnalysisException e) {
             fail();
         }
@@ -66,8 +65,12 @@ public class StateSystemInMemoryTest extends StateSystemTest {
         if (fixture != null) {
             fixture.dispose();
         }
+        if (trace != null) {
+            trace.dispose();
+        }
         module = null;
         fixture = null;
+        trace = null;
     }
 
     private static class TestLttngKernelAnalysisModule extends KernelAnalysisModule {