X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tmf%2Forg.eclipse.tracecompass.tmf.ui.tests%2Fsrc%2Forg%2Feclipse%2Ftracecompass%2Ftmf%2Fui%2Ftests%2Fproject%2Fmodel%2FProjectModelTraceTest.java;h=d046185f685526427cbcd37376764c24280e3d70;hb=6db82092b514421a6dd57645f9aadac8bac4a3e0;hp=7365e7e265fdaafce8ed259cb0d7d6e8f7d2ac8a;hpb=7b51f722f1d4b2357e5a268f5f86796eeee39a67;p=deliverable%2Ftracecompass.git diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/project/model/ProjectModelTraceTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/project/model/ProjectModelTraceTest.java index 7365e7e265..d046185f68 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/project/model/ProjectModelTraceTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui.tests/src/org/eclipse/tracecompass/tmf/ui/tests/project/model/ProjectModelTraceTest.java @@ -17,8 +17,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.util.concurrent.TimeoutException; - import org.eclipse.core.runtime.CoreException; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager; @@ -26,6 +24,7 @@ import org.eclipse.tracecompass.tmf.ui.project.model.TmfOpenTraceHelper; import org.eclipse.tracecompass.tmf.ui.project.model.TmfProjectElement; import org.eclipse.tracecompass.tmf.ui.project.model.TmfTraceElement; import org.eclipse.tracecompass.tmf.ui.tests.shared.ProjectModelTestData; +import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitTimeoutException; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -79,7 +78,7 @@ public class ProjectModelTraceTest { /* Give the trace a chance to open */ try { ProjectModelTestData.delayUntilTraceOpened(traceElement); - } catch (TimeoutException e) { + } catch (WaitTimeoutException e) { fail("The trace did not open in a reasonable delay"); } @@ -93,7 +92,7 @@ public class ProjectModelTraceTest { TmfOpenTraceHelper.openTraceFromElement(traceElement); try { ProjectModelTestData.delayUntilTraceOpened(traceElement); - } catch (TimeoutException e) { + } catch (WaitTimeoutException e) { fail("The trace did not open in a reasonable delay"); }