Merge master in TmfTraceModel

[deliverable/tracecompass.git] / org.eclipse.linuxtools.ctf.core.tests / src / org / eclipse / linuxtools / ctf / core / tests / trace / StreamInputPacketIndexEntryTest.java

diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputPacketIndexEntryTest.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputPacketIndexEntryTest.java
index c661d262b902e78f3b5742b8136e6c229ea9dea8..52493974c11f37e6983afb1fd099f3c129925860 100644 (file)
--- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputPacketIndexEntryTest.java
+++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/trace/StreamInputPacketIndexEntryTest.java
@@ -3,7 +3,7 @@ package org.eclipse.linuxtools.ctf.core.tests.trace;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import org.eclipse.linuxtools.ctf.core.trace.StreamInputPacketIndexEntry;
+import org.eclipse.linuxtools.internal.ctf.core.trace.StreamInputPacketIndexEntry;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -11,7 +11,7 @@ import org.junit.Test;
 /**
  * The class <code>StreamInputPacketIndexEntryTest</code> contains tests for the
  * class <code>{@link StreamInputPacketIndexEntry}</code>.
- * 
+ *
  * @author ematkho
  * @version $Revision: 1.0 $
  */
@@ -21,7 +21,7 @@ public class StreamInputPacketIndexEntryTest {
 
     /**
      * Launch the test.
-     * 
+     *
      * @param args
      *            the command line arguments
      */
@@ -50,9 +50,9 @@ public class StreamInputPacketIndexEntryTest {
      */
     @Test
     public void testStreamInputPacketIndexEntry_1() {
-        String expectedResult = "PacketIndexEntry [offset=1, " + //$NON-NLS-1$
+        String expectedResult = "StreamInputPacketIndexEntry [offsetBytes=1, " + //$NON-NLS-1$
                 "timestampBegin=0, timestampEnd=0, " + //$NON-NLS-1$
-                "dataOffset=0, packetSize=0, contentSize=0]"; //$NON-NLS-1$
+                "indexBegin=9223372036854775807, indexEnd=9223372036854775807]"; //$NON-NLS-1$
 
         assertNotNull(fixture);
         assertEquals(expectedResult, fixture.toString());
@@ -63,15 +63,15 @@ public class StreamInputPacketIndexEntryTest {
      */
     @Test
     public void testToString() {
-        String expectedResult = "PacketIndexEntry [offset=1, " + //$NON-NLS-1$
-                "timestampBegin=1, timestampEnd=1, " + //$NON-NLS-1$
-                "dataOffset=1, packetSize=1, contentSize=1]"; //$NON-NLS-1$
+        String expectedResult = "StreamInputPacketIndexEntry [offsetBytes=1,"+ //$NON-NLS-1$
+                " timestampBegin=1, timestampEnd=1, indexBegin=9223372036854775807,"+ //$NON-NLS-1$
+                " indexEnd=9223372036854775807]"; //$NON-NLS-1$
 
-        fixture.contentSizeBits = 1;
-        fixture.dataOffsetBits = 1;
-        fixture.timestampEnd = 1L;
-        fixture.packetSizeBits = 1;
-        fixture.timestampBegin = 1L;
+        fixture.setContentSizeBits(1);
+        fixture.setDataOffsetBits(1);
+        fixture.setTimestampEnd(1L);
+        fixture.setPacketSizeBits(1);
+        fixture.setTimestampBegin(1L);
 
         assertEquals(expectedResult, fixture.toString());
     }