X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=org.eclipse.linuxtools.tmf.core.tests%2Fsrc%2Forg%2Feclipse%2Flinuxtools%2Ftmf%2Fcore%2Ftests%2Fctfadaptor%2FCtfIteratorTest.java;h=0c621c7248861182b720ca2cbdbcae047763b3a3;hb=5dd1fa65a4f173d4b91e7e4a4a3e52428382b8a5;hp=96d4cb93a2dcf806038ba1ea3e0a5a102872f36c;hpb=1b155f6d9c05be39bb1658f2af0d00da177006ca;p=deliverable%2Ftracecompass.git

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfIteratorTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfIteratorTest.java
index 96d4cb93a2..0c621c7248 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfIteratorTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfIteratorTest.java
@@ -17,13 +17,14 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
 
 import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfIterator;
 import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfLocation;
-import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfLocationData;
+import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfLocationInfo;
 import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfEvent;
 import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfTmfTrace;
-import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException;
+import org.eclipse.linuxtools.tmf.core.tests.shared.CtfTmfTestTraces;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -37,29 +38,18 @@ import org.junit.Test;
  */
 public class CtfIteratorTest {
 
-    private CtfIterator fixture;
+    private static final int TRACE_INDEX = 0;
 
-    /**
-     * Launch the test.
-     *
-     * @param args
-     *            the command line arguments
-     */
-    public static void main(String[] args) {
-        new org.junit.runner.JUnitCore().run(CtfIteratorTest.class);
-    }
+    private CtfIterator fixture;
 
     /**
      * Perform pre-test initialization.
-     *
-     * @throws TmfTraceException
-     *             If the test trace is not found
      */
     @Before
-    public void setUp() throws TmfTraceException {
-        fixture = new CtfIterator(createTrace());
-        CtfLocation ctfLocation = new CtfLocation(new CtfLocationData(1, 0));
-        ctfLocation.setLocation(new CtfLocationData(1, 0));
+    public void setUp() {
+        assumeTrue(CtfTmfTestTraces.tracesExist());
+        fixture = new CtfIterator(getTrace());
+        CtfLocation ctfLocation = new CtfLocation(new CtfLocationInfo(1, 0));
         fixture.setLocation(ctfLocation);
         fixture.increaseRank();
     }
@@ -69,36 +59,31 @@ public class CtfIteratorTest {
      */
     @After
     public void tearDown() {
-        fixture.dispose();
+        if (fixture != null) {
+            fixture.dispose();
+        }
     }
 
-
-    private static CtfTmfTrace createTrace() throws TmfTraceException {
-        return TestParams.createTrace();
+    private static CtfTmfTrace getTrace() {
+        return CtfTmfTestTraces.getTestTrace(TRACE_INDEX);
     }
 
     /**
      * Run the CtfIterator(CtfTmfTrace) constructor on a non init'ed trace.
-     *
-     * @throws TmfTraceException
-     *             If the test trace is not found
      */
     @Test
-    public void testCtfIterator_noinit() throws TmfTraceException {
-        CtfTmfTrace trace = createTrace();
+    public void testCtfIterator_noinit() {
+        CtfTmfTrace trace = getTrace();
         CtfIterator result = new CtfIterator(trace);
         assertNotNull(result);
     }
 
     /**
      * Run the CtfIterator(CtfTmfTrace) constructor on an init'ed trace.
-     *
-     * @throws TmfTraceException
-     *             If the test trace is not found
      */
     @Test
-    public void testCtfIterator_init() throws TmfTraceException {
-        CtfTmfTrace trace = createTrace();
+    public void testCtfIterator_init() {
+        CtfTmfTrace trace = getTrace();
         trace.init("test"); //$NON-NLS-1$
         CtfIterator result = new CtfIterator(trace);
 
@@ -108,16 +93,13 @@ public class CtfIteratorTest {
     /**
      * Run the CtfIterator(CtfTmfTrace,long,long) constructor test, which
      * specifies an initial position for the iterator.
-     *
-     * @throws TmfTraceException
-     *             If the test trace is not found
      */
     @Test
-    public void testCtfIterator_position() throws TmfTraceException {
-        CtfTmfTrace trace = createTrace();
+    public void testCtfIterator_position() {
+        CtfTmfTrace trace = getTrace();
         long timestampValue = 1L;
         long rank = 1L;
-        CtfIterator result = new CtfIterator(trace, new CtfLocationData(timestampValue, 0), rank);
+        CtfIterator result = new CtfIterator(trace, new CtfLocationInfo(timestampValue, 0), rank);
 
         assertNotNull(result);
     }
@@ -143,13 +125,10 @@ public class CtfIteratorTest {
 
     /**
      * Run the int compareTo(CtfIterator) method test.
-     *
-     * @throws TmfTraceException
-     *             If the test trace is not found
      */
     @Test
-    public void testCompareTo() throws TmfTraceException {
-        CtfIterator o = new CtfIterator(createTrace());
+    public void testCompareTo() {
+        CtfIterator o = new CtfIterator(getTrace());
         int result = fixture.compareTo(o);
 
         assertEquals(1L, result);
@@ -158,15 +137,11 @@ public class CtfIteratorTest {
     /**
      * Run the boolean equals(Object) method test. Compare with another iterator
      * on the same trace.
-     *
-     * @throws TmfTraceException
-     *             If the test trace is not found
      */
     @Test
-    public void testEquals_other() throws TmfTraceException {
-        CtfIterator obj = new CtfIterator(createTrace());
-        CtfLocation ctfLocation1 = new CtfLocation(new CtfLocationData(1, 0));
-        ctfLocation1.setLocation(new CtfLocationData(1, 0));
+    public void testEquals_other() {
+        CtfIterator obj = new CtfIterator(getTrace());
+        CtfLocation ctfLocation1 = new CtfLocation(new CtfLocationInfo(1, 0));
         obj.setLocation(ctfLocation1);
         obj.increaseRank();
 
@@ -263,8 +238,7 @@ public class CtfIteratorTest {
      */
     @Test
     public void testSetLocation() {
-        CtfLocation location = new CtfLocation(new CtfLocationData(1, 0));
-        location.setLocation(new CtfLocationData(1, 0));
+        CtfLocation location = new CtfLocation(new CtfLocationInfo(1, 0));
         fixture.setLocation(location);
     }
 }