tmf: Fix regression in event requests

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.core.tests / src / org / eclipse / linuxtools / tmf / core / tests / request / TmfDataRequestTest.java

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java
index 1e601044f5865bd121fe43e5c2a424a1c3566c33..6a29795692a70fc4c4bb83438126f339c160ecc6 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java
@@ -23,7 +23,7 @@ import org.eclipse.linuxtools.tmf.tests.stubs.request.TmfDataRequestStub;
  * <p>
  * Test suite for the TmfDataRequest class.
  */
-@SuppressWarnings({"nls","javadoc", "deprecation"})
+@SuppressWarnings({"nls","javadoc"})
 public class TmfDataRequestTest extends TestCase {
 
        // ------------------------------------------------------------------------
@@ -53,6 +53,7 @@ public class TmfDataRequestTest extends TestCase {
        @Override
        protected void setUp() throws Exception {
                super.setUp();
+               TmfDataRequest.reset();
                fRequest1  = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200);
                fRequest2  = new TmfDataRequestStub(TmfEvent.class, 20, 100, 200);
                fRequest3  = new TmfDataRequestStub(TmfEvent.class, 20, 200, 200);
@@ -71,7 +72,7 @@ public class TmfDataRequestTest extends TestCase {
 
                TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200) {
                    @Override
-                       public synchronized void handleCompleted() {
+                       public void handleCompleted() {
                        super.handleCompleted();
                        flags[0] = true;
                    }
@@ -210,10 +211,10 @@ public class TmfDataRequestTest extends TestCase {
        // ------------------------------------------------------------------------
 
        public void testToString() {
-        String expected1 = "[TmfDataRequest(" + fRequest1.getRequestId() + ",TmfEvent,10,100,200)]";
-        String expected2 = "[TmfDataRequest(" + fRequest2.getRequestId() + ",TmfEvent,20,100,200)]";
-        String expected3 = "[TmfDataRequest(" + fRequest3.getRequestId() + ",TmfEvent,20,200,200)]";
-        String expected4 = "[TmfDataRequest(" + fRequest4.getRequestId() + ",TmfEvent,20,200,300)]";
+        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)]";
 
         assertEquals("toString", expected1, fRequest1.toString());
         assertEquals("toString", expected2, fRequest2.toString());