tmf: Mark TmfTraceManager @NonNullByDefault

[deliverable/tracecompass.git] / tmf / org.eclipse.tracecompass.tmf.ui.swtbot.tests / perf / org / eclipse / tracecompass / tmf / ui / swtbot / tests / perf / views / ViewsResponseTest.java

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/perf/org/eclipse/tracecompass/tmf/ui/swtbot/tests/perf/views/ViewsResponseTest.java b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/perf/org/eclipse/tracecompass/tmf/ui/swtbot/tests/perf/views/ViewsResponseTest.java
index 3f839491a2bed5c3c3fed1b03f273b96e75f2ff5..67087968933f0ea4f5ed8466d3668883139925f4 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/perf/org/eclipse/tracecompass/tmf/ui/swtbot/tests/perf/views/ViewsResponseTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui.swtbot.tests/perf/org/eclipse/tracecompass/tmf/ui/swtbot/tests/perf/views/ViewsResponseTest.java
@@ -9,6 +9,8 @@
 
 package org.eclipse.tracecompass.tmf.ui.swtbot.tests.perf.views;
 
+import static org.junit.Assert.assertNotNull;
+
 import java.io.File;
 import java.util.Collection;
 
@@ -30,6 +32,7 @@ import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTraceManager;
 import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.ConditionHelpers;
 import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.SWTBotUtils;
+import org.eclipse.tracecompass.tmf.ui.tests.shared.WaitUtils;
 import org.eclipse.tracecompass.tmf.ui.views.timegraph.AbstractTimeGraphView;
 import org.eclipse.ui.IWorkbenchPart;
 import org.junit.After;
@@ -77,7 +80,7 @@ public abstract class ViewsResponseTest {
         /* Prepare the workspace */
         prepareWorkspace();
         /* Finish waiting for eclipse to load */
-        SWTBotUtils.waitForJobs();
+        WaitUtils.waitForJobs();
 
         /* Create project */
         SWTBotUtils.createProject(PROJECT_NAME);
@@ -132,7 +135,7 @@ public abstract class ViewsResponseTest {
         // Make sure all the analyses we'll need are done
         ITmfTrace trace = TmfTraceManager.getInstance().getActiveTrace();
         beforeRunningTest(trace);
-        SWTBotUtils.waitForJobs();
+        WaitUtils.waitForJobs();
 
         SWTBotView view;
 
@@ -194,7 +197,7 @@ public abstract class ViewsResponseTest {
             Thread.sleep(1000);
         } catch (InterruptedException e) {
         }
-        SWTBotUtils.waitForJobs();
+        WaitUtils.waitForJobs();
     }
 
     // TODO: Add some vertical scrollings. With eventual 2D queries, that will
@@ -206,6 +209,7 @@ public abstract class ViewsResponseTest {
 
         // Set the time range to the full trace range
         ITmfTrace activeTrace = TmfTraceManager.getInstance().getActiveTrace();
+        assertNotNull(activeTrace);
         TmfTimeRange fullRange = new TmfTimeRange(activeTrace.getStartTime(), activeTrace.getEndTime());
         TmfSignalManager.dispatchSignal(new TmfWindowRangeUpdatedSignal(this, fullRange));
         waitViewReady(part, selectionRange, fullRange.getEndTime());