tmf: Fix regression in event requests

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

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java
index c148c2469f057223dacab3f90e41805e157a710d..1b957a841643692c9cb83f5daa5dccc206df80ad 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java
@@ -18,7 +18,6 @@ import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.Vector;
 
 import junit.framework.TestCase;
@@ -26,7 +25,7 @@ import junit.framework.TestCase;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.linuxtools.internal.tmf.core.component.TmfProviderManager;
-import org.eclipse.linuxtools.tmf.core.component.ITmfEventProvider;
+import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
@@ -48,7 +47,7 @@ import org.eclipse.linuxtools.tmf.tests.stubs.trace.TmfTraceStub;
 /**
  * Test suite for the TmfTrace class.
  */
-@SuppressWarnings({"nls","javadoc", "deprecation"})
+@SuppressWarnings({"nls","javadoc"})
 public class TmfTraceTest extends TestCase {
 
     // ------------------------------------------------------------------------
@@ -1217,124 +1216,6 @@ public class TmfTraceTest extends TestCase {
         assertNull("Event", event);
     }
 
-    // ------------------------------------------------------------------------
-    // Iterate over trace
-    // ------------------------------------------------------------------------
-
-    public void testIterateOverAllEvents() {
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
-
-        final ITmfEventProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
-        final ITmfTrace trace = (ITmfTrace) providers[0];
-        final Iterator<ITmfEvent> it = trace.iterator();
-        while (it.hasNext()) {
-            requestedEvents.add(it.next());
-        }
-
-        // Validate results
-        assertEquals("nbEvents", NB_EVENTS, requestedEvents.size());
-        for (int i = 0; i < NB_EVENTS; i++) {
-            assertEquals("Distinct events", i + 1, requestedEvents.get(i).getTimestamp().getValue());
-        }
-    }
-
-    public void testIterateOverNbEvents() {
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
-        final int nbRequestedEvents = 100;
-
-        final ITmfEventProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
-        final ITmfTrace trace = (ITmfTrace) providers[0];
-        final Iterator<ITmfEvent> it = trace.iterator();
-        int nbEventsToRead = nbRequestedEvents;
-        while (it.hasNext() && nbEventsToRead-- > 0) {
-            requestedEvents.add(it.next());
-        }
-
-        // Validate results
-        assertEquals("nbEvents", nbRequestedEvents, requestedEvents.size());
-        for (int i = 0; i < nbRequestedEvents; i++) {
-            assertEquals("Distinct events", i + 1, requestedEvents.get(i).getTimestamp().getValue());
-        }
-    }
-
-    public void testIterateOverNbEventsByRank() {
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
-        final int startEventRank = 100;
-        final int nbRequestedEvents = 100;
-
-        final ITmfEventProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
-        final ITmfTrace trace = (ITmfTrace) providers[0];
-        final Iterator<ITmfEvent> it = trace.iterator(startEventRank);
-        int nbEventsToRead = nbRequestedEvents;
-        while (it.hasNext() && nbEventsToRead-- > 0) {
-            requestedEvents.add(it.next());
-        }
-
-        // Validate results
-        assertEquals("nbEvents", nbRequestedEvents, requestedEvents.size());
-        for (int i = 0; i < nbRequestedEvents; i++) {
-            assertEquals("Distinct events", startEventRank + i + 1, requestedEvents.get(i).getTimestamp().getValue());
-        }
-    }
-
-    public void testIterateOverNbEventsByTimestamp() {
-        final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
-        final ITmfTimestamp startEventTimestamp = new TmfTimestamp(100, SCALE);
-        final int nbRequestedEvents = 100;
-
-        final ITmfEventProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
-        final ITmfTrace trace = (ITmfTrace) providers[0];
-        final Iterator<ITmfEvent> it = trace.iterator(startEventTimestamp);
-        int nbEventsToRead = nbRequestedEvents;
-        while (it.hasNext() && nbEventsToRead-- > 0) {
-            requestedEvents.add(it.next());
-        }
-
-        // Validate results
-        assertEquals("nbEvents", nbRequestedEvents, requestedEvents.size());
-        for (int i = 0; i < nbRequestedEvents; i++) {
-            assertEquals("Distinct events", startEventTimestamp.getValue() + i, requestedEvents.get(i).getTimestamp().getValue());
-        }
-    }
-
-    public void testIterateOverEventsMixed() {
-        final Vector<ITmfEvent> requestedEvents1 = new Vector<ITmfEvent>();
-        final Vector<ITmfEvent> requestedEvents2 = new Vector<ITmfEvent>();
-        final int nbRequestedEvents = 100;
-
-        final ITmfEventProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
-        final ITmfTrace trace = (ITmfTrace) providers[0];
-
-        final Iterator<ITmfEvent> it1 = trace.iterator();
-        final Iterator<ITmfEvent> it2 = trace.iterator();
-
-        int nbEventsToRead = nbRequestedEvents;
-        while (it1.hasNext() && nbEventsToRead-- > 0) {
-            requestedEvents1.add(it1.next());
-            if (nbEventsToRead % 2 == 0) {
-                requestedEvents2.add(it2.next());
-            }
-        }
-
-        // Intermediate validation
-        assertEquals("nbEvents", nbRequestedEvents, requestedEvents1.size());
-        assertEquals("nbEvents", nbRequestedEvents / 2, requestedEvents2.size());
-
-        // Finish the job
-        nbEventsToRead = nbRequestedEvents / 2;
-        while (it2.hasNext() && nbEventsToRead-- > 0) {
-            requestedEvents2.add(it2.next());
-        }
-
-        // Final validation
-        assertEquals("nbEvents", nbRequestedEvents, requestedEvents1.size());
-        assertEquals("nbEvents", nbRequestedEvents, requestedEvents2.size());
-        for (int i = 0; i < nbRequestedEvents; i++) {
-            assertEquals("Distinct events", i + 1, requestedEvents1.get(i).getTimestamp().getValue());
-            assertEquals("Distinct events", i + 1, requestedEvents2.get(i).getTimestamp().getValue());
-        }
-    }
-
     // ------------------------------------------------------------------------
     // processRequest
     // ------------------------------------------------------------------------
@@ -1352,7 +1233,7 @@ public class TmfTraceTest extends TestCase {
                 requestedEvents.add(event);
             }
         };
-        final ITmfEventProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
         providers[0].sendRequest(request);
         request.waitForCompletion();
 
@@ -1381,7 +1262,7 @@ public class TmfTraceTest extends TestCase {
                 requestedEvents.add(event);
             }
         };
-        final ITmfEventProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
         providers[0].sendRequest(request);
         request.waitForCompletion();
 
@@ -1411,7 +1292,7 @@ public class TmfTraceTest extends TestCase {
                 requestedEvents.add(event);
             }
         };
-        final ITmfEventProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
         providers[0].sendRequest(request);
         request.waitForCompletion();
 
@@ -1442,7 +1323,7 @@ public class TmfTraceTest extends TestCase {
                 requestedEvents.add(event);
             }
         };
-        final ITmfEventProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
         providers[0].sendRequest(request);
         request.waitForCompletion();
 
@@ -1470,7 +1351,7 @@ public class TmfTraceTest extends TestCase {
                 requestedEvents.add(event);
             }
         };
-        final ITmfEventProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
         providers[0].sendRequest(request);
         request.waitForCompletion();
 
@@ -1504,7 +1385,7 @@ public class TmfTraceTest extends TestCase {
                 }
             }
         };
-        final ITmfEventProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
         providers[0].sendRequest(request);
         request.waitForCompletion();