ctf: Increase ReadAllTraces test timeout to 1 minute

[deliverable/tracecompass.git] / ctf / org.eclipse.tracecompass.ctf.core.tests / src / org / eclipse / tracecompass / ctf / core / tests / trace / TraceReadAllTracesTest.java

diff --git a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/trace/TraceReadAllTracesTest.java b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/trace/TraceReadAllTracesTest.java
index e1f9d2b867c1a2144c2885f5b6d05a7db5412853..b6746b4e5c0e2a2f8c736e79fdcb800b9e23f106 100644 (file)
--- a/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/trace/TraceReadAllTracesTest.java
+++ b/ctf/org.eclipse.tracecompass.ctf.core.tests/src/org/eclipse/tracecompass/ctf/core/tests/trace/TraceReadAllTracesTest.java
@@ -22,11 +22,11 @@ import java.util.concurrent.TimeUnit;
 
 import org.eclipse.tracecompass.ctf.core.CTFException;
 import org.eclipse.tracecompass.ctf.core.CTFStrings;
-import org.eclipse.tracecompass.ctf.core.event.EventDefinition;
+import org.eclipse.tracecompass.ctf.core.event.IEventDefinition;
 import org.eclipse.tracecompass.ctf.core.event.types.IntegerDefinition;
-import org.eclipse.tracecompass.ctf.core.tests.shared.CtfTestTrace;
-import org.eclipse.tracecompass.ctf.core.trace.CTFTrace;
+import org.eclipse.tracecompass.ctf.core.tests.shared.CtfTestTraceUtils;
 import org.eclipse.tracecompass.ctf.core.trace.CTFTraceReader;
+import org.eclipse.tracecompass.testtraces.ctf.CtfTestTrace;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
@@ -44,9 +44,9 @@ import org.junit.runners.Parameterized.Parameters;
 @RunWith(Parameterized.class)
 public class TraceReadAllTracesTest {
 
-    /** Time-out tests after 20 seconds. */
+    /** Time-out tests after 1 minute. */
     @Rule
-    public TestRule globalTimeout = new Timeout(20, TimeUnit.SECONDS);
+    public TestRule globalTimeout = new Timeout(1, TimeUnit.MINUTES);
 
     /**
      * Get the list of traces
@@ -84,8 +84,8 @@ public class TraceReadAllTracesTest {
     @Test
     public void readTraces() {
         if (fTraceEnum.getNbEvents() != -1) {
-            try (CTFTraceReader reader = new CTFTraceReader(new CTFTrace(fTraceEnum.getPath()))) {
-                EventDefinition currentEventDef = reader.getCurrentEventDef();
+            try (CTFTraceReader reader = new CTFTraceReader(CtfTestTraceUtils.getTrace(fTraceEnum))) {
+                IEventDefinition currentEventDef = reader.getCurrentEventDef();
                 double start = currentEventDef.getTimestamp();
                 long count = 0;
                 double end = start;
@@ -103,7 +103,7 @@ public class TraceReadAllTracesTest {
                 assertEquals("Event count", fTraceEnum.getNbEvents(), count);
                 assertEquals("Trace duration", fTraceEnum.getDuration(), (end - start) / 1000000000.0, 1.0);
             } catch (CTFException e) {
-                fail(fTraceEnum.getPath() + " " + e.getMessage());
+                fail(fTraceEnum.name() + " " + e.getMessage());
             }
         } else {
             assumeTrue("Trace did not specify events count", false);