tmf.core: Introduce TmfTimestamp factory methods

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

diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java
index e0f888e834033fb88fbbe1396200cf9a8bd0e466..40b0414f03ae5dd787063b19a989deaae38a813b 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java
@@ -33,8 +33,8 @@ import org.eclipse.tracecompass.internal.tmf.core.trace.experiment.TmfExperiment
 import org.eclipse.tracecompass.tmf.core.event.ITmfEvent;
 import org.eclipse.tracecompass.tmf.core.exceptions.TmfTraceException;
 import org.eclipse.tracecompass.tmf.core.request.ITmfEventRequest;
-import org.eclipse.tracecompass.tmf.core.request.TmfEventRequest;
 import org.eclipse.tracecompass.tmf.core.request.ITmfEventRequest.ExecutionType;
+import org.eclipse.tracecompass.tmf.core.request.TmfEventRequest;
 import org.eclipse.tracecompass.tmf.core.tests.TmfCoreTestPlugin;
 import org.eclipse.tracecompass.tmf.core.tests.shared.TmfTestTrace;
 import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp;
@@ -122,7 +122,7 @@ public class TmfMultiTraceExperimentTest {
         assertEquals("getStartTime", 1, timeRange.getStartTime().getValue());
         assertEquals("getEndTime", NB_EVENTS, timeRange.getEndTime().getValue());
 
-        TmfTimestamp initRange = new TmfTimestamp(DEFAULT_INITIAL_OFFSET_VALUE, ITmfTimestamp.NANOSECOND_SCALE);
+        ITmfTimestamp initRange = TmfTimestamp.fromNanos(DEFAULT_INITIAL_OFFSET_VALUE);
         assertEquals("getInitialRangeOffset", initRange, fExperiment.getInitialRangeOffset());
     }
 
@@ -224,7 +224,7 @@ public class TmfMultiTraceExperimentTest {
         long cacheSize = fExperiment.getCacheSize();
 
         // Position trace at event rank 0
-        ITmfContext context = fExperiment.seekEvent(new TmfTimestamp(1, SCALE));
+        ITmfContext context = fExperiment.seekEvent(TmfTimestamp.create(1, SCALE));
         assertEquals("Context rank", 0, context.getRank());
 
         ITmfEvent event = fExperiment.getNext(context);
@@ -232,7 +232,7 @@ public class TmfMultiTraceExperimentTest {
         assertEquals("Context rank", 1, context.getRank());
 
         // Position trace at event rank [cacheSize]
-        context = fExperiment.seekEvent(new TmfTimestamp(cacheSize + 1, SCALE));
+        context = fExperiment.seekEvent(TmfTimestamp.create(cacheSize + 1, SCALE));
         assertEquals("Event rank", cacheSize, context.getRank());
 
         event = fExperiment.getNext(context);
@@ -240,7 +240,7 @@ public class TmfMultiTraceExperimentTest {
         assertEquals("Context rank", cacheSize + 1, context.getRank());
 
         // Position trace at event rank [4 * cacheSize]
-        context = fExperiment.seekEvent(new TmfTimestamp(4 * cacheSize + 1, SCALE));
+        context = fExperiment.seekEvent(TmfTimestamp.create(4 * cacheSize + 1, SCALE));
         assertEquals("Context rank", 4 * cacheSize, context.getRank());
 
         event = fExperiment.getNext(context);
@@ -251,7 +251,7 @@ public class TmfMultiTraceExperimentTest {
     @Test
     public void testSeekTimestampNotOnCacheBoundary() {
         // Position trace at event rank 1 (TS = 2)
-        ITmfContext context = fExperiment.seekEvent(new TmfTimestamp(2, SCALE));
+        ITmfContext context = fExperiment.seekEvent(TmfTimestamp.create(2, SCALE));
         assertEquals("Context rank", 1, context.getRank());
 
         ITmfEvent event = fExperiment.getNext(context);
@@ -259,7 +259,7 @@ public class TmfMultiTraceExperimentTest {
         assertEquals("Context rank", 2, context.getRank());
 
         // Position trace at event rank 9 (TS = 10)
-        context = fExperiment.seekEvent(new TmfTimestamp(10, SCALE));
+        context = fExperiment.seekEvent(TmfTimestamp.create(10, SCALE));
         assertEquals("Context rank", 9, context.getRank());
 
         event = fExperiment.getNext(context);
@@ -267,7 +267,7 @@ public class TmfMultiTraceExperimentTest {
         assertEquals("Context rank", 10, context.getRank());
 
         // Position trace at event rank 999 (TS = 1000)
-        context = fExperiment.seekEvent(new TmfTimestamp(1000, SCALE));
+        context = fExperiment.seekEvent(TmfTimestamp.create(1000, SCALE));
         assertEquals("Context rank", 999, context.getRank());
 
         event = fExperiment.getNext(context);
@@ -275,7 +275,7 @@ public class TmfMultiTraceExperimentTest {
         assertEquals("Context rank", 1000, context.getRank());
 
         // Position trace at event rank 1001 (TS = 1002)
-        context = fExperiment.seekEvent(new TmfTimestamp(1002, SCALE));
+        context = fExperiment.seekEvent(TmfTimestamp.create(1002, SCALE));
         assertEquals("Context rank", 1001, context.getRank());
 
         event = fExperiment.getNext(context);
@@ -283,7 +283,7 @@ public class TmfMultiTraceExperimentTest {
         assertEquals("Context rank", 1002, context.getRank());
 
         // Position trace at event rank 4500 (TS = 4501)
-        context = fExperiment.seekEvent(new TmfTimestamp(4501, SCALE));
+        context = fExperiment.seekEvent(TmfTimestamp.create(4501, SCALE));
         assertEquals("Context rank", 4500, context.getRank());
 
         event = fExperiment.getNext(context);
@@ -294,7 +294,7 @@ public class TmfMultiTraceExperimentTest {
     @Test
     public void testSeekTimestampOutOfScope() {
         // Position trace at beginning
-        ITmfContext context = fExperiment.seekEvent(new TmfTimestamp(-1, SCALE));
+        ITmfContext context = fExperiment.seekEvent(TmfTimestamp.create(-1, SCALE));
         assertEquals("Event rank", 0, context.getRank());
 
         ITmfEvent event = fExperiment.getNext(context);
@@ -302,7 +302,7 @@ public class TmfMultiTraceExperimentTest {
         assertEquals("Event rank", 1, context.getRank());
 
         // Position trace at event passed the end
-        context = fExperiment.seekEvent(new TmfTimestamp(NB_EVENTS + 1, SCALE));
+        context = fExperiment.seekEvent(TmfTimestamp.create(NB_EVENTS + 1, SCALE));
         event = fExperiment.getNext(context);
         assertNull("Event location", event);
         assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank());
@@ -423,7 +423,7 @@ public class TmfMultiTraceExperimentTest {
         final int NB_READS = 20;
 
         // On lower bound, returns the first event (ts = 1)
-        final ITmfContext context = fExperiment.seekEvent(new TmfTimestamp(INITIAL_TS, SCALE));
+        final ITmfContext context = fExperiment.seekEvent(TmfTimestamp.create(INITIAL_TS, SCALE));
 
         validateContextRanks(context);
 
@@ -449,7 +449,7 @@ public class TmfMultiTraceExperimentTest {
         final int NB_READS = 20;
 
         // On lower bound, returns the first event (ts = 2)
-        final ITmfContext context = fExperiment.seekEvent(new TmfTimestamp(INITIAL_TS, SCALE));
+        final ITmfContext context = fExperiment.seekEvent(TmfTimestamp.create(INITIAL_TS, SCALE));
 
         validateContextRanks(context);
 
@@ -475,7 +475,7 @@ public class TmfMultiTraceExperimentTest {
         final int NB_READS = 20;
 
         // On lower bound, returns the first event (ts = 500)
-        final ITmfContext context = fExperiment.seekEvent(new TmfTimestamp(INITIAL_TS, SCALE));
+        final ITmfContext context = fExperiment.seekEvent(TmfTimestamp.create(INITIAL_TS, SCALE));
 
         validateContextRanks(context);
 
@@ -770,15 +770,15 @@ public class TmfMultiTraceExperimentTest {
 
     @Test
     public void testGetTimestamp() {
-        assertEquals("getTimestamp", new TmfTimestamp(    1, (byte) -3), fExperiment.getTimestamp(    0));
-        assertEquals("getTimestamp", new TmfTimestamp(    2, (byte) -3), fExperiment.getTimestamp(    1));
-        assertEquals("getTimestamp", new TmfTimestamp(   11, (byte) -3), fExperiment.getTimestamp(   10));
-        assertEquals("getTimestamp", new TmfTimestamp(  101, (byte) -3), fExperiment.getTimestamp(  100));
-        assertEquals("getTimestamp", new TmfTimestamp( 1001, (byte) -3), fExperiment.getTimestamp( 1000));
-        assertEquals("getTimestamp", new TmfTimestamp( 2001, (byte) -3), fExperiment.getTimestamp( 2000));
-        assertEquals("getTimestamp", new TmfTimestamp( 2501, (byte) -3), fExperiment.getTimestamp( 2500));
-        assertEquals("getTimestamp", new TmfTimestamp(10000, (byte) -3), fExperiment.getTimestamp( 9999));
-        assertEquals("getTimestamp", new TmfTimestamp(20000, (byte) -3), fExperiment.getTimestamp(19999));
+        assertEquals("getTimestamp", TmfTimestamp.create(    1, (byte) -3), fExperiment.getTimestamp(    0));
+        assertEquals("getTimestamp", TmfTimestamp.create(    2, (byte) -3), fExperiment.getTimestamp(    1));
+        assertEquals("getTimestamp", TmfTimestamp.create(   11, (byte) -3), fExperiment.getTimestamp(   10));
+        assertEquals("getTimestamp", TmfTimestamp.create(  101, (byte) -3), fExperiment.getTimestamp(  100));
+        assertEquals("getTimestamp", TmfTimestamp.create( 1001, (byte) -3), fExperiment.getTimestamp( 1000));
+        assertEquals("getTimestamp", TmfTimestamp.create( 2001, (byte) -3), fExperiment.getTimestamp( 2000));
+        assertEquals("getTimestamp", TmfTimestamp.create( 2501, (byte) -3), fExperiment.getTimestamp( 2500));
+        assertEquals("getTimestamp", TmfTimestamp.create(10000, (byte) -3), fExperiment.getTimestamp( 9999));
+        assertEquals("getTimestamp", TmfTimestamp.create(20000, (byte) -3), fExperiment.getTimestamp(19999));
         assertNull("getTimestamp", fExperiment.getTimestamp(20000));
     }
 
@@ -792,7 +792,7 @@ public class TmfMultiTraceExperimentTest {
         TmfExperimentStub exp = new TmfExperimentStub(EXPERIMENT, traces, BLOCK_SIZE);
 
         // verify initial values
-        TmfTimestamp initRange = new TmfTimestamp(DEFAULT_INITIAL_OFFSET_VALUE, ITmfTimestamp.NANOSECOND_SCALE);
+        ITmfTimestamp initRange = TmfTimestamp.fromNanos(DEFAULT_INITIAL_OFFSET_VALUE);
         assertEquals("getInitialRangeOffset", initRange, exp.getInitialRangeOffset());
 
         exp.dispose();
@@ -801,11 +801,11 @@ public class TmfMultiTraceExperimentTest {
     @Test
     public void testInitialRangeOffset() {
         ITmfTrace[] traces = setupTraces();
-        ((TmfTraceStub) traces[0]).setInitialRangeOffset(new TmfTimestamp(5, ITmfTimestamp.MILLISECOND_SCALE));
-        ((TmfTraceStub) traces[1]).setInitialRangeOffset(new TmfTimestamp(2, ITmfTimestamp.MILLISECOND_SCALE));
+        ((TmfTraceStub) traces[0]).setInitialRangeOffset(TmfTimestamp.fromMillis(5));
+        ((TmfTraceStub) traces[1]).setInitialRangeOffset(TmfTimestamp.fromMillis(2));
         TmfExperimentStub exp = new TmfExperimentStub(EXPERIMENT, traces, BLOCK_SIZE);
 
-        TmfTimestamp initRange = new TmfTimestamp(2, ITmfTimestamp.MILLISECOND_SCALE);
+        ITmfTimestamp initRange = TmfTimestamp.fromMillis(2);
         assertEquals("getInitialRangeOffset", initRange, exp.getInitialRangeOffset());
 
         exp.dispose();