tmf.core: Introduce TmfTimestamp factory methods

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

diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java
index 10a5811380c45e9cc2e5eff624b04e87577a0ccf..9480f72f0178c2faf326235416064ae597861598 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java
+++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/trace/TmfTraceTest.java
@@ -65,9 +65,9 @@ import org.junit.rules.Timeout;
 @SuppressWarnings("javadoc")
 public class TmfTraceTest {
 
-    /** Time-out tests after 20 seconds */
+    /** Time-out tests after 1 minute. */
     @Rule
-    public TestRule globalTimeout= new Timeout(20, TimeUnit.SECONDS);
+    public TestRule globalTimeout = new Timeout(1, TimeUnit.MINUTES);
 
     // ------------------------------------------------------------------------
     // Variables
@@ -105,6 +105,7 @@ public class TmfTraceTest {
     public void tearDown() {
         fTrace.dispose();
         fTrace = null;
+        assertEquals(0, TmfProviderManager.getProviders(ITmfEvent.class).length);
     }
 
     // ------------------------------------------------------------------------
@@ -132,6 +133,7 @@ public class TmfTraceTest {
             assertEquals("getStartTime", 1, trace.getStartTime().getValue());
             assertEquals("getEndTime", NB_EVENTS, trace.getEndTime().getValue());
 
+            trace.dispose();
         } catch (final URISyntaxException e) {
             fail("URISyntaxException");
         } catch (final IOException e) {
@@ -161,6 +163,7 @@ public class TmfTraceTest {
             assertEquals("getStartTime", 1, trace.getStartTime().getValue());
             assertEquals("getEndTime", NB_EVENTS, trace.getEndTime().getValue());
 
+            trace.dispose();
         } catch (final URISyntaxException e) {
             fail("URISyntaxException");
         } catch (final IOException e) {
@@ -190,6 +193,8 @@ public class TmfTraceTest {
             assertEquals("getStartTime", 1, trace.getStartTime().getValue());
             assertEquals("getEndTime", NB_EVENTS, trace.getEndTime().getValue());
 
+            original.dispose();
+            trace.dispose();
         } catch (final URISyntaxException e) {
             fail("URISyntaxException");
         } catch (final IOException e) {
@@ -251,6 +256,8 @@ public class TmfTraceTest {
         assertEquals("getRange-end",   Long.MIN_VALUE, trace.getTimeRange().getEndTime().getValue());
         assertEquals("getStartTime",   Long.MIN_VALUE, trace.getStartTime().getValue());
         assertEquals("getEndTime",     Long.MIN_VALUE, trace.getEndTime().getValue());
+
+        trace.dispose();
     }
 
     @Test
@@ -279,6 +286,8 @@ public class TmfTraceTest {
         assertEquals("getRange-end",   Long.MIN_VALUE, trace.getTimeRange().getEndTime().getValue());
         assertEquals("getStartTime",   Long.MIN_VALUE, trace.getStartTime().getValue());
         assertEquals("getEndTime",     Long.MIN_VALUE, trace.getEndTime().getValue());
+
+        trace.dispose();
     }
 
     @Test
@@ -326,6 +335,8 @@ public class TmfTraceTest {
         assertEquals("getRange-end",   NB_EVENTS, trace.getTimeRange().getEndTime().getValue());
         assertEquals("getStartTime",   1,         trace.getStartTime().getValue());
         assertEquals("getEndTime",     NB_EVENTS, trace.getEndTime().getValue());
+
+        trace.dispose();
     }
 
     // ------------------------------------------------------------------------
@@ -368,7 +379,7 @@ public class TmfTraceTest {
         assertEquals("getStartTime",   1,         trace.getStartTime().getValue());
         assertEquals("getEndTime",     NB_EVENTS, trace.getEndTime().getValue());
 
-        trace.setTimeRange(new TmfTimeRange(new TmfTimestamp(100), new TmfTimestamp(200)));
+        trace.setTimeRange(new TmfTimeRange(TmfTimestamp.fromSeconds(100), TmfTimestamp.fromSeconds(200)));
         assertEquals("setTimeRange",   100, trace.getTimeRange().getStartTime().getValue());
         assertEquals("setTimeRange",   200, trace.getTimeRange().getEndTime().getValue());
         assertEquals("setTimeRange",   100, trace.getStartTime().getValue());
@@ -387,7 +398,7 @@ public class TmfTraceTest {
         assertEquals("getStartTime",   1,         trace.getStartTime().getValue());
         assertEquals("getEndTime",     NB_EVENTS, trace.getEndTime().getValue());
 
-        trace.setStartTime(new TmfTimestamp(100));
+        trace.setStartTime(TmfTimestamp.fromSeconds(100));
         assertEquals("setStartTime",   100,       trace.getTimeRange().getStartTime().getValue());
         assertEquals("setStartTime",   NB_EVENTS, trace.getTimeRange().getEndTime().getValue());
         assertEquals("setStartTime",   100,       trace.getStartTime().getValue());
@@ -406,7 +417,7 @@ public class TmfTraceTest {
         assertEquals("getStartTime",   1,         trace.getStartTime().getValue());
         assertEquals("getEndTime",     NB_EVENTS, trace.getEndTime().getValue());
 
-        trace.setEndTime(new TmfTimestamp(100));
+        trace.setEndTime(TmfTimestamp.fromSeconds(100));
         assertEquals("setEndTime",     1,   trace.getTimeRange().getStartTime().getValue());
         assertEquals("setEndTime",     100, trace.getTimeRange().getEndTime().getValue());
         assertEquals("setEndTime",     1,   trace.getStartTime().getValue());
@@ -497,7 +508,7 @@ public class TmfTraceTest {
         assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank());
 
         // Position trace at event rank 1000
-        ITmfContext tmpContext = fTrace.seekEvent(new TmfTimestamp(1001, SCALE));
+        ITmfContext tmpContext = fTrace.seekEvent(TmfTimestamp.create(1001, SCALE));
         context = fTrace.seekEvent(tmpContext.getLocation());
         assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank());
 
@@ -510,7 +521,7 @@ public class TmfTraceTest {
         assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank());
 
         // Position trace at event rank 4000
-        tmpContext = fTrace.seekEvent(new TmfTimestamp(4001, SCALE));
+        tmpContext = fTrace.seekEvent(TmfTimestamp.create(4001, SCALE));
         context = fTrace.seekEvent(tmpContext.getLocation());
         assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank());
 
@@ -526,7 +537,7 @@ public class TmfTraceTest {
     @Test
     public void testSeekEventNotOnCacheBoundary() {
         // Position trace at event rank 9
-        ITmfContext tmpContext = fTrace.seekEvent(new TmfTimestamp(10, SCALE));
+        ITmfContext tmpContext = fTrace.seekEvent(TmfTimestamp.create(10, SCALE));
         TmfContext context = fTrace.seekEvent(tmpContext.getLocation());
         assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank());
 
@@ -539,7 +550,7 @@ public class TmfTraceTest {
         assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank());
 
         // Position trace at event rank 999
-        tmpContext = fTrace.seekEvent(new TmfTimestamp(1000, SCALE));
+        tmpContext = fTrace.seekEvent(TmfTimestamp.create(1000, SCALE));
         context = fTrace.seekEvent(tmpContext.getLocation());
         assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank());
 
@@ -552,7 +563,7 @@ public class TmfTraceTest {
         assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank());
 
         // Position trace at event rank 1001
-        tmpContext = fTrace.seekEvent(new TmfTimestamp(1002, SCALE));
+        tmpContext = fTrace.seekEvent(TmfTimestamp.create(1002, SCALE));
         context = fTrace.seekEvent(tmpContext.getLocation());
         assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank());
 
@@ -565,7 +576,7 @@ public class TmfTraceTest {
         assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank());
 
         // Position trace at event rank 4500
-        tmpContext = fTrace.seekEvent(new TmfTimestamp(4501, SCALE));
+        tmpContext = fTrace.seekEvent(TmfTimestamp.create(4501, SCALE));
         context = fTrace.seekEvent(tmpContext.getLocation());
         assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank());
 
@@ -594,7 +605,7 @@ public class TmfTraceTest {
         assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank());
 
         // Position trace at event passed the end
-        context = fTrace.seekEvent(new TmfTimestamp(NB_EVENTS + 1, SCALE));
+        context = fTrace.seekEvent(TmfTimestamp.create(NB_EVENTS + 1, SCALE));
         assertNull("Event timestamp", context.getLocation());
         assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank());
 
@@ -620,7 +631,7 @@ public class TmfTraceTest {
     @Test
     public void testSeekEventOnTimestampOnCacheBoundary() {
         // Position trace at event rank 0
-        ITmfContext context = fTrace.seekEvent(new TmfTimestamp(1, SCALE));
+        ITmfContext context = fTrace.seekEvent(TmfTimestamp.create(1, SCALE));
         assertEquals("Event rank", 0, context.getRank());
 
         ITmfEvent event = fTrace.parseEvent(context);
@@ -632,7 +643,7 @@ public class TmfTraceTest {
         assertEquals("Event rank", 1, context.getRank());
 
         // Position trace at event rank 1000
-        context = fTrace.seekEvent(new TmfTimestamp(1001, SCALE));
+        context = fTrace.seekEvent(TmfTimestamp.create(1001, SCALE));
         assertEquals("Event rank", 1000, context.getRank());
 
         event = fTrace.parseEvent(context);
@@ -644,7 +655,7 @@ public class TmfTraceTest {
         assertEquals("Event rank", 1001, context.getRank());
 
         // Position trace at event rank 4000
-        context = fTrace.seekEvent(new TmfTimestamp(4001, SCALE));
+        context = fTrace.seekEvent(TmfTimestamp.create(4001, SCALE));
         assertEquals("Event rank", 4000, context.getRank());
 
         event = fTrace.parseEvent(context);
@@ -659,7 +670,7 @@ public class TmfTraceTest {
     @Test
     public void testSeekEventOnTimestampNotOnCacheBoundary() {
         // Position trace at event rank 1
-        ITmfContext context = fTrace.seekEvent(new TmfTimestamp(2, SCALE));
+        ITmfContext context = fTrace.seekEvent(TmfTimestamp.create(2, SCALE));
         assertEquals("Event rank", 1, context.getRank());
 
         ITmfEvent event = fTrace.parseEvent(context);
@@ -671,7 +682,7 @@ public class TmfTraceTest {
         assertEquals("Event rank", 2, context.getRank());
 
         // Position trace at event rank 9
-        context = fTrace.seekEvent(new TmfTimestamp(10, SCALE));
+        context = fTrace.seekEvent(TmfTimestamp.create(10, SCALE));
         assertEquals("Event rank", 9, context.getRank());
 
         event = fTrace.parseEvent(context);
@@ -683,7 +694,7 @@ public class TmfTraceTest {
         assertEquals("Event rank", 10, context.getRank());
 
         // Position trace at event rank 999
-        context = fTrace.seekEvent(new TmfTimestamp(1000, SCALE));
+        context = fTrace.seekEvent(TmfTimestamp.create(1000, SCALE));
         assertEquals("Event rank", 999, context.getRank());
 
         event = fTrace.parseEvent(context);
@@ -695,7 +706,7 @@ public class TmfTraceTest {
         assertEquals("Event rank", 1000, context.getRank());
 
         // Position trace at event rank 1001
-        context = fTrace.seekEvent(new TmfTimestamp(1002, SCALE));
+        context = fTrace.seekEvent(TmfTimestamp.create(1002, SCALE));
         assertEquals("Event rank", 1001, context.getRank());
 
         event = fTrace.parseEvent(context);
@@ -707,7 +718,7 @@ public class TmfTraceTest {
         assertEquals("Event rank", 1002, context.getRank());
 
         // Position trace at event rank 4500
-        context = fTrace.seekEvent(new TmfTimestamp(4501, SCALE));
+        context = fTrace.seekEvent(TmfTimestamp.create(4501, SCALE));
         assertEquals("Event rank", 4500, context.getRank());
 
         event = fTrace.parseEvent(context);
@@ -722,7 +733,7 @@ public class TmfTraceTest {
     @Test
     public void testSeekEventOnTimestampOutOfScope() {
         // Position trace at beginning
-        ITmfContext context = fTrace.seekEvent(new TmfTimestamp(-1, SCALE));
+        ITmfContext context = fTrace.seekEvent(TmfTimestamp.create(-1, SCALE));
         assertEquals("Event rank", 0, context.getRank());
 
         ITmfEvent event = fTrace.parseEvent(context);
@@ -734,7 +745,7 @@ public class TmfTraceTest {
         assertEquals("Event rank", 1, context.getRank());
 
         // Position trace at event passed the end
-        context = fTrace.seekEvent(new TmfTimestamp(NB_EVENTS + 1, SCALE));
+        context = fTrace.seekEvent(TmfTimestamp.create(NB_EVENTS + 1, SCALE));
         assertEquals("Event rank", ITmfContext.UNKNOWN_RANK, context.getRank());
 
         event = fTrace.parseEvent(context);
@@ -887,7 +898,7 @@ public class TmfTraceTest {
         final int NB_READS = 20;
 
         // On lower bound, returns the first event (ts = 0)
-        final TmfContext context = (TmfContext) fTrace.seekEvent(new TmfTimestamp(0, SCALE));
+        final TmfContext context = (TmfContext) fTrace.seekEvent(TmfTimestamp.create(0, SCALE));
         TmfContext svContext = new TmfContext(context);
 
         ITmfEvent event = fTrace.parseEvent(context);
@@ -933,7 +944,7 @@ public class TmfTraceTest {
         final int NB_READS = 20;
 
         // On lower bound, returns the first event (ts = 1)
-        final ITmfContext context = fTrace.seekEvent(new TmfTimestamp(INITIAL_TS, SCALE));
+        final ITmfContext context = fTrace.seekEvent(TmfTimestamp.create(INITIAL_TS, SCALE));
 
         // Read NB_EVENTS
         ITmfEvent event;
@@ -955,7 +966,7 @@ public class TmfTraceTest {
         final int NB_READS = 20;
 
         // On lower bound, returns the first event (ts = 500)
-        final ITmfContext context = fTrace.seekEvent(new TmfTimestamp(INITIAL_TS, SCALE));
+        final ITmfContext context = fTrace.seekEvent(TmfTimestamp.create(INITIAL_TS, SCALE));
 
         // Read NB_EVENTS
         ITmfEvent event;
@@ -977,7 +988,7 @@ public class TmfTraceTest {
         final int NB_READS = 20;
 
         // On lower bound, returns the first event (ts = 500)
-        final ITmfContext context = fTrace.seekEvent(new TmfTimestamp(INITIAL_TS, SCALE));
+        final ITmfContext context = fTrace.seekEvent(TmfTimestamp.create(INITIAL_TS, SCALE));
 
         // Read NB_EVENTS
         ITmfEvent event;
@@ -1212,7 +1223,7 @@ public class TmfTraceTest {
         final int nbEvents  = 1000;
         final Vector<ITmfEvent> requestedEvents = new Vector<>();
 
-        final TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(startTime, SCALE), TmfTimestamp.BIG_CRUNCH);
+        final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.create(startTime, SCALE), TmfTimestamp.BIG_CRUNCH);
         final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class,
                 range, 0, nbEvents, ExecutionType.FOREGROUND) {
             @Override
@@ -1243,7 +1254,7 @@ public class TmfTraceTest {
         final int nbEvents  = 1000;
         final Vector<ITmfEvent> requestedEvents = new Vector<>();
 
-        final TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(startTime, SCALE), TmfTimestamp.BIG_CRUNCH);
+        final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.create(startTime, SCALE), TmfTimestamp.BIG_CRUNCH);
         final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class,
                 range, startIndex, nbEvents, ExecutionType.FOREGROUND) {
             @Override
@@ -1370,14 +1381,15 @@ public class TmfTraceTest {
             testfile = new File(FileLocator.toFileURL(location).toURI());
             trace = new TmfTraceStub(testfile.toURI().getPath(), ITmfTrace.DEFAULT_TRACE_CACHE_SIZE, false, null);
             // verify initial values
-            TmfTimestamp defaultInitRange = new TmfTimestamp(DEFAULT_INITIAL_OFFSET_VALUE, ITmfTimestamp.NANOSECOND_SCALE);
+            ITmfTimestamp defaultInitRange = TmfTimestamp.fromNanos(DEFAULT_INITIAL_OFFSET_VALUE);
             assertEquals("getInitialRangeOffset", defaultInitRange, trace.getInitialRangeOffset());
-            trace.setInitialRangeOffset(new TmfTimestamp(5, ITmfTimestamp.MILLISECOND_SCALE));
+            trace.setInitialRangeOffset(TmfTimestamp.fromMillis(5));
             trace.indexTrace(true);
 
-            TmfTimestamp initRange = new TmfTimestamp(5, ITmfTimestamp.MILLISECOND_SCALE);
+            ITmfTimestamp initRange = TmfTimestamp.fromMillis(5);
             assertEquals("getInitialRangeOffset", initRange, trace.getInitialRangeOffset());
 
+            trace.dispose();
         } catch (final URISyntaxException e) {
             fail("URISyntaxException");
         } catch (final IOException e) {
@@ -1403,8 +1415,8 @@ public class TmfTraceTest {
      */
     @Test
     public void testGetEventAspects() {
-        Iterable<ITmfEventAspect> aspects = fTrace.getEventAspects();
-        for (ITmfEventAspect aspect : aspects) {
+        Iterable<ITmfEventAspect<?>> aspects = fTrace.getEventAspects();
+        for (ITmfEventAspect<?> aspect : aspects) {
             assertTrue(TmfTrace.BASE_ASPECTS.contains(aspect));
         }
     }