tmf: Add support for time range selection

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.core.tests / src / org / eclipse / linuxtools / tmf / core / tests / trace / TmfTraceManagerTest.java

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceManagerTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceManagerTest.java
index d9aa4f0231abc78a6a12ad34d170107079b49251..2b9b1e289aeef6bdef18f40357491b0d157b0982 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceManagerTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceManagerTest.java
@@ -8,6 +8,7 @@
  *
  * Contributors:
  *   Alexandre Montplaisir - Initial API and implementation
+ *   Patrick Tasse - Support selection range
  *******************************************************************************/
 
 package org.eclipse.linuxtools.tmf.core.tests.trace;
@@ -121,7 +122,7 @@ public class TmfTraceManagerTest {
     }
 
     private void selectTimeRange(TmfTimeRange tr) {
-        TmfSignalManager.dispatchSignal(new TmfRangeSynchSignal(this, tr, null));
+        TmfSignalManager.dispatchSignal(new TmfRangeSynchSignal(this, tr));
     }
 
     // ------------------------------------------------------------------------
@@ -213,7 +214,9 @@ public class TmfTraceManagerTest {
         ITmfTimestamp ts = new TmfTimestamp(t2start + ONE_SECOND, SCALE);
         selectTimestamp(ts);
 
-        ITmfTimestamp afterTs = tm.getCurrentTime();
+        ITmfTimestamp afterTs = tm.getSelectionBeginTime();
+        assertEquals(ts, afterTs);
+        afterTs = tm.getSelectionEndTime();
         assertEquals(ts, afterTs);
     }
 
@@ -224,11 +227,13 @@ public class TmfTraceManagerTest {
     @Test
     public void testTimestampBefore() {
         openTrace(trace2);
-        ITmfTimestamp beforeTs = tm.getCurrentTime();
+        ITmfTimestamp beforeTs = tm.getSelectionBeginTime();
         ITmfTimestamp ts = new TmfTimestamp(t2start - ONE_SECOND, SCALE);
         selectTimestamp(ts);
 
-        ITmfTimestamp curTs = tm.getCurrentTime();
+        ITmfTimestamp curTs = tm.getSelectionBeginTime();
+        assertEquals(beforeTs, curTs);
+        curTs = tm.getSelectionEndTime();
         assertEquals(beforeTs, curTs);
     }
 
@@ -239,11 +244,13 @@ public class TmfTraceManagerTest {
     @Test
     public void testTimestampAfter() {
         openTrace(trace2);
-        ITmfTimestamp beforeTs = tm.getCurrentTime();
+        ITmfTimestamp beforeTs = tm.getSelectionBeginTime();
         ITmfTimestamp ts = new TmfTimestamp(t2end + ONE_SECOND, SCALE);
         selectTimestamp(ts);
 
-        ITmfTimestamp curTs = tm.getCurrentTime();
+        ITmfTimestamp curTs = tm.getSelectionBeginTime();
+        assertEquals(beforeTs, curTs);
+        curTs = tm.getSelectionEndTime();
         assertEquals(beforeTs, curTs);
     }
 
@@ -335,11 +342,13 @@ public class TmfTraceManagerTest {
         selectTimestamp(ts);
 
         /* Timestamp of trace1 should have been updated */
-        assertEquals(ts, tm.getCurrentTime());
+        assertEquals(ts, tm.getSelectionBeginTime());
+        assertEquals(ts, tm.getSelectionEndTime());
 
         /* Timestamp of trace2 should not have changed */
         selectTrace(trace2);
-        assertEquals(trace2.getStartTime(), tm.getCurrentTime());
+        assertEquals(trace2.getStartTime(), tm.getSelectionBeginTime());
+        assertEquals(trace2.getStartTime(), tm.getSelectionEndTime());
     }
 
     /**
@@ -358,11 +367,13 @@ public class TmfTraceManagerTest {
         selectTimestamp(ts);
 
         /* Timestamp of trace1 should not have changed */
-        assertEquals(trace1.getStartTime(), tm.getCurrentTime());
+        assertEquals(trace1.getStartTime(), tm.getSelectionBeginTime());
+        assertEquals(trace1.getStartTime(), tm.getSelectionEndTime());
 
         /* Timestamp of trace2 should not have changed */
         selectTrace(trace2);
-        assertEquals(trace2.getStartTime(), tm.getCurrentTime());
+        assertEquals(trace2.getStartTime(), tm.getSelectionBeginTime());
+        assertEquals(trace2.getStartTime(), tm.getSelectionEndTime());
     }
 
     /**
@@ -380,11 +391,13 @@ public class TmfTraceManagerTest {
         selectTimestamp(ts);
 
         /* Timestamp of trace1 should not have changed */
-        assertEquals(trace1.getStartTime(), tm.getCurrentTime());
+        assertEquals(trace1.getStartTime(), tm.getSelectionBeginTime());
+        assertEquals(trace1.getStartTime(), tm.getSelectionEndTime());
 
         /* Timestamp of trace2 should not have changed */
         selectTrace(trace2);
-        assertEquals(trace2.getStartTime(), tm.getCurrentTime());
+        assertEquals(trace2.getStartTime(), tm.getSelectionBeginTime());
+        assertEquals(trace2.getStartTime(), tm.getSelectionEndTime());
     }
 
     /**
@@ -516,7 +529,8 @@ public class TmfTraceManagerTest {
         selectTimestamp(ts);
 
         /* The experiment's current time should be updated. */
-        assertEquals(ts, tm.getCurrentTime());
+        assertEquals(ts, tm.getSelectionBeginTime());
+        assertEquals(ts, tm.getSelectionEndTime());
     }
 
     /**
@@ -534,7 +548,8 @@ public class TmfTraceManagerTest {
         selectTimestamp(ts);
 
         /* The experiment's current time should be updated. */
-        assertEquals(ts, tm.getCurrentTime());
+        assertEquals(ts, tm.getSelectionBeginTime());
+        assertEquals(ts, tm.getSelectionEndTime());
     }
 
     /**
@@ -551,7 +566,8 @@ public class TmfTraceManagerTest {
         selectTimestamp(ts);
 
         /* The experiment's current time should NOT be updated. */
-        assertEquals(trace1.getStartTime(), tm.getCurrentTime());
+        assertEquals(trace1.getStartTime(), tm.getSelectionBeginTime());
+        assertEquals(trace1.getStartTime(), tm.getSelectionEndTime());
     }
 
     /**