Merge branch 'master' into lttng-luna

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.core.tests / src / org / eclipse / linuxtools / tmf / core / tests / ctfadaptor / CtfIteratorTest.java

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 b583c6cced127f83993fc71966fd124960ab8388..50b6223a89348ee8e77f62c1eed7982887388343 100644 (file)
--- 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
@@ -24,7 +24,7 @@ import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfLocation;
 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.tests.shared.CtfTmfTestTraces;
+import org.eclipse.linuxtools.tmf.core.tests.shared.CtfTmfTestTrace;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -38,20 +38,22 @@ import org.junit.Test;
  */
 public class CtfIteratorTest {
 
-    private static final int TRACE_INDEX = 0;
+    private static final CtfTmfTestTrace testTrace = CtfTmfTestTrace.KERNEL;
 
-    private CtfIterator fixture;
+    private CtfTmfTrace trace;
+    private CtfIterator iterator;
 
     /**
      * Perform pre-test initialization.
      */
     @Before
     public void setUp() {
-        assumeTrue(CtfTmfTestTraces.tracesExist());
-        fixture = new CtfIterator(getTrace());
+        assumeTrue(testTrace.exists());
+        trace = testTrace.getTrace();
+        iterator = new CtfIterator(trace);
         CtfLocation ctfLocation = new CtfLocation(new CtfLocationInfo(1, 0));
-        fixture.setLocation(ctfLocation);
-        fixture.increaseRank();
+        iterator.setLocation(ctfLocation);
+        iterator.increaseRank();
     }
 
     /**
@@ -59,21 +61,16 @@ public class CtfIteratorTest {
      */
     @After
     public void tearDown() {
-        if (fixture != null) {
-            fixture.dispose();
+        if (iterator != null) {
+            iterator.dispose();
         }
     }
 
-    private static CtfTmfTrace getTrace() {
-        return CtfTmfTestTraces.getTestTrace(TRACE_INDEX);
-    }
-
     /**
      * Run the CtfIterator(CtfTmfTrace) constructor on a non init'ed trace.
      */
     @Test
     public void testCtfIterator_noinit() {
-        CtfTmfTrace trace = getTrace();
         CtfIterator result = new CtfIterator(trace);
         assertNotNull(result);
     }
@@ -83,8 +80,7 @@ public class CtfIteratorTest {
      */
     @Test
     public void testCtfIterator_init() {
-        CtfTmfTrace trace = getTrace();
-        trace.init("test"); //$NON-NLS-1$
+        trace.init("test");
         CtfIterator result = new CtfIterator(trace);
 
         assertNotNull(result);
@@ -96,7 +92,6 @@ public class CtfIteratorTest {
      */
     @Test
     public void testCtfIterator_position() {
-        CtfTmfTrace trace = getTrace();
         long timestampValue = 1L;
         long rank = 1L;
         CtfIterator result = new CtfIterator(trace, new CtfLocationInfo(timestampValue, 0), rank);
@@ -110,7 +105,7 @@ public class CtfIteratorTest {
      */
     @Test
     public void testAdvance() {
-        boolean result = fixture.advance();
+        boolean result = iterator.advance();
         assertTrue(result);
     }
 
@@ -119,7 +114,7 @@ public class CtfIteratorTest {
      */
     @Test
     public void testClone() {
-        CtfIterator result = fixture.clone();
+        CtfIterator result = iterator.clone();
         assertNotNull(result);
     }
 
@@ -128,8 +123,8 @@ public class CtfIteratorTest {
      */
     @Test
     public void testCompareTo() {
-        CtfIterator o = new CtfIterator(getTrace());
-        int result = fixture.compareTo(o);
+        CtfIterator o = new CtfIterator(trace);
+        int result = iterator.compareTo(o);
 
         assertEquals(1L, result);
     }
@@ -140,12 +135,12 @@ public class CtfIteratorTest {
      */
     @Test
     public void testEquals_other() {
-        CtfIterator obj = new CtfIterator(getTrace());
+        CtfIterator obj = new CtfIterator(trace);
         CtfLocation ctfLocation1 = new CtfLocation(new CtfLocationInfo(1, 0));
         obj.setLocation(ctfLocation1);
         obj.increaseRank();
 
-        boolean result = fixture.equals(obj);
+        boolean result = iterator.equals(obj);
         assertTrue(result);
     }
 
@@ -155,7 +150,7 @@ public class CtfIteratorTest {
     @Test
     public void testEquals_empty() {
         Object obj = new Object();
-        boolean result = fixture.equals(obj);
+        boolean result = iterator.equals(obj);
 
         assertFalse(result);
     }
@@ -165,7 +160,7 @@ public class CtfIteratorTest {
      */
     @Test
     public void testGetCtfTmfTrace() {
-        CtfTmfTrace result = fixture.getCtfTmfTrace();
+        CtfTmfTrace result = iterator.getCtfTmfTrace();
         assertNotNull(result);
     }
 
@@ -174,7 +169,7 @@ public class CtfIteratorTest {
      */
     @Test
     public void testGetCurrentEvent() {
-        CtfTmfEvent result = fixture.getCurrentEvent();
+        CtfTmfEvent result = iterator.getCurrentEvent();
         assertNotNull(result);
     }
 
@@ -183,7 +178,7 @@ public class CtfIteratorTest {
      */
     @Test
     public void testGetLocation() {
-        CtfLocation result = fixture.getLocation();
+        CtfLocation result = iterator.getLocation();
         assertNotNull(result);
     }
 
@@ -192,7 +187,7 @@ public class CtfIteratorTest {
      */
     @Test
     public void testGetRank() {
-        long result = fixture.getRank();
+        long result = iterator.getRank();
         assertEquals(1L, result);
     }
 
@@ -201,7 +196,7 @@ public class CtfIteratorTest {
      */
     @Test
     public void testHasValidRank() {
-        boolean result = fixture.hasValidRank();
+        boolean result = iterator.hasValidRank();
         assertTrue(result);
     }
 
@@ -210,8 +205,8 @@ public class CtfIteratorTest {
      */
     @Test
     public void testHashCode() {
-        int result = fixture.hashCode();
-        int result2 = fixture.hashCode();
+        int result = iterator.hashCode();
+        int result2 = iterator.hashCode();
         assertEquals(result, result2);
     }
 
@@ -220,7 +215,7 @@ public class CtfIteratorTest {
      */
     @Test
     public void testIncreaseRank() {
-        fixture.increaseRank();
+        iterator.increaseRank();
     }
 
     /**
@@ -229,7 +224,7 @@ public class CtfIteratorTest {
     @Test
     public void testSeek() {
         long timestamp = 1L;
-        boolean result = fixture.seek(timestamp);
+        boolean result = iterator.seek(timestamp);
         assertTrue(result);
     }
 
@@ -239,6 +234,6 @@ public class CtfIteratorTest {
     @Test
     public void testSetLocation() {
         CtfLocation location = new CtfLocation(new CtfLocationInfo(1, 0));
-        fixture.setLocation(location);
+        iterator.setLocation(location);
     }
 }