2010-09-17 Francois Chouinard <fchouinard@gmail.com> Contribution for Bug325662

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

diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfExperimentTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfExperimentTest.java
index dcb6f904348c64467251049168e64f386989cd36..589eac0a6cb282456a9d6e31b005c010076338d6 100644 (file)
--- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfExperimentTest.java
+++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/experiment/TmfExperimentTest.java
@@ -563,11 +563,9 @@ public class TmfExperimentTest extends TestCase {
         TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
         final TmfEventRequest<TmfEvent> request = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, nbEvents, blockSize) {
             @Override
-            public void handleData() {
-               TmfEvent[] events = getData();
-                for (TmfEvent e : events) {
-                    requestedEvents.add(e);
-                }
+            public void handleData(TmfEvent event) {
+               super.handleData(event);
+                requestedEvents.add(event);
             }
         };
         fExperiment.sendRequest(request);
@@ -592,13 +590,11 @@ public class TmfExperimentTest extends TestCase {
 
         TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
         final TmfEventRequest<TmfEvent> request = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, nbEvents, blockSize) {
-            @Override
-            public void handleData() {
-               TmfEvent[] events = getData();
-                for (TmfEvent e : events) {
-                    requestedEvents.add(e);
-                }
-            }
+               @Override
+               public void handleData(TmfEvent event) {
+                       super.handleData(event);
+                       requestedEvents.add(event);
+               }
         };
         fExperiment.sendRequest(request);
         request.waitForCompletion();
@@ -623,13 +619,11 @@ public class TmfExperimentTest extends TestCase {
 
         TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
         final TmfEventRequest<TmfEvent> request = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, nbEvents, blockSize) {
-            @Override
-            public void handleData() {
-               TmfEvent[] events = getData();
-                for (TmfEvent e : events) {
-                    requestedEvents.add(e);
-                }
-            }
+               @Override
+               public void handleData(TmfEvent event) {
+                       super.handleData(event);
+                       requestedEvents.add(event);
+               }
         };
         fExperiment.sendRequest(request);
         request.waitForCompletion();
@@ -657,15 +651,14 @@ public class TmfExperimentTest extends TestCase {
 
         TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
         final TmfEventRequest<TmfEvent> request = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, nbEvents, blockSize) {
-            @Override
-            public void handleData() {
-               TmfEvent[] events = getData();
-                for (TmfEvent e : events) {
-                    requestedEvents.add(e);
-                }
-                // Cancel request after the first chunk is received
-                cancel();
-            }
+               int nbRead = 0;
+               @Override
+               public void handleData(TmfEvent event) {
+                       super.handleData(event);
+                       requestedEvents.add(event);
+                       if (++nbRead == blockSize)
+                               cancel();
+               }
             @Override
             public void handleCancel() {
                if (requestedEvents.size() < blockSize) {