X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ctf%2Forg.eclipse.tracecompass.tmf.ctf.core.tests%2Fsrc%2Forg%2Feclipse%2Ftracecompass%2Ftmf%2Fctf%2Fcore%2Ftests%2Ftrace%2FFunkyTraceTest.java;h=9659da5c8863448772759d80b238c859ed84b29d;hb=c4d57ac1c2197995871705d0e84346335fab5ced;hp=58abcdb357bf83613bac5876f8d80c13906cd3ea;hpb=d291a71561486ca4dab1909c6573a75d0a0750fd;p=deliverable%2Ftracecompass.git

diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/FunkyTraceTest.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/FunkyTraceTest.java
index 58abcdb357..9659da5c88 100644
--- a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/FunkyTraceTest.java
+++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/FunkyTraceTest.java
@@ -14,17 +14,18 @@ package org.eclipse.tracecompass.tmf.ctf.core.tests.trace;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeTrue;
 
 import java.util.concurrent.TimeUnit;
 
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.tracecompass.testtraces.ctf.CtfTestTrace;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.event.ITmfEventField;
 import org.eclipse.tracecompass.tmf.core.request.TmfEventRequest;
 import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimeRange;
 import org.eclipse.tracecompass.tmf.ctf.core.CtfEnumPair;
 import org.eclipse.tracecompass.tmf.ctf.core.event.CtfTmfEvent;
-import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTrace;
+import org.eclipse.tracecompass.tmf.ctf.core.tests.shared.CtfTmfTestTraceUtils;
 import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace;
 import org.junit.After;
 import org.junit.Before;
@@ -50,7 +51,7 @@ public class FunkyTraceTest {
     // Attributes
     // ------------------------------------------------------------------------
 
-    private static final CtfTmfTestTrace testTrace = CtfTmfTestTrace.FUNKY_TRACE;
+    private static final @NonNull CtfTestTrace testTrace = CtfTestTrace.FUNKY_TRACE;
     private static final double DELTA = 0.0000001;
 
     private CtfTmfTrace fTrace;
@@ -64,8 +65,7 @@ public class FunkyTraceTest {
      */
     @Before
     public void setup() {
-        assumeTrue(testTrace.exists());
-        fTrace = testTrace.getTrace();
+        fTrace = CtfTmfTestTraceUtils.getTrace(testTrace);
         fTrace.indexTrace(true);
     }