X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=org.eclipse.linuxtools.tmf.core.tests%2Fsrc%2Forg%2Feclipse%2Flinuxtools%2Ftmf%2Fcore%2Ftests%2Fctfadaptor%2FCtfTmfTraceTest.java;h=2b90e67895ef5a25d7f1292ed856906be456b112;hb=bfe038ff8f9d89aca42082b6973c7a91a420b743;hp=423b7bbc377b2d622186fbc3d96f83d47308fb6a;hpb=4b7c469f8f9fb50de9a2e87f3cc00f6a0465692f;p=deliverable%2Ftracecompass.git

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfTraceTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfTraceTest.java
index 423b7bbc37..2b90e67895 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfTraceTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfTmfTraceTest.java
@@ -7,17 +7,14 @@ import static org.junit.Assert.assertTrue;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
-import org.eclipse.linuxtools.internal.tmf.core.request.TmfCoalescedEventRequest;
 import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfLocation;
 import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfEvent;
 import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTrace;
-import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException;
-import org.eclipse.linuxtools.tmf.core.request.ITmfDataRequest;
 import org.eclipse.linuxtools.tmf.core.signal.TmfEndSynchSignal;
 import org.eclipse.linuxtools.tmf.core.signal.TmfSignal;
 import org.eclipse.linuxtools.tmf.core.statesystem.IStateSystemQuerier;
@@ -53,7 +50,7 @@ public class CtfTmfTraceTest {
         // add additional test code here
         assertNotNull(result);
         assertEquals(null, result.getEventType());
-        assertEquals(50000, result.getCacheSize());
+        assertEquals(1000, result.getCacheSize());
         assertEquals(0L, result.getNbEvents());
         assertEquals(0L, result.getStreamingInterval());
         assertEquals(null, result.getStateSystem());
@@ -62,30 +59,6 @@ public class CtfTmfTraceTest {
         assertEquals(null, result.getType());
     }
 
-    /**
-     * Run the ITmfContext armRequest(ITmfDataRequest<CtfTmfEvent>) method test.
-     *
-     * @throws Exception
-     *
-     * @generatedBy CodePro at 03/05/12 2:29 PM
-     */
-    @Test
-    public void testArmRequest_1()
-        throws Exception {
-        CtfTmfTrace fixture = initTrace();
-        @SuppressWarnings({ "rawtypes", "unchecked" })
-        ITmfDataRequest<CtfTmfEvent> request = new TmfCoalescedEventRequest(ITmfEvent.class);
-
-        ITmfContext result = fixture.armRequest(request);
-
-        // add additional test code here
-        // An unexpected exception was thrown in user code while executing this test:
-        //    org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException: Path must be a valid directory
-        //       at org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTrace.initTrace(CtfTmfTrace.java:98)
-        assertNotNull(result);
-    }
-
-
     /**
      * @return
      * @throws TmfTraceException
@@ -95,77 +68,6 @@ public class CtfTmfTraceTest {
         fixture.initTrace((IResource) null, PATH, CtfTmfEvent.class);
         return fixture;
     }
-
-    /**
-     * Run the ITmfContext armRequest(ITmfDataRequest<CtfTmfEvent>) method test.
-     *
-     * @throws Exception
-     *
-     * @generatedBy CodePro at 03/05/12 2:29 PM
-     */
-    @Test
-    public void testArmRequest_2()
-        throws Exception {
-        CtfTmfTrace fixture = initTrace();
-        @SuppressWarnings({ "rawtypes", "unchecked" })
-        ITmfDataRequest<CtfTmfEvent> request = new TmfCoalescedEventRequest(ITmfEvent.class);
-
-        ITmfContext result = fixture.armRequest(request);
-
-        // add additional test code here
-        // An unexpected exception was thrown in user code while executing this test:
-        //    org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException: Path must be a valid directory
-        //       at org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTrace.initTrace(CtfTmfTrace.java:98)
-        assertNotNull(result);
-    }
-
-    /**
-     * Run the ITmfContext armRequest(ITmfDataRequest<CtfTmfEvent>) method test.
-     *
-     * @throws Exception
-     *
-     * @generatedBy CodePro at 03/05/12 2:29 PM
-     */
-    @Test
-    public void testArmRequest_3()
-        throws Exception {
-        CtfTmfTrace fixture = initTrace();
-        @SuppressWarnings({ "rawtypes", "unchecked" })
-        ITmfDataRequest<CtfTmfEvent> request = new TmfCoalescedEventRequest(ITmfEvent.class);
-
-        ITmfContext result = fixture.armRequest(request);
-
-        // add additional test code here
-        // An unexpected exception was thrown in user code while executing this test:
-        //    org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException: Path must be a valid directory
-        //       at org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTrace.initTrace(CtfTmfTrace.java:98)
-        assertNotNull(result);
-    }
-
-    /**
-     * Run the ITmfContext armRequest(ITmfDataRequest<CtfTmfEvent>) method test.
-     *
-     * @throws Exception
-     *
-     * @generatedBy CodePro at 03/05/12 2:29 PM
-     */
-    @Test
-    public void testArmRequest_4()
-        throws Exception {
-        CtfTmfTrace fixture = initTrace();
-        @SuppressWarnings({ "rawtypes", "unchecked" })
-        ITmfDataRequest<CtfTmfEvent> request = new TmfCoalescedEventRequest(ITmfEvent.class);
-
-        ITmfContext result = fixture.armRequest(request);
-
-        // add additional test code here
-        // An unexpected exception was thrown in user code while executing this test:
-        //    org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException: Path must be a valid directory
-        //       at org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTrace.initTrace(CtfTmfTrace.java:98)
-        assertNotNull(result);
-    }
-
-
     /**
      * Run the void broadcast(TmfSignal) method test.
      *
@@ -222,7 +124,7 @@ public class CtfTmfTraceTest {
         // An unexpected exception was thrown in user code while executing this test:
         //    org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException: Path must be a valid directory
         //       at org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTrace.initTrace(CtfTmfTrace.java:98)
-        assertEquals(50000, result);
+        assertEquals(1000, result);
     }
 
     /**
@@ -339,7 +241,7 @@ public class CtfTmfTraceTest {
         // An unexpected exception was thrown in user code while executing this test:
         //    org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException: Path must be a valid directory
         //       at org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTrace.initTrace(CtfTmfTrace.java:98)
-        assertNull(result);
+        assertNotNull(result);
     }
 
     /**