Rename xxx.lttng to xxx.lttng.core
[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.tests / src / org / eclipse / linuxtools / tmf / tests / request / TmfCoalescedEventRequestTest.java
index 525edf56be2d7fefda955d523d13f0a04cfc005f..d97af006f0daa8a322c1b5e8e3e0f87ebf889b84 100644 (file)
@@ -25,9 +25,6 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.linuxtools.tmf.component.ITmfDataProvider;
 import org.eclipse.linuxtools.tmf.component.TmfProviderManager;
 import org.eclipse.linuxtools.tmf.event.TmfEvent;
-import org.eclipse.linuxtools.tmf.event.TmfEventReference;
-import org.eclipse.linuxtools.tmf.event.TmfEventSource;
-import org.eclipse.linuxtools.tmf.event.TmfEventType;
 import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.request.TmfCoalescedDataRequest;
@@ -39,13 +36,13 @@ import org.eclipse.linuxtools.tmf.signal.TmfSignalHandler;
 import org.eclipse.linuxtools.tmf.signal.TmfSignalManager;
 import org.eclipse.linuxtools.tmf.tests.TmfCoreTestPlugin;
 import org.eclipse.linuxtools.tmf.trace.TmfTraceStub;
-import org.osgi.framework.Bundle;
 
 /**
  * <b><u>TmfCoalescedEventRequestTest</u></b>
  * <p>
  * Test suite for the TmfCoalescedEventRequest class.
  */
+@SuppressWarnings("nls")
 public class TmfCoalescedEventRequestTest extends TestCase {
 
        // ------------------------------------------------------------------------
@@ -132,7 +129,6 @@ public class TmfCoalescedEventRequestTest extends TestCase {
 
         assertEquals("getRange", range1, request.getRange());
         assertEquals("getNbRequestedEvents", TmfEventRequest.ALL_DATA, request.getNbRequested());
-        assertEquals("getBlockize", TmfEventRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
 
         assertFalse("isCompleted", request.isCompleted());
         assertFalse("isFailed", request.isFailed());
@@ -149,7 +145,6 @@ public class TmfCoalescedEventRequestTest extends TestCase {
 
         assertEquals("getRange", range1, request.getRange());
         assertEquals("getNbRequestedEvents", TmfEventRequest.ALL_DATA, request.getNbRequested());
-        assertEquals("getBlockize", TmfEventRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
 
         assertFalse("isCompleted", request.isCompleted());
         assertFalse("isFailed", request.isFailed());
@@ -166,7 +161,6 @@ public class TmfCoalescedEventRequestTest extends TestCase {
 
         assertEquals("getRange", range1, request.getRange());
         assertEquals("getNbRequestedEvents", 100, request.getNbRequested());
-        assertEquals("getBlockize", TmfEventRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
 
         assertFalse("isCompleted", request.isCompleted());
         assertFalse("isFailed", request.isFailed());
@@ -183,7 +177,6 @@ public class TmfCoalescedEventRequestTest extends TestCase {
 
         assertEquals("getRange", range1, request.getRange());
         assertEquals("getNbRequestedEvents", 100, request.getNbRequested());
-        assertEquals("getBlockize", 200, request.getBlockize());
 
         assertFalse("isCompleted", request.isCompleted());
         assertFalse("isFailed", request.isFailed());
@@ -227,11 +220,11 @@ public class TmfCoalescedEventRequestTest extends TestCase {
 
        public void testEqualsSuper() throws Exception {
                TmfCoalescedDataRequest<TmfEvent> dataRequest1 = new TmfCoalescedDataRequest<TmfEvent>(
-                       fRequest1.getDataType(), fRequest1.getIndex(), fRequest1.getNbRequested(), fRequest1.getBlockize());
+                               fRequest1.getDataType(), fRequest1.getIndex(), fRequest1.getNbRequested());
                TmfCoalescedDataRequest<TmfEvent> dataRequest2 = new TmfCoalescedDataRequest<TmfEvent>(
-                       fRequest1.getDataType(), fRequest1.getIndex(), fRequest1.getNbRequested(), fRequest1.getBlockize());
+                               fRequest1.getDataType(), fRequest1.getIndex(), fRequest1.getNbRequested());
                TmfCoalescedDataRequest<TmfEvent> dataRequest3 = new TmfCoalescedDataRequest<TmfEvent>(
-                       fRequest3.getDataType(), fRequest3.getIndex(), fRequest3.getNbRequested(), fRequest3.getBlockize());
+                               fRequest3.getDataType(), fRequest3.getIndex(), fRequest3.getNbRequested());
 
                assertTrue("equals", fRequest1.equals(dataRequest2));
         assertTrue("equals", fRequest2.equals(dataRequest1));
@@ -254,10 +247,10 @@ public class TmfCoalescedEventRequestTest extends TestCase {
        // ------------------------------------------------------------------------
 
        public void testToString() {
-        String expected1 = "[TmfCoalescedEventRequest(0,TmfEvent," + range1 + ",100,200)]";
-        String expected2 = "[TmfCoalescedEventRequest(1,TmfEvent," + range2 + ",100,200)]";
-        String expected3 = "[TmfCoalescedEventRequest(2,TmfEvent," + range2 + ",200,200)]";
-        String expected4 = "[TmfCoalescedEventRequest(3,TmfEvent," + range2 + ",200,300)]";
+        String expected1 = "[TmfCoalescedEventRequest(0,TmfEvent," + range1 + ",0,100,200)]";
+        String expected2 = "[TmfCoalescedEventRequest(1,TmfEvent," + range2 + ",0,100,200)]";
+        String expected3 = "[TmfCoalescedEventRequest(2,TmfEvent," + range2 + ",0,200,200)]";
+        String expected4 = "[TmfCoalescedEventRequest(3,TmfEvent," + range2 + ",0,200,300)]";
 
         assertEquals("toString", expected1, fRequest1.toString());
         assertEquals("toString", expected2, fRequest2.toString());
@@ -272,64 +265,12 @@ public class TmfCoalescedEventRequestTest extends TestCase {
        public void testIsCompatible() {
                TmfCoalescedEventRequest<TmfEvent> coalescedRequest = new TmfCoalescedEventRequest<TmfEvent>(TmfEvent.class, range1, 100, 200);
                TmfEventRequest<TmfEvent> request1 = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range1, 100, 200);
-//             TmfEventRequest<TmfEvent> request2 = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range2, 100, 200);
-//             TmfEventRequest<TmfEvent> request3 = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range1, 101, 200);
-//             TmfEventRequest<TmfEvent> request4 = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range1, 100, 201);
-//             TmfDataRequest<TmfEvent>  request5 = new TmfDataRequestStub<TmfEvent> (TmfEvent.class,     10, 100, 201);
+               TmfEventRequest<TmfEvent> request2 = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range2, 100, 200);
+               TmfEventRequest<TmfEvent> request3 = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range1, 101, 200);
 
         assertTrue ("isCompatible", coalescedRequest.isCompatible(request1));
-//        assertFalse("isCompatible", coalescedRequest.isCompatible(request2));
-//        assertFalse("isCompatible", coalescedRequest.isCompatible(request3));
-//        assertFalse("isCompatible", coalescedRequest.isCompatible(request4));
-//        assertFalse("isCompatible", coalescedRequest.isCompatible(request5));
-       }
-
-       // ------------------------------------------------------------------------
-       // setData/getData
-       // ------------------------------------------------------------------------
-
-       public void testSetData() {
-
-               TmfCoalescedEventRequest<TmfEvent> coalescedRequest = new TmfCoalescedEventRequest<TmfEvent>(TmfEvent.class, range1, 100, 200);
-               TmfEventRequest<TmfEvent> request1 = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range1, 100, 200);
-               TmfEventRequest<TmfEvent> request2 = new TmfEventRequestStub<TmfEvent>(TmfEvent.class, range1, 100, 200);
-               coalescedRequest.addRequest(request1);
-               coalescedRequest.addRequest(request2);
-
-               // Initialize the data
-               int nbEvents = 10;
-               TmfEvent[] events = new TmfEvent[nbEvents];
-               for (int i = 0; i < nbEvents; i++) {
-                       events[i] = new TmfEvent(new TmfTimestamp(i), new TmfEventSource(),
-                                       new TmfEventType(), new TmfEventReference());
-               }
-
-               coalescedRequest.setData(events);
-               coalescedRequest.handleData();
-
-               // Validate the coalescing request
-               assertEquals("setData", nbEvents, coalescedRequest.getNbRead());
-               TmfEvent[] eventsRead1 = coalescedRequest.getData();
-               assertEquals("getData", nbEvents, eventsRead1.length);
-               for (int i = 0; i < nbEvents; i++) {
-                       assertEquals("getData", i, eventsRead1[i].getTimestamp().getValue());
-               }
-
-               // Validate the first coalesced request
-               assertEquals("setData", nbEvents, request1.getNbRead());
-               TmfEvent[] eventsRead2 = request1.getData();
-               assertEquals("getData", nbEvents, eventsRead2.length);
-               for (int i = 0; i < nbEvents; i++) {
-                       assertEquals("getData", i, eventsRead2[i].getTimestamp().getValue());
-               }
-
-               // Validate the second coalesced request
-               assertEquals("setData", nbEvents, request2.getNbRead());
-               TmfEvent[] eventsRead3 = request2.getData();
-               assertEquals("getData", nbEvents, eventsRead3.length);
-               for (int i = 0; i < nbEvents; i++) {
-                       assertEquals("getData", i, eventsRead3[i].getTimestamp().getValue());
-               }
+        assertTrue ("isCompatible", coalescedRequest.isCompatible(request2));
+        assertFalse("isCompatible", coalescedRequest.isCompatible(request3));
        }
 
        // ------------------------------------------------------------------------
@@ -498,14 +439,13 @@ public class TmfCoalescedEventRequestTest extends TestCase {
 
         requestedEvents1 = new Vector<TmfEvent>();
         request1 = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
+               int nbRead = 0;
             @Override
-            public void handleData() {
+            public void handleData(TmfEvent event) {
+                       super.handleData(event);
                if (!isCompleted()) {
-                       TmfEvent[] events = getData();
-                       for (TmfEvent e : events) {
-                               requestedEvents1.add(e);
-                       }
-                       if (signal.forceCancel)
+                               requestedEvents1.add(event);
+                       if (++nbRead >= BLOCK_SIZE && signal.forceCancel)
                                cancel();
                }
             }
@@ -514,12 +454,10 @@ public class TmfCoalescedEventRequestTest extends TestCase {
         requestedEvents2 = new Vector<TmfEvent>();
         request2 = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
             @Override
-            public void handleData() {
+            public void handleData(TmfEvent event) {
+                       super.handleData(event);
                if (!isCompleted()) {
-                       TmfEvent[] events = getData();
-                       for (TmfEvent e : events) {
-                               requestedEvents2.add(e);
-                       }
+                       requestedEvents2.add(event);
                }
             }
         };
@@ -527,12 +465,10 @@ public class TmfCoalescedEventRequestTest extends TestCase {
         requestedEvents3 = new Vector<TmfEvent>();
         request3 = new TmfEventRequest<TmfEvent>(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
             @Override
-            public void handleData() {
+            public void handleData(TmfEvent event) {
+                       super.handleData(event);
                if (!isCompleted()) {
-                       TmfEvent[] events = getData();
-                       for (TmfEvent e : events) {
-                               requestedEvents3.add(e);
-                       }
+                       requestedEvents3.add(event);
                }
             }
         };
@@ -543,77 +479,77 @@ public class TmfCoalescedEventRequestTest extends TestCase {
         providers[0].sendRequest(request3);
     }
 
-//    public void testCoalescedRequest() throws Exception {
-//
-//             fTrace = setupTrace(DIRECTORY + File.separator + TEST_STREAM);
-//
-//     TmfSignalManager.register(this);
-//             TmfTestTriggerSignal signal = new TmfTestTriggerSignal(this, false);
-//     TmfSignalManager.dispatchSignal(signal);
-//
-//        request1.waitForCompletion();
-//        request2.waitForCompletion();
-//        request3.waitForCompletion();
-//
-//        assertEquals("Request1: nbEvents", NB_EVENTS, requestedEvents1.size());
-//        assertTrue  ("Request1: isCompleted", request1.isCompleted());
-//        assertFalse ("Request1: isCancelled", request1.isCancelled());
-//
-//        assertEquals("Request2: nbEvents", NB_EVENTS, requestedEvents2.size());
-//        assertTrue  ("Request2: isCompleted", request2.isCompleted());
-//        assertFalse ("Request2: isCancelled", request2.isCancelled());
-//
-//        assertEquals("Request3: nbEvents", NB_EVENTS, requestedEvents3.size());
-//        assertTrue  ("Request3: isCompleted", request3.isCompleted());
-//        assertFalse ("Request3: isCancelled", request3.isCancelled());
-//
-//        // Ensure that we have distinct events.
-//        // Don't go overboard: we are not validating the stub! 
-//        for (int i = 0; i < NB_EVENTS; i++) {
-//            assertEquals("Distinct events", i+1, requestedEvents1.get(i).getTimestamp().getValue());
-//            assertEquals("Distinct events", i+1, requestedEvents2.get(i).getTimestamp().getValue());
-//            assertEquals("Distinct events", i+1, requestedEvents3.get(i).getTimestamp().getValue());
-//        }
-//
-//        TmfSignalManager.deregister(this);
-//        fTrace.dispose();
-//        fTrace = null;
-//    }
+    public void testCoalescedRequest() throws Exception {
+
+               fTrace = setupTrace(DIRECTORY + File.separator + TEST_STREAM);
+
+       TmfSignalManager.register(this);
+               TmfTestTriggerSignal signal = new TmfTestTriggerSignal(this, false);
+       TmfSignalManager.dispatchSignal(signal);
+
+        request1.waitForCompletion();
+        request2.waitForCompletion();
+        request3.waitForCompletion();
+
+        assertEquals("Request1: nbEvents", NB_EVENTS, requestedEvents1.size());
+        assertTrue  ("Request1: isCompleted", request1.isCompleted());
+        assertFalse ("Request1: isCancelled", request1.isCancelled());
+
+        assertEquals("Request2: nbEvents", NB_EVENTS, requestedEvents2.size());
+        assertTrue  ("Request2: isCompleted", request2.isCompleted());
+        assertFalse ("Request2: isCancelled", request2.isCancelled());
+
+        assertEquals("Request3: nbEvents", NB_EVENTS, requestedEvents3.size());
+        assertTrue  ("Request3: isCompleted", request3.isCompleted());
+        assertFalse ("Request3: isCancelled", request3.isCancelled());
+
+        // Ensure that we have distinct events.
+        // Don't go overboard: we are not validating the stub! 
+        for (int i = 0; i < NB_EVENTS; i++) {
+            assertEquals("Distinct events", i+1, requestedEvents1.get(i).getTimestamp().getValue());
+            assertEquals("Distinct events", i+1, requestedEvents2.get(i).getTimestamp().getValue());
+            assertEquals("Distinct events", i+1, requestedEvents3.get(i).getTimestamp().getValue());
+        }
+
+        TmfSignalManager.deregister(this);
+        fTrace.dispose();
+        fTrace = null;
+    }
     
-//     public void testCancelCoalescedRequest() throws Exception {
-//
-//             fTrace = setupTrace(DIRECTORY + File.separator + TEST_STREAM);
-//
-//     TmfSignalManager.register(this);
-//             TmfTestTriggerSignal signal = new TmfTestTriggerSignal(this, true);
-//     TmfSignalManager.dispatchSignal(signal);
-//
-//        request1.waitForCompletion();
-//        request2.waitForCompletion();
-//        request3.waitForCompletion();
-//
-//        assertEquals("Request1: nbEvents", BLOCK_SIZE, requestedEvents1.size());
-//        assertTrue  ("Request1: isCompleted", request1.isCompleted());
-//        assertTrue  ("Request1: isCancelled", request1.isCancelled());
-//
-//        assertEquals("Request2: nbEvents", NB_EVENTS, requestedEvents2.size());
-//        assertTrue  ("Request2: isCompleted", request2.isCompleted());
-//        assertFalse ("Request2: isCancelled", request2.isCancelled());
-//
-//        assertEquals("Request3: nbEvents", NB_EVENTS, requestedEvents3.size());
-//        assertTrue  ("Request3: isCompleted", request3.isCompleted());
-//        assertFalse ("Request3: isCancelled", request3.isCancelled());
-//
-//        // Ensure that we have distinct events.
-//        // Don't go overboard: we are not validating the stub! 
-//        for (int i = 0; i < NB_EVENTS; i++) {
-//            assertEquals("Distinct events", i+1, requestedEvents2.get(i).getTimestamp().getValue());
-//            assertEquals("Distinct events", i+1, requestedEvents3.get(i).getTimestamp().getValue());
-//        }
-//
-//        TmfSignalManager.deregister(this);
-//        fTrace.dispose();
-//        fTrace = null;
-//    }
+       public void testCancelCoalescedRequest() throws Exception {
+
+               fTrace = setupTrace(DIRECTORY + File.separator + TEST_STREAM);
+
+       TmfSignalManager.register(this);
+               TmfTestTriggerSignal signal = new TmfTestTriggerSignal(this, true);
+       TmfSignalManager.dispatchSignal(signal);
+
+        request1.waitForCompletion();
+        request2.waitForCompletion();
+        request3.waitForCompletion();
+
+        assertEquals("Request1: nbEvents", BLOCK_SIZE, requestedEvents1.size());
+        assertTrue  ("Request1: isCompleted", request1.isCompleted());
+        assertTrue  ("Request1: isCancelled", request1.isCancelled());
+
+        assertEquals("Request2: nbEvents", NB_EVENTS, requestedEvents2.size());
+        assertTrue  ("Request2: isCompleted", request2.isCompleted());
+        assertFalse ("Request2: isCancelled", request2.isCancelled());
+
+        assertEquals("Request3: nbEvents", NB_EVENTS, requestedEvents3.size());
+        assertTrue  ("Request3: isCompleted", request3.isCompleted());
+        assertFalse ("Request3: isCancelled", request3.isCancelled());
+
+        // Ensure that we have distinct events.
+        // Don't go overboard: we are not validating the stub! 
+        for (int i = 0; i < NB_EVENTS; i++) {
+            assertEquals("Distinct events", i+1, requestedEvents2.get(i).getTimestamp().getValue());
+            assertEquals("Distinct events", i+1, requestedEvents3.get(i).getTimestamp().getValue());
+        }
+
+        TmfSignalManager.deregister(this);
+        fTrace.dispose();
+        fTrace = null;
+    }
 
 }
This page took 0.031211 seconds and 5 git commands to generate.