Refactor TmfTrace and dependencies - move parseEvent to ITmfEventParser

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.core.tests / src / org / eclipse / linuxtools / tmf / core / tests / experiment / TmfExperimentTest.java

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfExperimentTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfExperimentTest.java
index f80d2c704e6f6f191f0a3871c8b0420a3ab2f1bc..ea72941947585a4aee2d9e265653527be8806a29 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfExperimentTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfExperimentTest.java
@@ -130,7 +130,7 @@ public class TmfExperimentTest extends TestCase {
         // Validate that each checkpoint points to the right event
         for (int i = 0; i < checkpoints.size(); i++) {
             final TmfCheckpoint checkpoint = checkpoints.get(i);
-            final TmfExperimentContext context = fExperiment.seekLocation(checkpoint.getLocation());
+            final TmfExperimentContext context = fExperiment.seekEvent(checkpoint.getLocation());
             final ITmfEvent event = fExperiment.parseEvent(context);
             assertEquals("Event rank", i * pageSize, context.getRank());
             assertTrue("Timestamp", (checkpoint.getTimestamp().compareTo(event.getTimestamp(), false) == 0));
@@ -144,52 +144,52 @@ public class TmfExperimentTest extends TestCase {
     public void testSeekLocationOnCacheBoundary() throws Exception {
 
         // Position trace at event rank 0
-        TmfContext context = fExperiment.seekLocation(null);
+        TmfContext context = fExperiment.seekEvent(0);
         assertEquals("Event rank", 0, context.getRank());
 
         ITmfEvent event = fExperiment.parseEvent(context);
         assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
         assertEquals("Event rank", 0, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
         assertEquals("Event rank", 1, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 2, event.getTimestamp().getValue());
         assertEquals("Event rank", 2, context.getRank());
 
         // Position trace at event rank 1000
         TmfContext tmpContext = fExperiment.seekEvent(new TmfTimestamp(1001, SCALE, 0));
-        context = fExperiment.seekLocation(tmpContext.getLocation());
+        context = fExperiment.seekEvent(tmpContext.getLocation());
         assertEquals("Event rank", 1000, context.getRank());
 
         event = fExperiment.parseEvent(context);
         assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
         assertEquals("Event rank", 1000, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
         assertEquals("Event rank", 1001, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
         assertEquals("Event rank", 1002, context.getRank());
 
         // Position trace at event rank 4000
         tmpContext = fExperiment.seekEvent(new TmfTimestamp(4001, SCALE, 0));
-        context = fExperiment.seekLocation(tmpContext.getLocation());
+        context = fExperiment.seekEvent(tmpContext.getLocation());
         assertEquals("Event rank", 4000, context.getRank());
 
         event = fExperiment.parseEvent(context);
         assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
         assertEquals("Event rank", 4000, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
         assertEquals("Event rank", 4001, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 4002, event.getTimestamp().getValue());
         assertEquals("Event rank", 4002, context.getRank());
     }
@@ -198,53 +198,53 @@ public class TmfExperimentTest extends TestCase {
 
         // Position trace at event rank 9
         TmfContext tmpContext = fExperiment.seekEvent(new TmfTimestamp(10, SCALE, 0));
-        TmfContext context = fExperiment.seekLocation(tmpContext.getLocation());
+        TmfContext context = fExperiment.seekEvent(tmpContext.getLocation());
         assertEquals("Event rank", 9, context.getRank());
 
         ITmfEvent event = fExperiment.parseEvent(context);
         assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
         assertEquals("Event rank", 9, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
         assertEquals("Event rank", 10, context.getRank());
 
         // Position trace at event rank 999
         tmpContext = fExperiment.seekEvent(new TmfTimestamp(1000, SCALE, 0));
-        context = fExperiment.seekLocation(tmpContext.getLocation());
+        context = fExperiment.seekEvent(tmpContext.getLocation());
         assertEquals("Event rank", 999, context.getRank());
 
         event = fExperiment.parseEvent(context);
         assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
         assertEquals("Event rank", 999, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
         assertEquals("Event rank", 1000, context.getRank());
 
         // Position trace at event rank 1001
         tmpContext = fExperiment.seekEvent(new TmfTimestamp(1002, SCALE, 0));
-        context = fExperiment.seekLocation(tmpContext.getLocation());
+        context = fExperiment.seekEvent(tmpContext.getLocation());
         assertEquals("Event rank", 1001, context.getRank());
 
         event = fExperiment.parseEvent(context);
         assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
         assertEquals("Event rank", 1001, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
         assertEquals("Event rank", 1002, context.getRank());
 
         // Position trace at event rank 4500
         tmpContext = fExperiment.seekEvent(new TmfTimestamp(4501, SCALE, 0));
-        context = fExperiment.seekLocation(tmpContext.getLocation());
+        context = fExperiment.seekEvent(tmpContext.getLocation());
         assertEquals("Event rank", 4500, context.getRank());
 
         event = fExperiment.parseEvent(context);
         assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
         assertEquals("Event rank", 4500, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
         assertEquals("Event rank", 4501, context.getRank());
     }
@@ -252,15 +252,15 @@ public class TmfExperimentTest extends TestCase {
     public void testSeekLocationOutOfScope() throws Exception {
 
         // Position trace at beginning
-        TmfContext tmpContext = fExperiment.seekLocation(null);
-        final TmfContext context = fExperiment.seekLocation(tmpContext.getLocation());
+        TmfContext tmpContext = fExperiment.seekEvent(0);
+        final TmfContext context = fExperiment.seekEvent(tmpContext.getLocation());
         assertEquals("Event rank", 0, context.getRank());
 
         ITmfEvent event = fExperiment.parseEvent(context);
         assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
         assertEquals("Event rank", 0, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
         assertEquals("Event rank", 1, context.getRank());
 
@@ -284,7 +284,7 @@ public class TmfExperimentTest extends TestCase {
         assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
         assertEquals("Event rank", 0, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
         assertEquals("Event rank", 1, context.getRank());
 
@@ -296,7 +296,7 @@ public class TmfExperimentTest extends TestCase {
         assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
         assertEquals("Event rank", 1000, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
         assertEquals("Event rank", 1001, context.getRank());
 
@@ -308,7 +308,7 @@ public class TmfExperimentTest extends TestCase {
         assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
         assertEquals("Event rank", 4000, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
         assertEquals("Event rank", 4001, context.getRank());
     }
@@ -323,7 +323,7 @@ public class TmfExperimentTest extends TestCase {
         assertEquals("Event timestamp", 2, event.getTimestamp().getValue());
         assertEquals("Event rank", 1, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 2, event.getTimestamp().getValue());
         assertEquals("Event rank", 2, context.getRank());
 
@@ -335,7 +335,7 @@ public class TmfExperimentTest extends TestCase {
         assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
         assertEquals("Event rank", 9, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
         assertEquals("Event rank", 10, context.getRank());
 
@@ -347,7 +347,7 @@ public class TmfExperimentTest extends TestCase {
         assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
         assertEquals("Event rank", 999, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
         assertEquals("Event rank", 1000, context.getRank());
 
@@ -359,7 +359,7 @@ public class TmfExperimentTest extends TestCase {
         assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
         assertEquals("Event rank", 1001, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
         assertEquals("Event rank", 1002, context.getRank());
 
@@ -371,7 +371,7 @@ public class TmfExperimentTest extends TestCase {
         assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
         assertEquals("Event rank", 4500, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
         assertEquals("Event rank", 4501, context.getRank());
     }
@@ -386,7 +386,7 @@ public class TmfExperimentTest extends TestCase {
         assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
         assertEquals("Event rank", 0, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
         assertEquals("Event rank", 1, context.getRank());
 
@@ -410,7 +410,7 @@ public class TmfExperimentTest extends TestCase {
         assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
         assertEquals("Event rank", 0, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
         assertEquals("Event rank", 1, context.getRank());
 
@@ -422,7 +422,7 @@ public class TmfExperimentTest extends TestCase {
         assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
         assertEquals("Event rank", 1000, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 1001, event.getTimestamp().getValue());
         assertEquals("Event rank", 1001, context.getRank());
 
@@ -434,7 +434,7 @@ public class TmfExperimentTest extends TestCase {
         assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
         assertEquals("Event rank", 4000, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 4001, event.getTimestamp().getValue());
         assertEquals("Event rank", 4001, context.getRank());
     }
@@ -449,7 +449,7 @@ public class TmfExperimentTest extends TestCase {
         assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
         assertEquals("Event rank", 9, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
         assertEquals("Event rank", 10, context.getRank());
 
@@ -461,7 +461,7 @@ public class TmfExperimentTest extends TestCase {
         assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
         assertEquals("Event rank", 999, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 1000, event.getTimestamp().getValue());
         assertEquals("Event rank", 1000, context.getRank());
 
@@ -473,7 +473,7 @@ public class TmfExperimentTest extends TestCase {
         assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
         assertEquals("Event rank", 1001, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 1002, event.getTimestamp().getValue());
         assertEquals("Event rank", 1002, context.getRank());
 
@@ -485,7 +485,7 @@ public class TmfExperimentTest extends TestCase {
         assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
         assertEquals("Event rank", 4500, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 4501, event.getTimestamp().getValue());
         assertEquals("Event rank", 4501, context.getRank());
     }
@@ -500,7 +500,7 @@ public class TmfExperimentTest extends TestCase {
         assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
         assertEquals("Event rank", 0, context.getRank());
 
-        event = fExperiment.getNextEvent(context);
+        event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
         assertEquals("Event rank", 1, context.getRank());
 
@@ -525,7 +525,7 @@ public class TmfExperimentTest extends TestCase {
         // Read NB_EVENTS
         ITmfEvent event = null;;
         for (int i = 0; i < NB_READS; i++) {
-            event = fExperiment.getNextEvent(context);
+            event = fExperiment.readEvent(context);
             assertEquals("Event timestamp", i + 1, event.getTimestamp().getValue());
             assertEquals("Event rank", i + 1, context.getRank());
         }
@@ -544,11 +544,11 @@ public class TmfExperimentTest extends TestCase {
 
         // On lower bound, returns the first event (ts = 0)
         final TmfContext context = fExperiment.seekEvent(new TmfTimestamp(0, SCALE, 0));
-        ITmfEvent event = fExperiment.getNextEvent(context);
+        ITmfEvent event = fExperiment.readEvent(context);
         assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
 
         for (int i = 2; i < 20; i++) {
-            event = fExperiment.getNextEvent(context);
+            event = fExperiment.readEvent(context);
             assertEquals("Event timestamp", i, event.getTimestamp().getValue());
         }
     }