tmf: fix ctf validation tests due to missing traces

Certain test were not executed because trace files where not found.
This problem was introduced when the test traces repository was created

Change-Id: I81a88870615ef3188d7f50de41535e5dff76ff71
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/62063
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-by: Hudson CI

diff --git a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/CtfTmfTraceValidateTest.java b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/CtfTmfTraceValidateTest.java
index 929b931cdbc54f9fc4416e095b3456c15fbbf7f6..da8f5a1eb55a8cf97a38ddf58ef6426987016848 100644 (file)
--- a/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/CtfTmfTraceValidateTest.java
+++ b/ctf/org.eclipse.tracecompass.tmf.ctf.core.tests/src/org/eclipse/tracecompass/tmf/ctf/core/tests/trace/CtfTmfTraceValidateTest.java
@@ -23,7 +23,9 @@ import java.nio.file.Paths;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.tracecompass.testtraces.ctf.CtfTestTrace;
 import org.eclipse.tracecompass.tmf.core.trace.TraceValidationStatus;
 import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTmfTrace;
 import org.eclipse.tracecompass.tmf.ctf.core.trace.CtfTraceValidationStatus;
@@ -55,20 +57,22 @@ public class CtfTmfTraceValidateTest {
      * Gets a list of test case parameters.
      *
      * @return The list of CTF traces (directories) to test
+     * @throws Exception in case of error
      */
     @Parameters(name = "{index}: {0}")
-    public static Iterable<Object[]> getTracePaths() {
+    public static Iterable<Object[]> getTracePaths() throws Exception {
         final List<Object[]> dirs = new LinkedList<>();
         // text-only metadata, valid CTF trace (lttle-endian)
         addDirsFrom(dirs, CTF_SUITE_BASE_PATH.resolve(Paths.get("regression", "metadata", "pass", "literal-integers")), IStatus.OK, 10, false);
         // packet-based metadata, valid CTF trace (lttle-endian)
-        addDirsFrom(dirs, BASE_PATH.resolve(Paths.get("kernel")), IStatus.OK, 10, false);
+        String tracePath = FileLocator.toFileURL(CtfTestTrace.KERNEL.getTraceURL()).getPath();
+        addDirsFrom(dirs, Paths.get(tracePath), IStatus.OK, 10, false);
         // text-only metadata, but invalid
         addDirsFrom(dirs, CTF_SUITE_BASE_PATH.resolve(Paths.get("regression", "metadata", "fail", "enum-empty")), IStatus.WARNING, 1, true);
         // packet-based metadata, but invalid
         addDirsFrom(dirs, CTF_SUITE_BASE_PATH.resolve(Paths.get("regression", "metadata", "fail", "lttng-modules-2.0-pre1")), IStatus.WARNING, 1, true);
         // pass file instead of directory
-        addDirsFrom(dirs, BASE_PATH.resolve(Paths.get("trace2.tar.bz2")), IStatus.ERROR, 1, false);
+        addDirsFrom(dirs, BASE_PATH.resolve(Paths.get("synctraces.tar.gz")), IStatus.ERROR, 1, false);
 
         return dirs;
     }