tmf: Decouple tmf.core unit tests from TmfEvent
authorAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Wed, 30 Jan 2013 21:06:12 +0000 (16:06 -0500)
committerAlexandre Montplaisir <alexmonthy@voxpopuli.im>
Tue, 5 Feb 2013 23:05:15 +0000 (18:05 -0500)
Make sure the TMF unit tests use the ITmfEvent interface
as much as possible (this is the behavior we want to have
in the core framework).

Change-Id: I242a5265c716498392f2b1414785db03f302540d
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
Reviewed-on: https://git.eclipse.org/r/10051
Tested-by: Hudson CI
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
IP-Clean: Patrick Tasse <patrick.tasse@gmail.com>

24 files changed:
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfEventProviderTest.java
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/component/TmfProviderManagerTest.java
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedDataRequestTest.java
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfCoalescedEventRequestTest.java
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfDataRequestTest.java
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/request/TmfEventRequestTest.java
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfExperimentTest.java
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfMultiTraceExperimentTest.java
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfTraceTest.java
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfAsyncSequenceDiagramEventTest.java
org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/uml2sd/TmfSyncSequenceDiagramEventTest.java
org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfDataProviderStub.java
org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfEventProviderStub.java
org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/component/TmfSyntheticEventProviderStub.java
org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEmptyTraceStub.java
org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfEventParserStub.java
org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfExperimentStub.java
org.eclipse.linuxtools.tmf.core.tests/stubs/org/eclipse/linuxtools/tmf/tests/stubs/trace/TmfTraceStub.java
org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java
org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java
org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java
org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/views/uml2sd/loader/Uml2SDTestFacility.java
org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java

index 3854007fb1385e32f03d70d6c3beeb3771dfd2f0..0e2d067d6de5f6db9d99b8bd231e8eb8f3600de7 100644 (file)
@@ -19,7 +19,6 @@ import junit.framework.TestCase;
 import org.eclipse.linuxtools.internal.tmf.core.component.TmfProviderManager;
 import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
-import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.request.TmfEventRequest;
@@ -73,13 +72,13 @@ public class TmfEventProviderTest extends TestCase {
 
         // There should be 2 TmfEvent providers: a TmfTraceStub and a
         // TmfEventProviderStub
-        ITmfDataProvider[] eventProviders = TmfProviderManager.getProviders(TmfEvent.class);
+        ITmfDataProvider[] eventProviders = TmfProviderManager.getProviders(ITmfEvent.class);
         assertEquals("getProviders", 2, eventProviders.length);
 
-        eventProviders = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        eventProviders = TmfProviderManager.getProviders(ITmfEvent.class, TmfTraceStub.class);
         assertEquals("getProviders", 1, eventProviders.length);
 
-        eventProviders = TmfProviderManager.getProviders(TmfEvent.class, TmfEventProviderStub.class);
+        eventProviders = TmfProviderManager.getProviders(ITmfEvent.class, TmfEventProviderStub.class);
         assertEquals("getProviders", 1, eventProviders.length);
 
         // There should be 1 TmfSyntheticEventStub provider
@@ -101,12 +100,12 @@ public class TmfEventProviderTest extends TestCase {
         final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
 
         // Get the TmfSyntheticEventStub provider
-        ITmfDataProvider[] eventProviders = TmfProviderManager.getProviders(TmfEvent.class,
+        ITmfDataProvider[] eventProviders = TmfProviderManager.getProviders(ITmfEvent.class,
                 TmfEventProviderStub.class);
         ITmfDataProvider provider = eventProviders[0];
 
         TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
-        final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
+        final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
             @Override
             public void handleData(ITmfEvent event) {
                 super.handleData(event);
@@ -145,14 +144,14 @@ public class TmfEventProviderTest extends TestCase {
         final Vector<ITmfEvent> requestedEventsReq2 = new Vector<ITmfEvent>();
 
         // Get the TmfSyntheticEventStub provider
-        ITmfDataProvider[] eventProviders = TmfProviderManager.getProviders(TmfEvent.class,
+        ITmfDataProvider[] eventProviders = TmfProviderManager.getProviders(ITmfEvent.class,
                 TmfEventProviderStub.class);
         ITmfDataProvider provider = eventProviders[0];
 
         TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
 
         // Create first request
-        final TmfEventRequest request1 = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
+        final TmfEventRequest request1 = new TmfEventRequest(ITmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
             @Override
             public void handleData(ITmfEvent event) {
                 super.handleData(event);
@@ -179,7 +178,7 @@ public class TmfEventProviderTest extends TestCase {
         assertFalse("isRunning", request1.isRunning());
 
         // Create second request
-        final TmfEventRequest request2 = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
+        final TmfEventRequest request2 = new TmfEventRequest(ITmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
             @Override
             public void handleData(ITmfEvent event) {
                 super.handleData(event);
@@ -365,13 +364,13 @@ public class TmfEventProviderTest extends TestCase {
 
         // There should be 2 TmfEvent providers: a TmfTraceStub and a
         // TmfEventProviderStub
-        ITmfDataProvider[] eventProviders = TmfProviderManager.getProviders(TmfEvent.class);
+        ITmfDataProvider[] eventProviders = TmfProviderManager.getProviders(ITmfEvent.class);
         assertEquals("getProviders", 2, eventProviders.length);
 
-        eventProviders = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        eventProviders = TmfProviderManager.getProviders(ITmfEvent.class, TmfTraceStub.class);
         assertEquals("getProviders", 1, eventProviders.length);
 
-        eventProviders = TmfProviderManager.getProviders(TmfEvent.class, TmfEventProviderStub.class);
+        eventProviders = TmfProviderManager.getProviders(ITmfEvent.class, TmfEventProviderStub.class);
         assertEquals("getProviders", 1, eventProviders.length);
 
         // There should be 1 TmfSyntheticEventStub provider
index 4f9c425f1739e84c2cc5c1560838d68a4646cb68..998d26feefde5e77fde7a729fc43f3edbdaa4198 100644 (file)
@@ -51,7 +51,7 @@ public class TmfProviderManagerTest extends TestCase {
        // ------------------------------------------------------------------------
 
        private class TestProvider1 extends TmfDataProvider {
-               public TestProvider1(Class<TmfEvent> type) {
+               public TestProvider1(Class<ITmfEvent> type) {
                        super("TestProvider1", type);
                }
                @Override
@@ -59,7 +59,7 @@ public class TmfProviderManagerTest extends TestCase {
                        return null;
                }
                @Override
-               public TmfEvent getNext(ITmfContext context) {
+               public ITmfEvent getNext(ITmfContext context) {
                        return null;
                }
                @Override
@@ -69,7 +69,7 @@ public class TmfProviderManagerTest extends TestCase {
        }
 
        private class TestProvider2 extends TmfDataProvider {
-               public TestProvider2(Class<TmfEvent> type) {
+               public TestProvider2(Class<ITmfEvent> type) {
                        super("TestProvider2", type);
                }
                @Override
@@ -77,7 +77,7 @@ public class TmfProviderManagerTest extends TestCase {
                        return null;
                }
                @Override
-               public TmfEvent getNext(ITmfContext context) {
+               public ITmfEvent getNext(ITmfContext context) {
                        return null;
                }
                @Override
@@ -119,10 +119,10 @@ public class TmfProviderManagerTest extends TestCase {
         *
         */
        public void testRegister_0() {
-               TmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class);
+               TmfDataProvider[] providers = TmfProviderManager.getProviders(ITmfEvent.class);
                assertEquals("getProviders", 0, providers.length);
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class, TestProvider1.class);
                assertEquals("getProviders", 0, providers.length);
        }
 
@@ -132,23 +132,23 @@ public class TmfProviderManagerTest extends TestCase {
        public void testRegister_Unregister_1() {
 
                // Register a single provider
-               TestProvider1 testProvider1 = new TestProvider1(TmfEvent.class);
+               TestProvider1 testProvider1 = new TestProvider1(ITmfEvent.class);
 
-               TmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class);
+               TmfDataProvider[] providers = TmfProviderManager.getProviders(ITmfEvent.class);
                assertEquals("getProviders", 1, providers.length);
                assertEquals("getProviders", testProvider1, providers[0]);
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class, TestProvider1.class);
                assertEquals("getProviders", 1, providers.length);
                assertEquals("getProviders", testProvider1, providers[0]);
 
                // Unregister it
                testProvider1.dispose();
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class);
                assertEquals("getProviders", 0, providers.length);
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class, TestProvider1.class);
                assertEquals("getProviders", 0, providers.length);
        }
 
@@ -158,10 +158,10 @@ public class TmfProviderManagerTest extends TestCase {
        public void testRegister_Unregister_2() {
 
                // Register 2 providers, same data type
-               TestProvider1 testProvider1 = new TestProvider1(TmfEvent.class);
-               TestProvider2 testProvider2 = new TestProvider2(TmfEvent.class);
+               TestProvider1 testProvider1 = new TestProvider1(ITmfEvent.class);
+               TestProvider2 testProvider2 = new TestProvider2(ITmfEvent.class);
 
-               TmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class);
+               TmfDataProvider[] providers = TmfProviderManager.getProviders(ITmfEvent.class);
                assertEquals("getProviders", 2, providers.length);
                assertTrue(providers.length == 2);
                if (providers[0] == testProvider1) {
@@ -172,38 +172,38 @@ public class TmfProviderManagerTest extends TestCase {
                        assertEquals("getProviders", testProvider1, providers[1]);
                }
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class, TestProvider1.class);
                assertEquals("getProviders", 1, providers.length);
                assertEquals("getProviders", testProvider1, providers[0]);
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class, TestProvider2.class);
                assertEquals("getProviders", 1, providers.length);
                assertEquals("getProviders", testProvider2, providers[0]);
 
                // Remove one
                testProvider1.dispose();
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class);
                assertEquals("getProviders", 1, providers.length);
                assertEquals("getProviders", testProvider2, providers[0]);
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class, TestProvider1.class);
                assertEquals("getProviders", 0, providers.length);
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class, TestProvider2.class);
                assertEquals("getProviders", 1, providers.length);
                assertEquals("getProviders", testProvider2, providers[0]);
 
                // Remove the other
                testProvider2.dispose();
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class);
                assertEquals("getProviders", 0, providers.length);
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class, TestProvider1.class);
                assertEquals("getProviders", 0, providers.length);
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class, TestProvider2.class);
                assertEquals("getProviders", 0, providers.length);
        }
 
@@ -213,11 +213,11 @@ public class TmfProviderManagerTest extends TestCase {
        public void testRegister_Unregister_3() {
 
                // Register 3 providers, mixed data types
-               TestProvider1 testProvider1 = new TestProvider1(TmfEvent.class);
-               TestProvider2 testProvider2 = new TestProvider2(TmfEvent.class);
+               TestProvider1 testProvider1 = new TestProvider1(ITmfEvent.class);
+               TestProvider2 testProvider2 = new TestProvider2(ITmfEvent.class);
                TestProvider3 testProvider3 = new TestProvider3(TmfEvent3.class);
 
-               TmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class);
+               TmfDataProvider[] providers = TmfProviderManager.getProviders(ITmfEvent.class);
                assertEquals("getProviders", 2, providers.length);
                if (providers[0] == testProvider1) {
                        assertEquals("getProviders", testProvider2, providers[1]);
@@ -231,11 +231,11 @@ public class TmfProviderManagerTest extends TestCase {
                assertEquals("getProviders", 1, providers3.length);
                assertEquals("getProviders", testProvider3, providers3[0]);
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class, TestProvider1.class);
                assertEquals("getProviders", 1, providers.length);
                assertEquals("getProviders", testProvider1, providers[0]);
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class, TestProvider2.class);
                assertEquals("getProviders", 1, providers.length);
                assertEquals("getProviders", testProvider2, providers[0]);
 
@@ -246,14 +246,14 @@ public class TmfProviderManagerTest extends TestCase {
                // Remove one
                testProvider1.dispose();
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class);
                assertEquals("getProviders", 1, providers.length);
                assertEquals("getProviders", testProvider2, providers[0]);
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class, TestProvider1.class);
                assertEquals("getProviders", 0, providers.length);
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class, TestProvider2.class);
                assertEquals("getProviders", 1, providers.length);
                assertEquals("getProviders", testProvider2, providers[0]);
 
@@ -268,13 +268,13 @@ public class TmfProviderManagerTest extends TestCase {
                // Remove another one
                testProvider2.dispose();
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class);
                assertEquals("getProviders", 0, providers.length);
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class, TestProvider1.class);
                assertEquals("getProviders", 0, providers.length);
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class, TestProvider2.class);
                assertEquals("getProviders", 0, providers.length);
 
                providers3 = TmfProviderManager.getProviders(TmfEvent3.class);
@@ -288,13 +288,13 @@ public class TmfProviderManagerTest extends TestCase {
                // Remove the last one
                testProvider3.dispose();
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class);
                assertEquals("getProviders", 0, providers.length);
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider1.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class, TestProvider1.class);
                assertEquals("getProviders", 0, providers.length);
 
-               providers = TmfProviderManager.getProviders(TmfEvent.class, TestProvider2.class);
+               providers = TmfProviderManager.getProviders(ITmfEvent.class, TestProvider2.class);
                assertEquals("getProviders", 0, providers.length);
 
                providers3 = TmfProviderManager.getProviders(TmfEvent3.class);
@@ -310,11 +310,11 @@ public class TmfProviderManagerTest extends TestCase {
        public void testGetProvider() {
 
                // Register 3 providers, mixed data types
-               TestProvider1 testProvider1 = new TestProvider1(TmfEvent.class);
-               TestProvider2 testProvider2 = new TestProvider2(TmfEvent.class);
+               TestProvider1 testProvider1 = new TestProvider1(ITmfEvent.class);
+               TestProvider2 testProvider2 = new TestProvider2(ITmfEvent.class);
                TestProvider3 testProvider3 = new TestProvider3(TmfEvent3.class);
 
-               TmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, null);
+               TmfDataProvider[] providers = TmfProviderManager.getProviders(ITmfEvent.class, null);
                assertEquals("getProviders", 2, providers.length);
                if (providers[0] == testProvider1) {
                        assertEquals("getProviders", testProvider2, providers[1]);
index 56e11ab4c067f62c0e840374a5e40db5482110e9..84743875aca93eba6ae7e806391b88d516c78c95 100644 (file)
@@ -167,7 +167,7 @@ public class TmfEventTest extends TestCase {
      *
      */
     public void testNoRankConstructor() {
-        final TmfEvent event = new TmfEvent(null, fTimestamp1, fSource, fType, fContent1, fReference1);
+        final ITmfEvent event = new TmfEvent(null, fTimestamp1, fSource, fType, fContent1, fReference1);
         assertNull("getTrace", event.getTrace());
         assertEquals("getRank", ITmfContext.UNKNOWN_RANK, event.getRank());
         assertEquals("getTimestamp", fTimestamp1, event.getTimestamp());
@@ -182,7 +182,7 @@ public class TmfEventTest extends TestCase {
      */
     public void testConstructorWithTrace() {
         final ITmfTrace trace = openTrace();
-        final TmfEvent event = new TmfEvent(trace, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
+        final ITmfEvent event = new TmfEvent(trace, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
         assertNotNull("getTrace", event.getTrace());
         assertEquals("getRank", 0, event.getRank());
         assertEquals("getTimestamp", fTimestamp1, event.getTimestamp());
@@ -197,7 +197,7 @@ public class TmfEventTest extends TestCase {
      *
      */
     public void testTmfEventCopy() {
-        final TmfEvent event = new TmfEvent(fEvent1);
+        final ITmfEvent event = new TmfEvent(fEvent1);
         assertNull("getTrace", event.getTrace());
         assertEquals("getRank", 0, event.getRank());
         assertEquals("getTimestamp", fTimestamp1, event.getTimestamp());
@@ -408,49 +408,6 @@ public class TmfEventTest extends TestCase {
         assertEquals("setReference", fReference1, event.getReference());
     }
 
-    // ------------------------------------------------------------------------
-    // clone
-    // ------------------------------------------------------------------------
-
-    private static class MyEvent extends TmfEvent {
-
-        @Override
-        public boolean equals(final Object other) {
-            return super.equals(other);
-        }
-        @Override
-        public MyEvent clone() {
-            return (MyEvent) super.clone();
-        }
-    }
-
-    /**
-     *
-     */
-    public void testClone1() {
-        final ITmfEvent clone = fEvent1.clone();
-
-        assertTrue("clone", fEvent1.clone().equals(fEvent1));
-        assertTrue("clone", clone.clone().equals(clone));
-
-        assertEquals("clone", fEvent1, clone);
-        assertEquals("clone", clone, fEvent1);
-    }
-
-    /**
-     *
-     */
-    public void testClone2() {
-        final TmfEvent event = new MyEvent();
-        final TmfEvent clone = event.clone();
-
-        assertTrue("clone", event.clone().equals(event));
-        assertTrue("clone", clone.clone().equals(clone));
-
-        assertEquals("clone", event, clone);
-        assertEquals("clone", clone, event);
-    }
-
     // ------------------------------------------------------------------------
     // hashCode
     // ------------------------------------------------------------------------
@@ -459,16 +416,16 @@ public class TmfEventTest extends TestCase {
      *
      */
     public void testHashCode() {
-        TmfEvent event1 = new TmfEvent();
-        TmfEvent event2 = new TmfEvent();
+        ITmfEvent event1 = new TmfEvent();
+        ITmfEvent event2 = new TmfEvent();
 
         assertTrue("hashCode", event1.hashCode() == event2.hashCode());
 
         final ITmfTrace trace = openTrace();
         event1 = new TmfEvent(trace, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
         event2 = new TmfEvent(trace, 1, fTimestamp2, fSource, fType, fContent2, fReference2);
-        final TmfEvent event1b = new TmfEvent(event1);
-        final TmfEvent event2b = new TmfEvent(event2);
+        final ITmfEvent event1b = new TmfEvent(event1);
+        final ITmfEvent event2b = new TmfEvent(event2);
 
         assertTrue("hashCode", event1.hashCode() == event1b.hashCode());
         assertTrue("hashCode", event2.hashCode() == event2b.hashCode());
@@ -498,8 +455,8 @@ public class TmfEventTest extends TestCase {
      *
      */
     public void testEqualsSymmetry() {
-        final TmfEvent event1 = new TmfEvent(fEvent1);
-        final TmfEvent event2 = new TmfEvent(fEvent2);
+        final ITmfEvent event1 = new TmfEvent(fEvent1);
+        final ITmfEvent event2 = new TmfEvent(fEvent2);
 
         assertTrue("equals", event1.equals(fEvent1));
         assertTrue("equals", fEvent1.equals(event1));
@@ -512,9 +469,9 @@ public class TmfEventTest extends TestCase {
      *
      */
     public void testEqualsTransivity() {
-        final TmfEvent event1 = new TmfEvent(fEvent1);
-        final TmfEvent event2 = new TmfEvent(fEvent1);
-        final TmfEvent event3 = new TmfEvent(fEvent1);
+        final ITmfEvent event1 = new TmfEvent(fEvent1);
+        final ITmfEvent event2 = new TmfEvent(fEvent1);
+        final ITmfEvent event3 = new TmfEvent(fEvent1);
 
         assertTrue("equals", event1.equals(event2));
         assertTrue("equals", event2.equals(event3));
@@ -544,8 +501,8 @@ public class TmfEventTest extends TestCase {
         final ITmfTrace trace1 = openTrace();
         final ITmfTrace trace2 = openTrace();
 
-        final TmfEvent event1 = new TmfEvent(trace1, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
-        TmfEvent event2 = new TmfEvent(trace1,  0, fTimestamp1, fSource, fType, fContent1, fReference1);
+        final ITmfEvent event1 = new TmfEvent(trace1, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
+        ITmfEvent event2 = new TmfEvent(trace1,  0, fTimestamp1, fSource, fType, fContent1, fReference1);
         assertTrue("equals", event1.equals(event2));
         assertTrue("equals", event2.equals(event1));
 
@@ -565,8 +522,8 @@ public class TmfEventTest extends TestCase {
      *
      */
     public void testNonEqualRanks() {
-        final TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
-        TmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
+        final ITmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
+        ITmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
         assertTrue("equals", event1.equals(event2));
         assertTrue("equals", event2.equals(event1));
 
@@ -579,8 +536,8 @@ public class TmfEventTest extends TestCase {
      *
      */
     public void testNonEqualTimestamps() {
-        final TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
-        TmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
+        final ITmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
+        ITmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
         assertTrue("equals", event1.equals(event2));
         assertTrue("equals", event2.equals(event1));
 
@@ -597,8 +554,8 @@ public class TmfEventTest extends TestCase {
      *
      */
     public void testNonEqualSources() {
-        final TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
-        TmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
+        final ITmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
+        ITmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
         assertTrue("equals", event1.equals(event2));
         assertTrue("equals", event2.equals(event1));
 
@@ -615,8 +572,8 @@ public class TmfEventTest extends TestCase {
      *
      */
     public void testNonEqualTypes() {
-        final TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
-        TmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType,  fContent1, fReference1);
+        final ITmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
+        ITmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType,  fContent1, fReference1);
         assertTrue("equals", event1.equals(event2));
         assertTrue("equals", event2.equals(event1));
 
@@ -637,8 +594,8 @@ public class TmfEventTest extends TestCase {
      *
      */
     public void testNonEqualContents() {
-        final TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
-        TmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
+        final ITmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
+        ITmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
         assertTrue("equals", event1.equals(event2));
         assertTrue("equals", event2.equals(event1));
 
@@ -655,8 +612,8 @@ public class TmfEventTest extends TestCase {
      *
      */
     public void testNonEqualReferences() {
-        final TmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
-        TmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
+        final ITmfEvent event1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
+        ITmfEvent event2 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
         assertTrue("equals", event1.equals(event2));
         assertTrue("equals", event2.equals(event1));
 
index fcfbdcfe737cfa5cc494858368cf8cf751b42dbc..cd944d7d9a90cad6b4b0bd1bd097c670429bbca5 100644 (file)
@@ -17,7 +17,6 @@ import junit.framework.TestCase;
 
 import org.eclipse.linuxtools.internal.tmf.core.request.TmfCoalescedDataRequest;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
-import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest;
 import org.eclipse.linuxtools.tmf.tests.stubs.request.TmfDataRequestStub;
 
@@ -56,13 +55,13 @@ public class TmfCoalescedDataRequestTest extends TestCase {
        public void setUp() throws Exception {
                super.setUp();
                TmfDataRequest.reset();
-               fRequest1  = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200);
-               fRequest2  = new TmfCoalescedDataRequest(TmfEvent.class, 20, 100, 200);
-               fRequest3  = new TmfCoalescedDataRequest(TmfEvent.class, 20, 200, 200);
-               fRequest4  = new TmfCoalescedDataRequest(TmfEvent.class, 20, 200, 300);
+               fRequest1  = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200);
+               fRequest2  = new TmfCoalescedDataRequest(ITmfEvent.class, 20, 100, 200);
+               fRequest3  = new TmfCoalescedDataRequest(ITmfEvent.class, 20, 200, 200);
+               fRequest4  = new TmfCoalescedDataRequest(ITmfEvent.class, 20, 200, 300);
 
-               fRequest1b = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200);
-               fRequest1c = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200);
+               fRequest1b = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200);
+               fRequest1c = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200);
 
                fRequestCount = fRequest1c.getRequestId() + 1;
        }
@@ -74,7 +73,7 @@ public class TmfCoalescedDataRequestTest extends TestCase {
 
        private static TmfCoalescedDataRequest setupTestRequest(final boolean[] flags) {
 
-               TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200) {
+               TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200) {
                    @Override
                        public void handleCompleted() {
                        super.handleCompleted();
@@ -104,7 +103,7 @@ public class TmfCoalescedDataRequestTest extends TestCase {
        // ------------------------------------------------------------------------
 
        public void testTmfCoalescedDataRequest() {
-               TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(TmfEvent.class);
+               TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(ITmfEvent.class);
 
         assertEquals("getRequestId", fRequestCount++, request.getRequestId());
         assertEquals("getDataType",  ITmfEvent.class, request.getDataType());
@@ -120,7 +119,7 @@ public class TmfCoalescedDataRequestTest extends TestCase {
        }
 
        public void testTmfCoalescedDataRequestIndex() {
-               TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(TmfEvent.class, 10);
+               TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(ITmfEvent.class, 10);
 
         assertEquals("getRequestId", fRequestCount++, request.getRequestId());
         assertEquals("getDataType",  ITmfEvent.class, request.getDataType());
@@ -136,7 +135,7 @@ public class TmfCoalescedDataRequestTest extends TestCase {
        }
 
        public void testTmfCoalescedDataRequestIndexNbRequested() {
-               TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100);
+               TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100);
 
         assertEquals("getRequestId", fRequestCount++, request.getRequestId());
         assertEquals("getDataType",  ITmfEvent.class, request.getDataType());
@@ -152,7 +151,7 @@ public class TmfCoalescedDataRequestTest extends TestCase {
        }
 
        public void testTmfCoalescedDataRequestIndexNbEventsBlocksize() {
-               TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200);
+               TmfCoalescedDataRequest request = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200);
 
         assertEquals("getRequestId", fRequestCount++, request.getRequestId());
         assertEquals("getDataType",  ITmfEvent.class, request.getDataType());
@@ -224,22 +223,22 @@ public class TmfCoalescedDataRequestTest extends TestCase {
         assertEquals("toString", expected2, fRequest2.toString());
         assertEquals("toString", expected3, fRequest3.toString());
         assertEquals("toString", expected4, fRequest4.toString());
-       }
+    }
 
-       // ------------------------------------------------------------------------
-       // isCompatible
-       // ------------------------------------------------------------------------
+    // ------------------------------------------------------------------------
+    // isCompatible
+    // ------------------------------------------------------------------------
 
-       public void testIsCompatible() {
-               TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200);
-        TmfDataRequest request1 = new TmfDataRequestStub(TmfEvent.class,  10, 100, 200);
-               TmfDataRequest request2 = new TmfDataRequestStub(TmfEvent.class,   5, 100, 200);
-        TmfDataRequest request3 = new TmfDataRequestStub(TmfEvent.class,   5,   4, 200);
-        TmfDataRequest request4 = new TmfDataRequestStub(TmfEvent.class,   5,   5, 200);
-        TmfDataRequest request5 = new TmfDataRequestStub(TmfEvent.class,  15, 100, 200);
-        TmfDataRequest request6 = new TmfDataRequestStub(TmfEvent.class, 100, 100, 200);
-        TmfDataRequest request7 = new TmfDataRequestStub(TmfEvent.class, 110, 100, 200);
-        TmfDataRequest request8 = new TmfDataRequestStub(TmfEvent.class, 111, 100, 200);
+    public void testIsCompatible() {
+        TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200);
+        TmfDataRequest request1 = new TmfDataRequestStub(ITmfEvent.class,  10, 100, 200);
+        TmfDataRequest request2 = new TmfDataRequestStub(ITmfEvent.class,   5, 100, 200);
+        TmfDataRequest request3 = new TmfDataRequestStub(ITmfEvent.class,   5,   4, 200);
+        TmfDataRequest request4 = new TmfDataRequestStub(ITmfEvent.class,   5,   5, 200);
+        TmfDataRequest request5 = new TmfDataRequestStub(ITmfEvent.class,  15, 100, 200);
+        TmfDataRequest request6 = new TmfDataRequestStub(ITmfEvent.class, 100, 100, 200);
+        TmfDataRequest request7 = new TmfDataRequestStub(ITmfEvent.class, 110, 100, 200);
+        TmfDataRequest request8 = new TmfDataRequestStub(ITmfEvent.class, 111, 100, 200);
 
         assertTrue("isCompatible", coalescedRequest.isCompatible(request1));
         assertTrue("isCompatible", coalescedRequest.isCompatible(request2));
@@ -250,20 +249,20 @@ public class TmfCoalescedDataRequestTest extends TestCase {
         assertTrue("isCompatible", coalescedRequest.isCompatible(request7));
         assertTrue("isCompatible", coalescedRequest.isCompatible(request8));
 
-        TmfDataRequest request9  = new TmfDataRequestStub(TmfEvent.class,   5,   3, 200);
-        TmfDataRequest request10 = new TmfDataRequestStub(TmfEvent.class, 112, 100, 200);
+        TmfDataRequest request9  = new TmfDataRequestStub(ITmfEvent.class,   5,   3, 200);
+        TmfDataRequest request10 = new TmfDataRequestStub(ITmfEvent.class, 112, 100, 200);
 
         assertFalse("isCompatible", coalescedRequest.isCompatible(request9));
         assertFalse("isCompatible", coalescedRequest.isCompatible(request10));
-       }
+    }
 
     // ------------------------------------------------------------------------
     // addRequest
     // ------------------------------------------------------------------------
 
     public void testAddRequest1() {
-        TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200);
-        TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200);
+        TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200);
+        TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200);
 
         assertTrue("isCompatible", coalescedRequest.isCompatible(request));
         coalescedRequest.addRequest(request);
@@ -273,8 +272,8 @@ public class TmfCoalescedDataRequestTest extends TestCase {
     }
 
     public void testAddRequest2() {
-        TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200);
-        TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 5, 100, 200);
+        TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200);
+        TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 5, 100, 200);
 
         assertTrue("isCompatible", coalescedRequest.isCompatible(request));
         coalescedRequest.addRequest(request);
@@ -284,8 +283,8 @@ public class TmfCoalescedDataRequestTest extends TestCase {
     }
 
     public void testAddRequest3() {
-        TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200);
-        TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 5, 4, 200);
+        TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200);
+        TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 5, 4, 200);
 
         assertTrue("isCompatible", coalescedRequest.isCompatible(request));
         coalescedRequest.addRequest(request);
@@ -295,8 +294,8 @@ public class TmfCoalescedDataRequestTest extends TestCase {
     }
 
     public void testAddRequest4() {
-        TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200);
-        TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 5, 5, 200);
+        TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200);
+        TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 5, 5, 200);
 
         assertTrue("isCompatible", coalescedRequest.isCompatible(request));
         coalescedRequest.addRequest(request);
@@ -306,8 +305,8 @@ public class TmfCoalescedDataRequestTest extends TestCase {
     }
 
     public void testAddRequest5() {
-        TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200);
-        TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class,  15, 100, 200);
+        TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200);
+        TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class,  15, 100, 200);
 
         assertTrue("isCompatible", coalescedRequest.isCompatible(request));
         coalescedRequest.addRequest(request);
@@ -317,8 +316,8 @@ public class TmfCoalescedDataRequestTest extends TestCase {
     }
 
     public void testAddRequest6() {
-        TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200);
-        TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 100, 100, 200);
+        TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200);
+        TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 100, 100, 200);
 
         assertTrue("isCompatible", coalescedRequest.isCompatible(request));
         coalescedRequest.addRequest(request);
@@ -328,8 +327,8 @@ public class TmfCoalescedDataRequestTest extends TestCase {
     }
 
     public void testAddRequest7() {
-        TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200);
-        TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 110, 100, 200);
+        TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200);
+        TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 110, 100, 200);
 
         assertTrue("isCompatible", coalescedRequest.isCompatible(request));
         coalescedRequest.addRequest(request);
@@ -339,8 +338,8 @@ public class TmfCoalescedDataRequestTest extends TestCase {
     }
 
     public void testAddRequest8() {
-        TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(TmfEvent.class, 10, 100, 200);
-        TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 111, 100, 200);
+        TmfCoalescedDataRequest coalescedRequest = new TmfCoalescedDataRequest(ITmfEvent.class, 10, 100, 200);
+        TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 111, 100, 200);
 
         assertTrue("isCompatible", coalescedRequest.isCompatible(request));
         coalescedRequest.addRequest(request);
@@ -351,17 +350,17 @@ public class TmfCoalescedDataRequestTest extends TestCase {
 
        // ------------------------------------------------------------------------
        // done
-       // ------------------------------------------------------------------------
+    // ------------------------------------------------------------------------
 
-       public void testDone() {
+    public void testDone() {
 
-               // Test request
-               final boolean[] crFlags = new boolean[4];
-               TmfCoalescedDataRequest request = setupTestRequest(crFlags);
-               TmfDataRequest subRequest1 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200);
-               TmfDataRequest subRequest2 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200);
-               request.addRequest(subRequest1);
-               request.addRequest(subRequest2);
+        // Test request
+        final boolean[] crFlags = new boolean[4];
+        TmfCoalescedDataRequest request = setupTestRequest(crFlags);
+        TmfDataRequest subRequest1 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200);
+        TmfDataRequest subRequest2 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200);
+        request.addRequest(subRequest1);
+        request.addRequest(subRequest2);
 
                request.done();
 
@@ -394,8 +393,8 @@ public class TmfCoalescedDataRequestTest extends TestCase {
 
                final boolean[] crFlags = new boolean[4];
                TmfCoalescedDataRequest request = setupTestRequest(crFlags);
-               TmfDataRequest subRequest1 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200);
-               TmfDataRequest subRequest2 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200);
+               TmfDataRequest subRequest1 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200);
+               TmfDataRequest subRequest2 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200);
                request.addRequest(subRequest1);
                request.addRequest(subRequest2);
 
@@ -430,8 +429,8 @@ public class TmfCoalescedDataRequestTest extends TestCase {
 
                final boolean[] crFlags = new boolean[4];
                TmfCoalescedDataRequest request = setupTestRequest(crFlags);
-               TmfDataRequest subRequest1 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200);
-               TmfDataRequest subRequest2 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200);
+               TmfDataRequest subRequest1 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200);
+               TmfDataRequest subRequest2 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200);
                request.addRequest(subRequest1);
                request.addRequest(subRequest2);
 
@@ -465,46 +464,47 @@ public class TmfCoalescedDataRequestTest extends TestCase {
 
     public void testCancelSubRequests() {
 
-               final boolean[] crFlags = new boolean[4];
-               TmfCoalescedDataRequest request = setupTestRequest(crFlags);
-               TmfDataRequest subRequest1 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200);
-               TmfDataRequest subRequest2 = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200);
-               request.addRequest(subRequest1);
-               request.addRequest(subRequest2);
-
-               subRequest1.cancel();
-
-               // Validate the first coalesced request
-               assertTrue ("isCompleted", subRequest1.isCompleted());
-               assertFalse("isFailed",    subRequest1.isFailed());
-               assertTrue ("isCancelled", subRequest1.isCancelled());
-
-               // Validate the coalescing request
-               assertFalse("isCompleted", request.isCompleted());
-               assertFalse("isFailed",     request.isFailed());
-               assertFalse("isCancelled", request.isCancelled());
-
-               // Cancel second sub-request
-               subRequest2.cancel();
-
-               // Validate the second coalesced request
-               assertTrue ("isCompleted", subRequest2.isCompleted());
-               assertFalse("isFailed",    subRequest2.isFailed());
-               assertTrue ("isCancelled", subRequest2.isCancelled());
-
-               // Validate the coalescing request
-               assertTrue ("isCompleted", request.isCompleted());
-               assertFalse("isFailed",    request.isFailed());
-               assertTrue ("isCancelled", request.isCancelled());
-
-               // Finalize coalescing request -
-               // Note: No need to check "request.isCancelled()" since it was verified above
-            request.cancel();
-
-               assertTrue ("handleCompleted", crFlags[0]);
-               assertFalse("handleSuccess",   crFlags[1]);
-               assertFalse("handleFailure",   crFlags[2]);
-               assertTrue ("handleCancel",    crFlags[3]);
-           }
+        final boolean[] crFlags = new boolean[4];
+        TmfCoalescedDataRequest request = setupTestRequest(crFlags);
+        TmfDataRequest subRequest1 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200);
+        TmfDataRequest subRequest2 = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200);
+        request.addRequest(subRequest1);
+        request.addRequest(subRequest2);
+
+        subRequest1.cancel();
+
+        // Validate the first coalesced request
+        assertTrue ("isCompleted", subRequest1.isCompleted());
+        assertFalse("isFailed",    subRequest1.isFailed());
+        assertTrue ("isCancelled", subRequest1.isCancelled());
+
+        // Validate the coalescing request
+        assertFalse("isCompleted", request.isCompleted());
+        assertFalse("isFailed",     request.isFailed());
+        assertFalse("isCancelled", request.isCancelled());
+
+        // Cancel second sub-request
+        subRequest2.cancel();
+
+        // Validate the second coalesced request
+        assertTrue ("isCompleted", subRequest2.isCompleted());
+        assertFalse("isFailed",    subRequest2.isFailed());
+        assertTrue("isCancelled",  subRequest2.isCancelled());
+
+        // Validate the coalescing request
+        assertTrue("isCompleted", request.isCompleted());
+        assertFalse("isFailed",   request.isFailed());
+        assertTrue("isCancelled", request.isCancelled());
+
+        // Finalize coalescing request -
+        // Note: No need to check "request.isCancelled()" since it was verified
+        // above
+        request.cancel();
+
+        assertTrue("handleCompleted", crFlags[0]);
+        assertFalse("handleSuccess", crFlags[1]);
+        assertFalse("handleFailure", crFlags[2]);
+        assertTrue("handleCancel", crFlags[3]);
+    }
 
 }
index 475e69d7b293af41785376b7ac9bcee8f52fc591..d6f0a890ac5d2f9caa62a26569110b46d7041bd7 100644 (file)
@@ -27,7 +27,6 @@ import org.eclipse.linuxtools.internal.tmf.core.request.TmfCoalescedDataRequest;
 import org.eclipse.linuxtools.internal.tmf.core.request.TmfCoalescedEventRequest;
 import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
-import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException;
@@ -81,13 +80,13 @@ public class TmfCoalescedEventRequestTest extends TestCase {
        public void setUp() throws Exception {
                super.setUp();
                TmfDataRequest.reset();
-               fRequest1  = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200);
-               fRequest2  = new TmfCoalescedEventRequest(TmfEvent.class, range2, 100, 200);
-               fRequest3  = new TmfCoalescedEventRequest(TmfEvent.class, range2, 200, 200);
-               fRequest4  = new TmfCoalescedEventRequest(TmfEvent.class, range2, 200, 300);
+               fRequest1  = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 100, 200);
+               fRequest2  = new TmfCoalescedEventRequest(ITmfEvent.class, range2, 100, 200);
+               fRequest3  = new TmfCoalescedEventRequest(ITmfEvent.class, range2, 200, 200);
+               fRequest4  = new TmfCoalescedEventRequest(ITmfEvent.class, range2, 200, 300);
 
-               fRequest1b = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200);
-               fRequest1c = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200);
+               fRequest1b = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 100, 200);
+               fRequest1c = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 100, 200);
 
                fRequestCount = fRequest1c.getRequestId() + 1;
        }
@@ -99,7 +98,7 @@ public class TmfCoalescedEventRequestTest extends TestCase {
 
        private TmfCoalescedEventRequest setupTestRequest(final boolean[] flags) {
 
-               TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200) {
+               TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 100, 200) {
                    @Override
                        public void handleCompleted() {
                        super.handleCompleted();
@@ -129,7 +128,7 @@ public class TmfCoalescedEventRequestTest extends TestCase {
        // ------------------------------------------------------------------------
 
        public void testTmfCoalescedEventRequest() {
-               TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(TmfEvent.class);
+               TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(ITmfEvent.class);
 
         assertEquals("getRequestId", fRequestCount++, request.getRequestId());
         assertEquals("getDataType",  ITmfEvent.class, request.getDataType());
@@ -145,7 +144,7 @@ public class TmfCoalescedEventRequestTest extends TestCase {
        }
 
        public void testTmfCoalescedEventRequestIndex() {
-               TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(TmfEvent.class, range1);
+               TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(ITmfEvent.class, range1);
 
         assertEquals("getRequestId", fRequestCount++, request.getRequestId());
         assertEquals("getDataType",  ITmfEvent.class, request.getDataType());
@@ -161,7 +160,7 @@ public class TmfCoalescedEventRequestTest extends TestCase {
        }
 
        public void testTmfCoalescedEventRequestIndexNbRequested() {
-               TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100);
+               TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 100);
 
         assertEquals("getRequestId", fRequestCount++, request.getRequestId());
         assertEquals("getDataType",  ITmfEvent.class, request.getDataType());
@@ -177,7 +176,7 @@ public class TmfCoalescedEventRequestTest extends TestCase {
        }
 
        public void testTmfCoalescedEventRequestIndexNbEventsBlocksize() {
-               TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200);
+               TmfCoalescedEventRequest request = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 100, 200);
 
         assertEquals("getRequestId", fRequestCount++, request.getRequestId());
         assertEquals("getDataType",  ITmfEvent.class, request.getDataType());
@@ -271,10 +270,10 @@ public class TmfCoalescedEventRequestTest extends TestCase {
 
        @SuppressWarnings("hiding")
        public void testIsCompatible() {
-               TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(TmfEvent.class, range1, 100, 200);
-               TmfEventRequest request1 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200);
-               TmfEventRequest request2 = new TmfEventRequestStub(TmfEvent.class, range2, 100, 200);
-               TmfEventRequest request3 = new TmfEventRequestStub(TmfEvent.class, range1, 101, 200);
+               TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 100, 200);
+               TmfEventRequest request1 = new TmfEventRequestStub(ITmfEvent.class, range1, 100, 200);
+               TmfEventRequest request2 = new TmfEventRequestStub(ITmfEvent.class, range2, 100, 200);
+               TmfEventRequest request3 = new TmfEventRequestStub(ITmfEvent.class, range1, 101, 200);
 
         assertTrue("isCompatible", coalescedRequest.isCompatible(request1));
         assertTrue("isCompatible", coalescedRequest.isCompatible(request2));
@@ -287,9 +286,9 @@ public class TmfCoalescedEventRequestTest extends TestCase {
 
     @SuppressWarnings("hiding")
     public void testAddEvent1() {
-        TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(TmfEvent.class, range1, 0, 2147483647, 200, ExecutionType.FOREGROUND);
-        TmfEventRequest request1 = new TmfEventRequestStub(TmfEvent.class, range1, 0, 2147483647, 200);
-        TmfEventRequest request2 = new TmfEventRequestStub(TmfEvent.class, range1, 1, 2147483647, 200);
+        TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 0, 2147483647, 200, ExecutionType.FOREGROUND);
+        TmfEventRequest request1 = new TmfEventRequestStub(ITmfEvent.class, range1, 0, 2147483647, 200);
+        TmfEventRequest request2 = new TmfEventRequestStub(ITmfEvent.class, range1, 1, 2147483647, 200);
 
         assertTrue("isCompatible", coalescedRequest.isCompatible(request1));
         assertTrue("isCompatible", coalescedRequest.isCompatible(request2));
@@ -305,9 +304,9 @@ public class TmfCoalescedEventRequestTest extends TestCase {
 
     @SuppressWarnings("hiding")
     public void testAddEvent2() {
-        TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(TmfEvent.class, range1, 1, 2147483647, 200, ExecutionType.FOREGROUND);
-        TmfEventRequest request1 = new TmfEventRequestStub(TmfEvent.class, range1, 1, 2147483647, 200);
-        TmfEventRequest request2 = new TmfEventRequestStub(TmfEvent.class, range1, 0, 2147483647, 200);
+        TmfCoalescedEventRequest coalescedRequest = new TmfCoalescedEventRequest(ITmfEvent.class, range1, 1, 2147483647, 200, ExecutionType.FOREGROUND);
+        TmfEventRequest request1 = new TmfEventRequestStub(ITmfEvent.class, range1, 1, 2147483647, 200);
+        TmfEventRequest request2 = new TmfEventRequestStub(ITmfEvent.class, range1, 0, 2147483647, 200);
 
         assertTrue("isCompatible", coalescedRequest.isCompatible(request1));
         assertTrue("isCompatible", coalescedRequest.isCompatible(request2));
@@ -330,8 +329,8 @@ public class TmfCoalescedEventRequestTest extends TestCase {
                // Test request
                final boolean[] crFlags = new boolean[4];
                TmfCoalescedEventRequest request = setupTestRequest(crFlags);
-               TmfEventRequest subRequest1 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200);
-               TmfEventRequest subRequest2 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200);
+               TmfEventRequest subRequest1 = new TmfEventRequestStub(ITmfEvent.class, range1, 100, 200);
+               TmfEventRequest subRequest2 = new TmfEventRequestStub(ITmfEvent.class, range1, 100, 200);
                request.addRequest(subRequest1);
                request.addRequest(subRequest2);
 
@@ -366,8 +365,8 @@ public class TmfCoalescedEventRequestTest extends TestCase {
 
                final boolean[] crFlags = new boolean[4];
                TmfCoalescedEventRequest request = setupTestRequest(crFlags);
-               TmfEventRequest subRequest1 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200);
-               TmfEventRequest subRequest2 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200);
+               TmfEventRequest subRequest1 = new TmfEventRequestStub(ITmfEvent.class, range1, 100, 200);
+               TmfEventRequest subRequest2 = new TmfEventRequestStub(ITmfEvent.class, range1, 100, 200);
                request.addRequest(subRequest1);
                request.addRequest(subRequest2);
 
@@ -402,8 +401,8 @@ public class TmfCoalescedEventRequestTest extends TestCase {
 
                final boolean[] crFlags = new boolean[4];
                TmfCoalescedEventRequest request = setupTestRequest(crFlags);
-               TmfEventRequest subRequest1 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200);
-               TmfEventRequest subRequest2 = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200);
+               TmfEventRequest subRequest1 = new TmfEventRequestStub(ITmfEvent.class, range1, 100, 200);
+               TmfEventRequest subRequest2 = new TmfEventRequestStub(ITmfEvent.class, range1, 100, 200);
                request.addRequest(subRequest1);
                request.addRequest(subRequest2);
 
@@ -485,7 +484,7 @@ public class TmfCoalescedEventRequestTest extends TestCase {
         final long REQUEST_OFFSET = 1000;
 
         requestedEvents1 = new Vector<ITmfEvent>();
-        request1 = new TmfEventRequest(TmfEvent.class, range, signal.fIndex, NB_EVENTS, BLOCK_SIZE) {
+        request1 = new TmfEventRequest(ITmfEvent.class, range, signal.fIndex, NB_EVENTS, BLOCK_SIZE) {
                int nbRead = 0;
             @Override
             public void handleData(ITmfEvent event) {
@@ -500,7 +499,7 @@ public class TmfCoalescedEventRequestTest extends TestCase {
         };
 
         requestedEvents2 = new Vector<ITmfEvent>();
-        request2 = new TmfEventRequest(TmfEvent.class, range, signal.fIndex + REQUEST_OFFSET, NB_EVENTS, BLOCK_SIZE) {
+        request2 = new TmfEventRequest(ITmfEvent.class, range, signal.fIndex + REQUEST_OFFSET, NB_EVENTS, BLOCK_SIZE) {
             @Override
             public void handleData(ITmfEvent event) {
                        super.handleData(event);
@@ -511,7 +510,7 @@ public class TmfCoalescedEventRequestTest extends TestCase {
         };
 
         requestedEvents3 = new Vector<ITmfEvent>();
-        request3 = new TmfEventRequest(TmfEvent.class, range, signal.fIndex + 2 * REQUEST_OFFSET, NB_EVENTS, BLOCK_SIZE) {
+        request3 = new TmfEventRequest(ITmfEvent.class, range, signal.fIndex + 2 * REQUEST_OFFSET, NB_EVENTS, BLOCK_SIZE) {
             @Override
             public void handleData(ITmfEvent event) {
                        super.handleData(event);
@@ -521,7 +520,7 @@ public class TmfCoalescedEventRequestTest extends TestCase {
             }
         };
 
-        providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        providers = TmfProviderManager.getProviders(ITmfEvent.class, TmfTraceStub.class);
         providers[0].sendRequest(request1);
         providers[0].sendRequest(request2);
         providers[0].sendRequest(request3);
index 6a29795692a70fc4c4bb83438126f339c160ecc6..ddf85561eb21809c15811720f66888369bb0df3a 100644 (file)
@@ -14,7 +14,7 @@ package org.eclipse.linuxtools.tmf.core.tests.request;
 
 import junit.framework.TestCase;
 
-import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest;
 import org.eclipse.linuxtools.tmf.tests.stubs.request.TmfDataRequestStub;
 
@@ -54,12 +54,12 @@ public class TmfDataRequestTest extends TestCase {
        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);
-               fRequest4  = new TmfDataRequestStub(TmfEvent.class, 20, 200, 300);
-       fRequest1b = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200);
-               fRequest1c = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200);
+               fRequest1  = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200);
+               fRequest2  = new TmfDataRequestStub(ITmfEvent.class, 20, 100, 200);
+               fRequest3  = new TmfDataRequestStub(ITmfEvent.class, 20, 200, 200);
+               fRequest4  = new TmfDataRequestStub(ITmfEvent.class, 20, 200, 300);
+       fRequest1b = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200);
+               fRequest1c = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200);
                fRequestCount = fRequest1c.getRequestId() + 1;
        }
 
@@ -70,7 +70,7 @@ public class TmfDataRequestTest extends TestCase {
 
        private static TmfDataRequest setupTestRequest(final boolean[] flags) {
 
-               TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200) {
+               TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200) {
                    @Override
                        public void handleCompleted() {
                        super.handleCompleted();
@@ -100,10 +100,10 @@ public class TmfDataRequestTest extends TestCase {
        // ------------------------------------------------------------------------
 
        public void testTmfDataRequest() {
-        TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class);
+        TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class);
 
         assertEquals("getRequestId", fRequestCount++, request.getRequestId());
-        assertEquals("getDataType",  TmfEvent.class, request.getDataType());
+        assertEquals("getDataType",  ITmfEvent.class, request.getDataType());
 
         assertEquals("getIndex", 0, request.getIndex());
         assertEquals("getNbRequestedEvents", TmfDataRequest.ALL_DATA, request.getNbRequested());
@@ -116,10 +116,10 @@ public class TmfDataRequestTest extends TestCase {
        }
 
        public void testTmfDataRequestIndex() {
-        TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 10);
+        TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 10);
 
         assertEquals("getRequestId", fRequestCount++, request.getRequestId());
-        assertEquals("getDataType",  TmfEvent.class, request.getDataType());
+        assertEquals("getDataType",  ITmfEvent.class, request.getDataType());
 
         assertEquals("getIndex", 10, request.getIndex());
         assertEquals("getNbRequestedEvents", TmfDataRequest.ALL_DATA, request.getNbRequested());
@@ -132,10 +132,10 @@ public class TmfDataRequestTest extends TestCase {
        }
 
        public void testTmfDataRequestIndexNbRequested() {
-        TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 10, 100);
+        TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 10, 100);
 
         assertEquals("getRequestId", fRequestCount++, request.getRequestId());
-        assertEquals("getDataType",  TmfEvent.class, request.getDataType());
+        assertEquals("getDataType",  ITmfEvent.class, request.getDataType());
 
         assertEquals("getIndex", 10, request.getIndex());
         assertEquals("getNbRequestedEvents", 100, request.getNbRequested());
@@ -148,10 +148,10 @@ public class TmfDataRequestTest extends TestCase {
        }
 
        public void testTmfDataRequestIndexNbEventsBlocksize() {
-        TmfDataRequest request = new TmfDataRequestStub(TmfEvent.class, 10, 100, 200);
+        TmfDataRequest request = new TmfDataRequestStub(ITmfEvent.class, 10, 100, 200);
 
         assertEquals("getRequestId", fRequestCount++, request.getRequestId());
-        assertEquals("getDataType",  TmfEvent.class, request.getDataType());
+        assertEquals("getDataType",  ITmfEvent.class, request.getDataType());
 
         assertEquals("getIndex", 10, request.getIndex());
         assertEquals("getNbRequestedEvents", 100, request.getNbRequested());
@@ -211,10 +211,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,ITmfEvent,10,100,200)]";
+        String expected2 = "[TmfDataRequest(1,ITmfEvent,20,100,200)]";
+        String expected3 = "[TmfDataRequest(2,ITmfEvent,20,200,200)]";
+        String expected4 = "[TmfDataRequest(3,ITmfEvent,20,200,300)]";
 
         assertEquals("toString", expected1, fRequest1.toString());
         assertEquals("toString", expected2, fRequest2.toString());
index f5bbc4bff268f1aea539753d4ffed8a667e12faf..936eec307b374fa51303be2c9da14dc6e6cc969c 100644 (file)
@@ -14,7 +14,7 @@ package org.eclipse.linuxtools.tmf.core.tests.request;
 
 import junit.framework.TestCase;
 
-import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.request.TmfDataRequest;
@@ -60,12 +60,12 @@ public class TmfEventRequestTest extends TestCase {
        protected void setUp() throws Exception {
                super.setUp();
                TmfDataRequest.reset();
-               fRequest1  = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200);
-               fRequest2  = new TmfEventRequestStub(TmfEvent.class, range2, 100, 200);
-               fRequest3  = new TmfEventRequestStub(TmfEvent.class, range2, 200, 200);
-               fRequest4  = new TmfEventRequestStub(TmfEvent.class, range2, 200, 300);
-               fRequest1b = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200);
-               fRequest1c = new TmfEventRequestStub(TmfEvent.class, range1, 100, 200);
+               fRequest1  = new TmfEventRequestStub(ITmfEvent.class, range1, 100, 200);
+               fRequest2  = new TmfEventRequestStub(ITmfEvent.class, range2, 100, 200);
+               fRequest3  = new TmfEventRequestStub(ITmfEvent.class, range2, 200, 200);
+               fRequest4  = new TmfEventRequestStub(ITmfEvent.class, range2, 200, 300);
+               fRequest1b = new TmfEventRequestStub(ITmfEvent.class, range1, 100, 200);
+               fRequest1c = new TmfEventRequestStub(ITmfEvent.class, range1, 100, 200);
                fRequestCount = fRequest1c.getRequestId() + 1;
        }
 
@@ -76,7 +76,7 @@ public class TmfEventRequestTest extends TestCase {
 
        private static TmfEventRequest setupTestRequest(final boolean[] flags) {
 
-               TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class, new TmfTimeRange(TmfTimeRange.ETERNITY), 100, 200) {
+               TmfEventRequest request = new TmfEventRequestStub(ITmfEvent.class, new TmfTimeRange(TmfTimeRange.ETERNITY), 100, 200) {
                    @Override
                        public void handleCompleted() {
                        super.handleCompleted();
@@ -106,10 +106,10 @@ public class TmfEventRequestTest extends TestCase {
        // ------------------------------------------------------------------------
 
        public void testTmfEventRequest() {
-        TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class);
+        TmfEventRequest request = new TmfEventRequestStub(ITmfEvent.class);
 
         assertEquals("getRequestId", fRequestCount++, request.getRequestId());
-        assertEquals("getDataType",  TmfEvent.class, request.getDataType());
+        assertEquals("getDataType",  ITmfEvent.class, request.getDataType());
 
         assertEquals("StartTime", TmfTimestamp.BIG_BANG,   request.getRange().getStartTime());
         assertEquals("EndTime",   TmfTimestamp.BIG_CRUNCH, request.getRange().getEndTime());
@@ -126,10 +126,10 @@ public class TmfEventRequestTest extends TestCase {
 
        public void testTmfEventRequestTimeRange() {
         TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BIG_CRUNCH);
-        TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class, range);
+        TmfEventRequest request = new TmfEventRequestStub(ITmfEvent.class, range);
 
         assertEquals("getRequestId", fRequestCount++, request.getRequestId());
-        assertEquals("getDataType",  TmfEvent.class, request.getDataType());
+        assertEquals("getDataType",  ITmfEvent.class, request.getDataType());
 
         assertEquals("StartTime", new TmfTimestamp(), request.getRange().getStartTime());
         assertEquals("EndTime",   TmfTimestamp.BIG_CRUNCH, request.getRange().getEndTime());
@@ -146,10 +146,10 @@ public class TmfEventRequestTest extends TestCase {
 
        public void testTmfEventRequestTimeRangeNbRequested() {
         TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BIG_CRUNCH);
-        TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class, range, 100);
+        TmfEventRequest request = new TmfEventRequestStub(ITmfEvent.class, range, 100);
 
         assertEquals("getRequestId", fRequestCount++, request.getRequestId());
-        assertEquals("getDataType",  TmfEvent.class, request.getDataType());
+        assertEquals("getDataType",  ITmfEvent.class, request.getDataType());
 
         assertEquals("StartTime", new TmfTimestamp(), request.getRange().getStartTime());
         assertEquals("EndTime",   TmfTimestamp.BIG_CRUNCH, request.getRange().getEndTime());
@@ -166,10 +166,10 @@ public class TmfEventRequestTest extends TestCase {
 
        public void testTmfEventRequestTimeRangeNbRequestedBlocksize() {
         TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(), TmfTimestamp.BIG_CRUNCH);
-        TmfEventRequest request = new TmfEventRequestStub(TmfEvent.class, range, 100, 200);
+        TmfEventRequest request = new TmfEventRequestStub(ITmfEvent.class, range, 100, 200);
 
         assertEquals("getRequestId", fRequestCount++, request.getRequestId());
-        assertEquals("getDataType",  TmfEvent.class, request.getDataType());
+        assertEquals("getDataType",  ITmfEvent.class, request.getDataType());
 
         assertEquals("StartTime", new TmfTimestamp(), request.getRange().getStartTime());
         assertEquals("EndTime",   TmfTimestamp.BIG_CRUNCH, request.getRange().getEndTime());
@@ -232,10 +232,10 @@ public class TmfEventRequestTest extends TestCase {
        // ------------------------------------------------------------------------
 
        public void testToString() {
-        String expected1 = "[TmfEventRequest(0,TmfEvent," + range1 + ",0,100,200)]";
-        String expected2 = "[TmfEventRequest(1,TmfEvent," + range2 + ",0,100,200)]";
-        String expected3 = "[TmfEventRequest(2,TmfEvent," + range2 + ",0,200,200)]";
-        String expected4 = "[TmfEventRequest(3,TmfEvent," + range2 + ",0,200,300)]";
+        String expected1 = "[TmfEventRequest(0,ITmfEvent," + range1 + ",0,100,200)]";
+        String expected2 = "[TmfEventRequest(1,ITmfEvent," + range2 + ",0,100,200)]";
+        String expected3 = "[TmfEventRequest(2,ITmfEvent," + range2 + ",0,200,200)]";
+        String expected4 = "[TmfEventRequest(3,ITmfEvent," + range2 + ",0,200,300)]";
 
         assertEquals("toString", expected1, fRequest1.toString());
         assertEquals("toString", expected2, fRequest2.toString());
index 34e51611c7b58fa2d9c8d74ac0b5ad2832daec1b..4b9dd815d1d2c9c42867744f9e5f88962378654e 100644 (file)
@@ -28,7 +28,6 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.linuxtools.internal.tmf.core.trace.TmfExperimentContext;
 import org.eclipse.linuxtools.internal.tmf.core.trace.TmfExperimentLocation;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
-import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException;
@@ -121,12 +120,12 @@ public class TmfExperimentTest extends TestCase {
 
     public void testSimpleTmfExperimentConstructor() {
 
-        TmfExperiment experiment = new TmfExperiment(TmfEvent.class, EXPERIMENT, fTestTraces);
+        TmfExperiment experiment = new TmfExperiment(ITmfEvent.class, EXPERIMENT, fTestTraces);
         assertEquals("GetId", EXPERIMENT, experiment.getName());
         assertEquals("GetCacheSize", TmfExperiment.DEFAULT_INDEX_PAGE_SIZE, experiment.getCacheSize());
         experiment.dispose();
 
-        experiment = new TmfExperiment(TmfEvent.class, EXPERIMENT, null);
+        experiment = new TmfExperiment(ITmfEvent.class, EXPERIMENT, null);
         experiment.dispose();
     }
 
@@ -205,7 +204,7 @@ public class TmfExperimentTest extends TestCase {
     }
 
     public void testSeekNoTrace() {
-        TmfExperiment experiment = new TmfExperiment(TmfEvent.class, EXPERIMENT, null);
+        TmfExperiment experiment = new TmfExperiment(ITmfEvent.class, EXPERIMENT, null);
         ITmfContext context = experiment.seekEvent((TmfExperimentLocation) null);
         assertNull("seekEvent", context);
         experiment.dispose();
@@ -837,7 +836,7 @@ public class TmfExperimentTest extends TestCase {
         final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
-        final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) {
+        final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, range, nbEvents, blockSize) {
             @Override
             public void handleData(final ITmfEvent event) {
                 super.handleData(event);
@@ -865,7 +864,7 @@ public class TmfExperimentTest extends TestCase {
         final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
-        final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) {
+        final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, range, nbEvents, blockSize) {
             @Override
             public void handleData(final ITmfEvent event) {
                 super.handleData(event);
@@ -894,7 +893,7 @@ public class TmfExperimentTest extends TestCase {
         final long nbExpectedEvents = NB_EVENTS;
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
-        final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) {
+        final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, range, nbEvents, blockSize) {
             @Override
             public void handleData(final ITmfEvent event) {
                 super.handleData(event);
@@ -926,7 +925,7 @@ public class TmfExperimentTest extends TestCase {
         final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
-        final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) {
+        final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, range, nbEvents, blockSize) {
             int nbRead = 0;
             @Override
             public void handleData(final ITmfEvent event) {
index cbeb4595d917bb76f852019329aaad7c6cfabeff..84dae11f6c8e3cc78e8e568f93e98d4f223ecf98 100644 (file)
@@ -26,7 +26,6 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.linuxtools.internal.tmf.core.trace.TmfExperimentContext;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp;
-import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException;
@@ -689,7 +688,7 @@ public class TmfMultiTraceExperimentTest extends TestCase {
         final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
-        final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) {
+        final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, range, nbEvents, blockSize) {
             @Override
             public void handleData(final ITmfEvent event) {
                 super.handleData(event);
@@ -717,7 +716,7 @@ public class TmfMultiTraceExperimentTest extends TestCase {
         final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
-        final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) {
+        final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, range, nbEvents, blockSize) {
             @Override
             public void handleData(final ITmfEvent event) {
                 super.handleData(event);
@@ -746,7 +745,7 @@ public class TmfMultiTraceExperimentTest extends TestCase {
         final long nbExpectedEvents = NB_EVENTS;
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
-        final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) {
+        final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, range, nbEvents, blockSize) {
             @Override
             public void handleData(final ITmfEvent event) {
                 super.handleData(event);
@@ -778,7 +777,7 @@ public class TmfMultiTraceExperimentTest extends TestCase {
         final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
-        final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, nbEvents, blockSize) {
+        final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, range, nbEvents, blockSize) {
             int nbRead = 0;
             @Override
             public void handleData(final ITmfEvent event) {
@@ -823,6 +822,7 @@ public class TmfMultiTraceExperimentTest extends TestCase {
     // ------------------------------------------------------------------------
     // getInitialRangeOffset, getCurrentRange, getCurrentTime
     // ------------------------------------------------------------------------
+
     public void testDefaultCurrentTimeValues() {
         // reset to default initial range offset
         ((TmfTraceStub)fTraces[0]).setInitialRangeOffset(null);
index 1b957a841643692c9cb83f5daa5dccc206df80ad..8260ab03dd8b8c2c00862994a332710a724ec097 100644 (file)
@@ -28,7 +28,6 @@ import org.eclipse.linuxtools.internal.tmf.core.component.TmfProviderManager;
 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;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException;
@@ -128,7 +127,7 @@ public class TmfTraceTest extends TestCase {
         }
 
         assertFalse ("Open trace", trace == null);
-        assertEquals("getType",  TmfEvent.class, trace.getType());
+        assertEquals("getType",  ITmfEvent.class, trace.getType());
         assertNull  ("getResource", trace.getResource());
         assertEquals("getPath", testfile.toURI().getPath(), trace.getPath());
         assertEquals("getCacheSize", ITmfTrace.DEFAULT_TRACE_CACHE_SIZE, trace.getCacheSize());
@@ -158,7 +157,7 @@ public class TmfTraceTest extends TestCase {
         }
 
         assertFalse ("Open trace", trace == null);
-        assertEquals("getType",  TmfEvent.class, trace.getType());
+        assertEquals("getType",  ITmfEvent.class, trace.getType());
         assertNull  ("getResource", trace.getResource());
         assertEquals("getPath", testfile.toURI().getPath(), trace.getPath());
         assertEquals("getCacheSize", ITmfTrace.DEFAULT_TRACE_CACHE_SIZE, trace.getCacheSize());
@@ -182,7 +181,7 @@ public class TmfTraceTest extends TestCase {
             fail("IOException");
         }
 
-        assertEquals("getType",  TmfEvent.class, trace.getType());
+        assertEquals("getType",  ITmfEvent.class, trace.getType());
         assertNull  ("getResource", trace.getResource());
         assertEquals("getPath", testfile.toURI().getPath(), trace.getPath());
         assertEquals("getCacheSize", BLOCK_SIZE, trace.getCacheSize());
@@ -212,7 +211,7 @@ public class TmfTraceTest extends TestCase {
         }
 
         assertFalse ("Open trace", trace == null);
-        assertEquals("getType",  TmfEvent.class, trace.getType());
+        assertEquals("getType",  ITmfEvent.class, trace.getType());
         assertNull  ("getResource", trace.getResource());
         assertEquals("getPath", testfile.toURI().getPath(), trace.getPath());
         assertEquals("getCacheSize", BLOCK_SIZE, trace.getCacheSize());
@@ -243,7 +242,7 @@ public class TmfTraceTest extends TestCase {
         }
 
         assertFalse ("Open trace", trace == null);
-        assertEquals("getType",  TmfEvent.class, trace.getType());
+        assertEquals("getType",  ITmfEvent.class, trace.getType());
         assertNull  ("getResource", trace.getResource());
         assertEquals("getPath", testfile.toURI().getPath(), trace.getPath());
         assertEquals("getCacheSize", BLOCK_SIZE, trace.getCacheSize());
@@ -275,7 +274,7 @@ public class TmfTraceTest extends TestCase {
         }
 
         assertFalse ("Open trace", trace == null);
-        assertEquals("getType",  TmfEvent.class, trace.getType());
+        assertEquals("getType",  ITmfEvent.class, trace.getType());
         assertNull  ("getResource", trace.getResource());
         assertEquals("getPath", testfile.toURI().getPath(), trace.getPath());
         assertEquals("getCacheSize", BLOCK_SIZE, trace.getCacheSize());
@@ -309,7 +308,7 @@ public class TmfTraceTest extends TestCase {
         final TmfTraceStub trace = new TmfTraceStub();
 
         try {
-            trace.initialize(null, null, TmfEvent.class);
+            trace.initialize(null, null, ITmfEvent.class);
             fail("TmfTrace.initialize() - no exception thrown");
         } catch (TmfTraceException e) {
             // Success
@@ -326,12 +325,12 @@ public class TmfTraceTest extends TestCase {
         // Path == trace name
         String path = "TraceName";
         try {
-            trace.initialize(null, path, TmfEvent.class);
+            trace.initialize(null, path, ITmfEvent.class);
         } catch (Exception e) {
             fail("TmfTrace.initialize() - Exception thrown");
         }
 
-        assertEquals("getType", TmfEvent.class, trace.getType());
+        assertEquals("getType", ITmfEvent.class, trace.getType());
         assertNull  ("getResource", trace.getResource());
         assertEquals("getPath", path, trace.getPath());
         assertEquals("getCacheSize", ITmfTrace.DEFAULT_TRACE_CACHE_SIZE, trace.getCacheSize());
@@ -354,12 +353,12 @@ public class TmfTraceTest extends TestCase {
         String name = "TraceName";
         String path = "/my/trace/path/" + name;
         try {
-            trace.initialize(null, path, TmfEvent.class);
+            trace.initialize(null, path, ITmfEvent.class);
         } catch (Exception e) {
             fail("TmfTrace.initialize() - Exception thrown");
         }
 
-        assertEquals("getType", TmfEvent.class, trace.getType());
+        assertEquals("getType", ITmfEvent.class, trace.getType());
         assertNull  ("getResource", trace.getResource());
         assertEquals("getPath", path, trace.getPath());
         assertEquals("getCacheSize", ITmfTrace.DEFAULT_TRACE_CACHE_SIZE, trace.getCacheSize());
@@ -396,7 +395,7 @@ public class TmfTraceTest extends TestCase {
         assertTrue("validate", trace.validate(null, testfile.getPath()));
 
         // InitTrace and wait for indexing completion...
-        trace.initTrace(null, testfile.toURI().getPath(), TmfEvent.class);
+        trace.initTrace(null, testfile.toURI().getPath(), ITmfEvent.class);
         trace.indexTrace();
         int nbSecs = 0;
         while (trace.getNbEvents() < NB_EVENTS && nbSecs < 10) {
@@ -407,7 +406,7 @@ public class TmfTraceTest extends TestCase {
             fail("indexing");
         }
 
-        assertEquals("getType",  TmfEvent.class, trace.getType());
+        assertEquals("getType", ITmfEvent.class, trace.getType());
         assertNull  ("getResource", trace.getResource());
         assertEquals("getCacheSize", ITmfTrace.DEFAULT_TRACE_CACHE_SIZE, trace.getCacheSize());
         assertEquals("getStreamingInterval", 0, trace.getStreamingInterval());
@@ -1226,14 +1225,14 @@ public class TmfTraceTest extends TestCase {
         final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
-        final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
+        final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
             @Override
             public void handleData(final ITmfEvent event) {
                 super.handleData(event);
                 requestedEvents.add(event);
             }
         };
-        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(ITmfEvent.class, TmfTraceStub.class);
         providers[0].sendRequest(request);
         request.waitForCompletion();
 
@@ -1255,14 +1254,14 @@ public class TmfTraceTest extends TestCase {
         final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
-        final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
+        final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
             @Override
             public void handleData(final ITmfEvent event) {
                 super.handleData(event);
                 requestedEvents.add(event);
             }
         };
-        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(ITmfEvent.class, TmfTraceStub.class);
         providers[0].sendRequest(request);
         request.waitForCompletion();
 
@@ -1285,14 +1284,14 @@ public class TmfTraceTest extends TestCase {
         final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
 
         final TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(startTime, SCALE), TmfTimestamp.BIG_CRUNCH);
-        final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
+        final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
             @Override
             public void handleData(final ITmfEvent event) {
                 super.handleData(event);
                 requestedEvents.add(event);
             }
         };
-        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(ITmfEvent.class, TmfTraceStub.class);
         providers[0].sendRequest(request);
         request.waitForCompletion();
 
@@ -1316,14 +1315,14 @@ public class TmfTraceTest extends TestCase {
         final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
 
         final TmfTimeRange range = new TmfTimeRange(new TmfTimestamp(startTime, SCALE), TmfTimestamp.BIG_CRUNCH);
-        final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, startIndex, NB_EVENTS, BLOCK_SIZE) {
+        final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, range, startIndex, NB_EVENTS, BLOCK_SIZE) {
             @Override
             public void handleData(final ITmfEvent event) {
                 super.handleData(event);
                 requestedEvents.add(event);
             }
         };
-        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(ITmfEvent.class, TmfTraceStub.class);
         providers[0].sendRequest(request);
         request.waitForCompletion();
 
@@ -1344,14 +1343,14 @@ public class TmfTraceTest extends TestCase {
         final int NB_EVENTS  = 1000;
         final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
 
-        final TmfDataRequest request = new TmfDataRequest(TmfEvent.class, startIndex, NB_EVENTS) {
+        final TmfDataRequest request = new TmfDataRequest(ITmfEvent.class, startIndex, NB_EVENTS) {
             @Override
             public void handleData(final ITmfEvent event) {
                 super.handleData(event);
                 requestedEvents.add(event);
             }
         };
-        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(ITmfEvent.class, TmfTraceStub.class);
         providers[0].sendRequest(request);
         request.waitForCompletion();
 
@@ -1374,7 +1373,7 @@ public class TmfTraceTest extends TestCase {
         final Vector<ITmfEvent> requestedEvents = new Vector<ITmfEvent>();
 
         final TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BIG_BANG, TmfTimestamp.BIG_CRUNCH);
-        final TmfEventRequest request = new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
+        final TmfEventRequest request = new TmfEventRequest(ITmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
             int nbRead = 0;
             @Override
             public void handleData(final ITmfEvent event) {
@@ -1385,7 +1384,7 @@ public class TmfTraceTest extends TestCase {
                 }
             }
         };
-        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(TmfEvent.class, TmfTraceStub.class);
+        final ITmfDataProvider[] providers = TmfProviderManager.getProviders(ITmfEvent.class, TmfTraceStub.class);
         providers[0].sendRequest(request);
         request.waitForCompletion();
 
@@ -1400,7 +1399,7 @@ public class TmfTraceTest extends TestCase {
 
     public void testDefaultTmfTraceStub() {
         assertFalse ("Open trace", fTrace == null);
-        assertEquals("getType",  TmfEvent.class, fTrace.getType());
+        assertEquals("getType",  ITmfEvent.class, fTrace.getType());
         assertNull  ("getResource", fTrace.getResource());
         assertEquals("getCacheSize", BLOCK_SIZE, fTrace.getCacheSize());
         assertEquals("getStreamingInterval", 0, fTrace.getStreamingInterval());
index aef64354301643987dcbf7de089a31d4f9f96f6a..b1b80b11582782a9667b4780be2c6a93aa9649bb 100644 (file)
@@ -13,6 +13,7 @@ package org.eclipse.linuxtools.tmf.core.tests.uml2sd;
 
 import junit.framework.TestCase;
 
+import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEventField;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEventType;
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
@@ -42,8 +43,8 @@ public class TmfAsyncSequenceDiagramEventTest extends TestCase {
     private final TmfEventType fType       = new TmfEventType(fContext, fTypeId, TmfEventField.makeRoot(fLabels));
     private final String       fReference  = "Some reference";
 
-    private final TmfEvent fEvent1;
-    private final TmfEvent fEvent2;
+    private final ITmfEvent fEvent1;
+    private final ITmfEvent fEvent2;
     private final TmfEventField fContent1;
     private final TmfEventField fContent2;
 
index a7dd5acb5e42c2cd27ec33fd744a702a3cbb85f5..5f1f44d07a0f9fcfce6e91c4040fb674e963674a 100644 (file)
@@ -13,6 +13,7 @@ package org.eclipse.linuxtools.tmf.core.tests.uml2sd;
 
 import junit.framework.TestCase;
 
+import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEventField;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEventType;
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
@@ -41,7 +42,7 @@ public class TmfSyncSequenceDiagramEventTest extends TestCase {
     private final TmfEventType fType       = new TmfEventType(fContext, fTypeId, TmfEventField.makeRoot(fLabels));
     private final String       fReference  = "Some reference";
 
-    private final TmfEvent fEvent1;
+    private final ITmfEvent fEvent1;
     private final TmfEventField fContent1;
 
     public TmfSyncSequenceDiagramEventTest () {
index dfb0c05e5cd89f03bcfc3b107fde408dcab69a0c..a0553aa8833e2f3238f6877303f671256ec125b4 100644 (file)
@@ -21,7 +21,6 @@ import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.linuxtools.tmf.core.component.TmfDataProvider;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
-import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException;
 import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
 import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest;
@@ -43,7 +42,7 @@ public class TmfDataProviderStub extends TmfDataProvider {
     private TmfTraceStub fTrace;
 
     public TmfDataProviderStub(final String path) throws IOException {
-        super("TmfDataProviderStub", TmfEvent.class);
+        super("TmfDataProviderStub", ITmfEvent.class);
         final URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(path), null);
         try {
             final File test = new File(FileLocator.toFileURL(location).toURI());
index 66c2cb37cfd5ada8f7f5a69d875ce60b422675e2..1ec22b37eacaac49c94ec5caad69bc25b7e20111 100644 (file)
@@ -21,7 +21,6 @@ import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
-import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException;
 import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
 import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest;
@@ -43,7 +42,7 @@ public class TmfEventProviderStub extends TmfEventProvider {
     private TmfTraceStub fTrace;
 
     public TmfEventProviderStub(final String path) throws IOException {
-        super(path, TmfEvent.class);
+        super(path, ITmfEvent.class);
         final URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(path), null);
         try {
             final File test = new File(FileLocator.toFileURL(location).toURI());
index 29b889d11553c5f820e2840abd4b6b79235a81f5..a1f2797a5b5c607ee181f27eb6ee00b2eab02836 100644 (file)
@@ -18,7 +18,6 @@ import org.eclipse.linuxtools.internal.tmf.core.component.TmfProviderManager;
 import org.eclipse.linuxtools.tmf.core.component.ITmfDataProvider;
 import org.eclipse.linuxtools.tmf.core.component.TmfEventProvider;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
-import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
 import org.eclipse.linuxtools.tmf.core.request.ITmfEventRequest;
@@ -46,7 +45,7 @@ public class TmfSyntheticEventProviderStub extends TmfEventProvider {
     public ITmfContext armRequest(final ITmfDataRequest request) {
 
         // Get the TmfSyntheticEventStub provider
-        final ITmfDataProvider[] eventProviders = TmfProviderManager.getProviders(TmfEvent.class, TmfEventProviderStub.class);
+        final ITmfDataProvider[] eventProviders = TmfProviderManager.getProviders(ITmfEvent.class, TmfEventProviderStub.class);
         final ITmfDataProvider provider = eventProviders[0];
 
         // make sure we have the right type of request
@@ -58,7 +57,7 @@ public class TmfSyntheticEventProviderStub extends TmfEventProvider {
         final TmfEventRequest eventRequest = (TmfEventRequest) request;
         final TmfTimeRange range = eventRequest.getRange();
         final TmfEventRequest subRequest =
-                new TmfEventRequest(TmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
+                new TmfEventRequest(ITmfEvent.class, range, NB_EVENTS, BLOCK_SIZE) {
             @Override
             public void handleData(final ITmfEvent event) {
                 super.handleData(event);
index 5d81ac3c85b561d87adba6971c385b2eddf850c5..e39124970c4a53801a331a58e562e4573998f276 100644 (file)
@@ -12,7 +12,7 @@
 
 package org.eclipse.linuxtools.tmf.tests.stubs.trace;
 
-import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation;
 import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
@@ -64,7 +64,7 @@ public class TmfEmptyTraceStub extends TmfTraceStub {
     }
 
     @Override
-    public TmfEvent parseEvent(final ITmfContext context) {
+    public ITmfEvent parseEvent(final ITmfContext context) {
         return null;
     }
 
index 0dfd93ef6ed9ee243824487623ccb842b4db19ce..4eaa78a7b0c14c83edf36b838430769611bfcfea 100644 (file)
@@ -17,6 +17,7 @@ import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.util.Vector;
 
+import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEventField;
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfEventField;
@@ -67,7 +68,7 @@ public class TmfEventParserStub implements ITmfEventParser {
 
     static final String typePrefix = "Type-";
     @Override
-    public TmfEvent parseEvent(final ITmfContext context) {
+    public ITmfEvent parseEvent(final ITmfContext context) {
 
         if (! (fEventStream instanceof TmfTraceStub)) {
             return null;
@@ -106,7 +107,7 @@ public class TmfEventParserStub implements ITmfEventParser {
                 content.append("]");
 
                 final TmfEventField root = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, content.toString());
-                final TmfEvent event = new TmfEvent(fEventStream,
+                final ITmfEvent event = new TmfEvent(fEventStream,
                         new TmfTimestamp(ts, -3, 0),     // millisecs
                         source, fTypes[typeIndex], root, reference.toString());
                 return event;
index b8a2f0d70d8d031aa65bc2e9d143d686daeec596..302e2f21e81123d3813e590b1bba12437e444d1c 100644 (file)
@@ -12,7 +12,7 @@
 
 package org.eclipse.linuxtools.tmf.tests.stubs.trace;
 
-import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
 import org.eclipse.linuxtools.tmf.core.trace.TmfExperiment;
 
@@ -26,7 +26,7 @@ import org.eclipse.linuxtools.tmf.core.trace.TmfExperiment;
 public class TmfExperimentStub extends TmfExperiment {
 
     public TmfExperimentStub(String name, ITmfTrace[] traces, int blockSize) {
-        super(TmfEvent.class, name, traces, blockSize);
+        super(ITmfEvent.class, name, traces, blockSize);
         setIndexer(new TmfIndexerStub(this, blockSize));
     }
 
index 2a16a2e7ba47ac2932bc41858534373b11ecf061..5629baa0f10083eda146714ae55b0ba6cf04a45b 100644 (file)
@@ -21,7 +21,6 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp;
-import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
@@ -88,7 +87,7 @@ public class TmfTraceStub extends TmfTrace implements ITmfEventParser {
      * @throws FileNotFoundException
      */
     public TmfTraceStub(final String path, final int cacheSize, final long interval) throws TmfTraceException {
-        super(null, TmfEvent.class, path, cacheSize, interval);
+        super(null, ITmfEvent.class, path, cacheSize, interval);
         try {
             fTrace = new RandomAccessFile(path, "r");
         } catch (FileNotFoundException e) {
@@ -122,7 +121,7 @@ public class TmfTraceStub extends TmfTrace implements ITmfEventParser {
      * @throws FileNotFoundException
      */
     public TmfTraceStub(final String path, final int cacheSize, final boolean waitForCompletion) throws TmfTraceException {
-        super(null, TmfEvent.class, path, cacheSize);
+        super(null, ITmfEvent.class, path, cacheSize);
         try {
             fTrace = new RandomAccessFile(path, "r");
         } catch (FileNotFoundException e) {
@@ -141,7 +140,7 @@ public class TmfTraceStub extends TmfTrace implements ITmfEventParser {
      * @throws FileNotFoundException
      */
     public TmfTraceStub(final IResource resource,  final String path, final int cacheSize, final boolean waitForCompletion) throws TmfTraceException {
-        super(resource, TmfEvent.class, path, cacheSize);
+        super(resource, ITmfEvent.class, path, cacheSize);
         try {
             fTrace = new RandomAccessFile(path, "r");
         } catch (FileNotFoundException e) {
@@ -159,7 +158,7 @@ public class TmfTraceStub extends TmfTrace implements ITmfEventParser {
      */
     public TmfTraceStub(final String path, final int cacheSize, final boolean waitForCompletion,
             final ITmfEventParser parser, final ITmfTraceIndexer indexer) throws TmfTraceException {
-        super(null, TmfEvent.class, path, cacheSize, 0, indexer);
+        super(null, ITmfEvent.class, path, cacheSize, 0, indexer);
         try {
             fTrace = new RandomAccessFile(path, "r");
         } catch (FileNotFoundException e) {
index d4fb301f6d046fa512f0107efb098ff91c183638..45a42926b3e54384c6af4b926f9d61a4461e5b48 100644 (file)
@@ -18,6 +18,7 @@ import junit.framework.TestCase;
 
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ViewerComparator;
+import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEventField;
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfEventField;
@@ -68,9 +69,9 @@ public class TmfBaseColumnDataProviderTest extends TestCase {
 
     private final String fReference = "Some reference";
 
-    private final TmfEvent fEvent1;
-    private final TmfEvent fEvent2;
-    private final TmfEvent fEvent3;
+    private final ITmfEvent fEvent1;
+    private final ITmfEvent fEvent2;
+    private final ITmfEvent fEvent3;
 
     private final TmfEventField fContent1;
     private final TmfEventField fContent2;
index 0a570fe63800f329d0a48660eab9333176dc0280..18ed5bd5967be0d748fecaa90ea7a12f38cb176e 100755 (executable)
@@ -20,6 +20,7 @@ import java.util.Vector;
 
 import junit.framework.TestCase;
 
+import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEventField;
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfEventField;
@@ -61,9 +62,9 @@ public class TmfBaseStatisticsDataTest extends TestCase {
 
     private final String fReference = "Some reference";
 
-    private final TmfEvent fEvent1;
-    private final TmfEvent fEvent2;
-    private final TmfEvent fEvent3;
+    private final ITmfEvent fEvent1;
+    private final ITmfEvent fEvent2;
+    private final ITmfEvent fEvent3;
 
     private final TmfEventField fContent1;
     private final TmfEventField fContent2;
index 0fb60773c7835767af3cc7466d9e175779c298b1..53e7717d9a6f68aade19deb32e0daef144cbf337 100755 (executable)
@@ -17,6 +17,7 @@ import java.util.Arrays;
 
 import junit.framework.TestCase;
 
+import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEventField;
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfEventField;
@@ -57,8 +58,8 @@ public class TmfTreeContentProviderTest extends TestCase {
 
     private final String fReference = "Some reference";
 
-    private final TmfEvent fEvent1;
-    private final TmfEvent fEvent2;
+    private final ITmfEvent fEvent1;
+    private final ITmfEvent fEvent2;
 
     private final TmfEventField fContent1;
     private final TmfEventField fContent2;
index 85399f659ee73bf36c4e156bf913e15e9ceec38c..60572e6d9f000bc8cec48a3cf9a20b652bcc575e 100644 (file)
@@ -21,7 +21,7 @@ import java.util.List;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
+import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException;
 import org.eclipse.linuxtools.tmf.core.signal.TmfTraceClosedSignal;
 import org.eclipse.linuxtools.tmf.core.signal.TmfTraceSelectedSignal;
@@ -294,7 +294,7 @@ public class Uml2SDTestFacility {
 
         final ITmfTrace traces[] = new ITmfTrace[1];
         traces[0] = fTrace;
-        fExperiment = new TmfExperiment(TmfEvent.class, "TestExperiment", traces); //$NON-NLS-1$
+        fExperiment = new TmfExperiment(ITmfEvent.class, "TestExperiment", traces); //$NON-NLS-1$
         fTrace.broadcast(new TmfTraceSelectedSignal(this, fExperiment));
         if (wait) {
             while (fExperiment.getNbEvents() == 0) {
index 77fab28140e9cb6d15d6e077c37d04e5ea778197..135b010ce106130ce0d202963bc206a05c151b7d 100644 (file)
@@ -15,6 +15,7 @@ import java.io.EOFException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 
+import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEventField;
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfEventField;
@@ -56,7 +57,7 @@ public class TmfUml2SDTestTrace implements ITmfEventParser {
 
     @Override
     @SuppressWarnings({ "nls" })
-    public TmfEvent parseEvent(ITmfContext context) {
+    public ITmfEvent parseEvent(ITmfContext context) {
         if (! (fEventStream instanceof TmfTraceStub)) {
             return null;
         }
@@ -100,7 +101,7 @@ public class TmfUml2SDTestTrace implements ITmfEventParser {
             fields[2] = new TmfEventField("signal", signal);
 
             ITmfEventField tmfContent = new TmfEventField(ITmfEventField.ROOT_FIELD_ID, content, fields);
-            TmfEvent tmfEvent = new TmfEvent(fEventStream, new TmfTimestamp(ts, -9), source, tmfEventType, tmfContent, reference);
+            ITmfEvent tmfEvent = new TmfEvent(fEventStream, new TmfTimestamp(ts, -9), source, tmfEventType, tmfContent, reference);
 
             return tmfEvent;
         } catch (final EOFException e) {
This page took 0.064423 seconds and 5 git commands to generate.