ss: Move plugins to Trace Compass namespace

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.ui.tests / src / org / eclipse / linuxtools / tmf / ui / tests / project / model / ProjectModelTraceTest.java

diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/project/model/ProjectModelTraceTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/project/model/ProjectModelTraceTest.java
index ff3ed43b54a3b87ac8b79538d97bf4c184d42e1c..50b729186306cbaf7a891a13c62b027fec0deb26 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/project/model/ProjectModelTraceTest.java
+++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/project/model/ProjectModelTraceTest.java
@@ -16,15 +16,16 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
+
+import java.util.concurrent.TimeoutException;
 
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.linuxtools.tmf.core.tests.shared.CtfTmfTestTrace;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
 import org.eclipse.linuxtools.tmf.core.trace.TmfTraceManager;
 import org.eclipse.linuxtools.tmf.ui.project.model.TmfOpenTraceHelper;
 import org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectElement;
 import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement;
+import org.eclipse.linuxtools.tmf.ui.tests.shared.ProjectModelTestData;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -43,7 +44,6 @@ public class ProjectModelTraceTest {
      */
     @Before
     public void setUp() {
-        assumeTrue(CtfTmfTestTrace.KERNEL.exists());
         try {
             fixture = ProjectModelTestData.getFilledProject();
         } catch (CoreException e) {
@@ -77,7 +77,11 @@ public class ProjectModelTraceTest {
         TmfOpenTraceHelper.openTraceFromElement(traceElement);
 
         /* Give the trace a chance to open */
-        ProjectModelTestData.delayThread(500);
+        try {
+            ProjectModelTestData.delayUntilTraceOpened(traceElement);
+        } catch (TimeoutException e) {
+            fail("The trace did not open in a reasonable delay");
+        }
 
         trace = traceElement.getTrace();
         assertNotNull(trace);
@@ -87,7 +91,11 @@ public class ProjectModelTraceTest {
          * the exact same element as the active trace
          */
         TmfOpenTraceHelper.openTraceFromElement(traceElement);
-        ProjectModelTestData.delayThread(500);
+        try {
+            ProjectModelTestData.delayUntilTraceOpened(traceElement);
+        } catch (TimeoutException e) {
+            fail("The trace did not open in a reasonable delay");
+        }
 
         ITmfTrace trace2 = TmfTraceManager.getInstance().getActiveTrace();