Change ITmfTrace<T extends TmfEvent> to ITmfTrace<T extends ITmfEvent>

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

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfMultiTraceExperimentTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfMultiTraceExperimentTest.java
index d246a9e9eff8727748482f243c7e9b2f0abc57d3..2760e9cc132dc70e02fd2c001c77ee6119ac46d8 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfMultiTraceExperimentTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/experiment/TmfMultiTraceExperimentTest.java
@@ -22,6 +22,7 @@ import junit.framework.TestCase;
 
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
@@ -134,7 +135,7 @@ public class TmfMultiTraceExperimentTest extends TestCase {
                for (int i = 0; i < checkpoints.size(); i++) {
                        TmfCheckpoint checkpoint = checkpoints.get(i);
                TmfExperimentContext context = fExperiment.seekLocation(checkpoint.getLocation());
-                       TmfEvent event = fExperiment.parseEvent(context);
+               ITmfEvent event = fExperiment.parseEvent(context);
                        assertEquals("Event rank", context.getRank(), i * pageSize);
                        assertTrue("Timestamp", (checkpoint.getTimestamp().compareTo(event.getTimestamp(), false) == 0));
                }               
@@ -150,7 +151,7 @@ public class TmfMultiTraceExperimentTest extends TestCase {
        TmfContext context = fExperiment.seekLocation(null);
         assertEquals("Event rank", 0, context.getRank());
 
-        TmfEvent event = fExperiment.parseEvent(context);
+        ITmfEvent event = fExperiment.parseEvent(context);
         assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
         assertEquals("Event rank", 0, context.getRank());
        
@@ -204,7 +205,7 @@ public class TmfMultiTraceExperimentTest extends TestCase {
         TmfContext context = fExperiment.seekLocation(tmpContext.getLocation());
         assertEquals("Event rank", 9, context.getRank());
        
-        TmfEvent event = fExperiment.parseEvent(context);
+        ITmfEvent event = fExperiment.parseEvent(context);
         assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
         assertEquals("Event rank", 9, context.getRank());
        
@@ -259,7 +260,7 @@ public class TmfMultiTraceExperimentTest extends TestCase {
         TmfContext context = fExperiment.seekLocation(tmpContext.getLocation());
         assertEquals("Event rank", 0, context.getRank());
        
-        TmfEvent event = fExperiment.parseEvent(context);
+        ITmfEvent event = fExperiment.parseEvent(context);
         assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
         assertEquals("Event rank", 0, context.getRank());
        
@@ -283,7 +284,7 @@ public class TmfMultiTraceExperimentTest extends TestCase {
                TmfContext context = fExperiment.seekEvent(new TmfTimestamp(1, SCALE, 0));
                assertEquals("Event rank", 0, context.getRank());
 
-               TmfEvent event = fExperiment.parseEvent(context);
+               ITmfEvent event = fExperiment.parseEvent(context);
                assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
                assertEquals("Event rank", 0, context.getRank());
                
@@ -322,7 +323,7 @@ public class TmfMultiTraceExperimentTest extends TestCase {
                TmfContext context = fExperiment.seekEvent(new TmfTimestamp(2, SCALE, 0));
                assertEquals("Event rank", 1, context.getRank());
                
-               TmfEvent event = fExperiment.parseEvent(context);
+               ITmfEvent event = fExperiment.parseEvent(context);
                assertEquals("Event timestamp", 2, event.getTimestamp().getValue());
                assertEquals("Event rank", 1, context.getRank());
                
@@ -385,7 +386,7 @@ public class TmfMultiTraceExperimentTest extends TestCase {
                TmfContext context = fExperiment.seekEvent(new TmfTimestamp(-1, SCALE, 0));
                assertEquals("Event rank", 0, context.getRank());
                
-               TmfEvent event = fExperiment.parseEvent(context);
+               ITmfEvent event = fExperiment.parseEvent(context);
                assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
                assertEquals("Event rank", 0, context.getRank());
                
@@ -409,7 +410,7 @@ public class TmfMultiTraceExperimentTest extends TestCase {
                TmfContext context = fExperiment.seekEvent(0);
                assertEquals("Event rank", 0, context.getRank());
                
-               TmfEvent event = fExperiment.parseEvent(context);
+               ITmfEvent event = fExperiment.parseEvent(context);
                assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
                assertEquals("Event rank", 0, context.getRank());
                
@@ -448,7 +449,7 @@ public class TmfMultiTraceExperimentTest extends TestCase {
                TmfContext context = fExperiment.seekEvent(9);
                assertEquals("Event rank", 9, context.getRank());
                
-               TmfEvent event = fExperiment.parseEvent(context);
+               ITmfEvent event = fExperiment.parseEvent(context);
                assertEquals("Event timestamp", 10, event.getTimestamp().getValue());
                assertEquals("Event rank", 9, context.getRank());
                
@@ -499,7 +500,7 @@ public class TmfMultiTraceExperimentTest extends TestCase {
                TmfContext context = fExperiment.seekEvent(-1);
                assertEquals("Event rank", 0, context.getRank());
                
-               TmfEvent event = fExperiment.parseEvent(context);
+               ITmfEvent event = fExperiment.parseEvent(context);
                assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
                assertEquals("Event rank", 0, context.getRank());
                
@@ -526,7 +527,7 @@ public class TmfMultiTraceExperimentTest extends TestCase {
        TmfContext context = fExperiment.seekEvent(new TmfTimestamp(0, SCALE, 0));
 
        // Read NB_EVENTS
-       TmfEvent event = null;;
+       ITmfEvent event = null;;
         for (int i = 0; i < NB_READS; i++) {
             event = fExperiment.getNextEvent(context);
             assertEquals("Event timestamp", i + 1, event.getTimestamp().getValue());
@@ -547,7 +548,7 @@ public class TmfMultiTraceExperimentTest extends TestCase {
 
        // On lower bound, returns the first event (ts = 0)
        TmfContext context = fExperiment.seekEvent(new TmfTimestamp(0, SCALE, 0));
-        TmfEvent event = fExperiment.getNextEvent(context);
+       ITmfEvent event = fExperiment.getNextEvent(context);
         assertEquals("Event timestamp", 1, event.getTimestamp().getValue());
 
         for (int i = 2; i < 20; i++) {