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 / request / TmfDataRequestTest.java

diff --git a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java
index 33c332598d60ae457f7acf1d6a272f567bc00e60..eb662dc83b62a634b6913a5b92097bb5cfcb3f0f 100644 (file)
--- a/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java
+++ b/org.eclipse.linuxtools.tmf.tests/src/org/eclipse/linuxtools/tmf/tests/request/TmfDataRequestTest.java
@@ -15,10 +15,6 @@ package org.eclipse.linuxtools.tmf.tests.request;
 import junit.framework.TestCase;
 
 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.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.request.TmfDataRequest;
 import org.eclipse.linuxtools.tmf.request.TmfDataRequestStub;
 
@@ -107,7 +103,6 @@ public class TmfDataRequestTest extends TestCase {
 
         assertEquals("getIndex", 0, request.getIndex());
         assertEquals("getNbRequestedEvents", TmfDataRequest.ALL_DATA, request.getNbRequested());
-        assertEquals("getBlockize", TmfDataRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
 
         assertFalse("isCompleted", request.isCompleted());
         assertFalse("isFailed", request.isFailed());
@@ -124,7 +119,6 @@ public class TmfDataRequestTest extends TestCase {
 
         assertEquals("getIndex", 10, request.getIndex());
         assertEquals("getNbRequestedEvents", TmfDataRequest.ALL_DATA, request.getNbRequested());
-        assertEquals("getBlockize", TmfDataRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
 
         assertFalse("isCompleted", request.isCompleted());
         assertFalse("isFailed", request.isFailed());
@@ -141,7 +135,6 @@ public class TmfDataRequestTest extends TestCase {
 
         assertEquals("getIndex", 10, request.getIndex());
         assertEquals("getNbRequestedEvents", 100, request.getNbRequested());
-        assertEquals("getBlockize", TmfDataRequest.DEFAULT_BLOCK_SIZE, request.getBlockize());
 
         assertFalse("isCompleted", request.isCompleted());
         assertFalse("isFailed", request.isFailed());
@@ -158,7 +151,6 @@ public class TmfDataRequestTest extends TestCase {
 
         assertEquals("getIndex", 10, request.getIndex());
         assertEquals("getNbRequestedEvents", 100, request.getNbRequested());
-        assertEquals("getBlockize", 200, request.getBlockize());
 
         assertFalse("isCompleted", request.isCompleted());
         assertFalse("isFailed", request.isFailed());
@@ -215,10 +207,10 @@ public class TmfDataRequestTest extends TestCase {
        // ------------------------------------------------------------------------
 
        public void testToString() {
-        String expected1 = "[TmfDataRequest(0,TmfEvent,10,100,200)]";
-        String expected2 = "[TmfDataRequest(1,TmfEvent,20,100,200)]";
-        String expected3 = "[TmfDataRequest(2,TmfEvent,20,200,200)]";
-        String expected4 = "[TmfDataRequest(3,TmfEvent,20,200,300)]";
+        String expected1 = "[TmfDataRequest(0,TmfEvent,10,100)]";
+        String expected2 = "[TmfDataRequest(1,TmfEvent,20,100)]";
+        String expected3 = "[TmfDataRequest(2,TmfEvent,20,200)]";
+        String expected4 = "[TmfDataRequest(3,TmfEvent,20,200)]";
 
         assertEquals("toString", expected1, fRequest1.toString());
         assertEquals("toString", expected2, fRequest2.toString());
@@ -226,30 +218,6 @@ public class TmfDataRequestTest extends TestCase {
         assertEquals("toString", expected4, fRequest4.toString());
        }
 
-       // ------------------------------------------------------------------------
-       // setData/getData
-       // ------------------------------------------------------------------------
-
-       public void testSetData() {
-               // 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());
-               }
-
-               fRequest1.setData(events);
-               assertEquals("setData", nbEvents, fRequest1.getNbRead());
-
-               TmfEvent[] eventsRead = fRequest1.getData();
-               assertEquals("getData", nbEvents, eventsRead.length);
-
-               for (int i = 0; i < nbEvents; i++) {
-                       assertEquals("getData", i, eventsRead[i].getTimestamp().getValue());
-               }
-       }
-
        // ------------------------------------------------------------------------
        // done
        // ------------------------------------------------------------------------