Refactor TmfTrace and TmfExperiment

3 files changed, 6 insertions, 6 deletions

diff --git a/lttng/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF
index df97ffa2d9..b867c78bbf 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@ Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.linuxtools.lttng.core.tests
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.linuxtools.lttng.jni
 Fragment-Host: org.eclipse.linuxtools.lttng.core
 Require-Bundle: org.junit;bundle-version="3.8.2",
  org.eclipse.core.runtime;bundle-version="3.7.0",
diff --git a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java
index b1d9dbbdd4..4707fdf945 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngExperimentTest.java
@@ -60,7 +60,7 @@ public class LTTngExperimentTest extends TestCase {
             try {
                 final URL location = FileLocator.find(FrameworkUtil.getBundle(LTTngExperimentTest.class), new Path(path), null);
                 final File testfile = new File(FileLocator.toFileURL(location).toURI());
-                final LTTngTrace trace = new LTTngTrace(null, testfile.getPath(), false);
+                final LTTngTrace trace = new LTTngTrace(null, testfile.getPath(), true);
                 fTraces[0] = trace;
             } catch (final URISyntaxException e) {
                 e.printStackTrace();
diff --git a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTraceTest.java b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTraceTest.java
index 83f4dbb398..b585237196 100644
--- a/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTraceTest.java
+++ b/lttng/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/trace/LTTngTraceTest.java
@@ -11,6 +11,7 @@ import org.eclipse.linuxtools.internal.lttng.core.event.LttngLocation;
 import org.eclipse.linuxtools.internal.lttng.core.trace.LTTngTrace;
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
 import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
 import org.osgi.framework.FrameworkUtil;
 
@@ -144,7 +145,7 @@ public class LTTngTraceTest extends TestCase {
 
     public void testSeekEventTimestamp() {
         TmfEvent tmpEvent = null;
-        TmfContext tmpContext = new TmfContext(null, 0);
+        ITmfContext tmpContext = new TmfContext(null, 0);
         final LTTngTrace testStream1 = prepareStreamToTest();
 
         // We should be at the beginning of the trace, we will seek at a certain timestamp
@@ -174,7 +175,7 @@ public class LTTngTraceTest extends TestCase {
 
     public void testSeekEventIndex() {
         TmfEvent tmpEvent = null;
-        TmfContext tmpContext = new TmfContext(null, 0);
+        ITmfContext tmpContext = new TmfContext(null, 0);
         final LTTngTrace testStream1 = prepareStreamToTest();
 
         // We should be at the beginning of the trace, we will seek at a certain timestamp
@@ -204,7 +205,7 @@ public class LTTngTraceTest extends TestCase {
 
     public void testSeekLocation() {
         TmfEvent tmpEvent = null;
-        TmfContext tmpContext = new TmfContext(null, 0);
+        ITmfContext tmpContext = new TmfContext(null, 0);
         final LTTngTrace testStream1 = prepareStreamToTest();
 
         // We should be at the beginning of the trace, we will seek at a certain timestamp
@@ -234,7 +235,7 @@ public class LTTngTraceTest extends TestCase {
 
     public void testLocationOperations() {
         TmfEvent tmpEvent = null;
-        TmfContext tmpContext = new TmfContext(null, 0);
+        ITmfContext tmpContext = new TmfContext(null, 0);
         final LTTngTrace testStream1 = prepareStreamToTest();
 
         // Test LttngLocation after a seek