Implement TmfTrace changes - introduce TmfTraceException

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng.core.tests / src / org / eclipse / linuxtools / lttng / core / tests / event / LttngEventContentTest.java

diff --git a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventContentTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventContentTest.java
index a11b8c433685eec097e0a77b72a101b826407246..529df0d212d799132ae790b81884d0837e1df949 100644 (file)
--- a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventContentTest.java
+++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventContentTest.java
@@ -86,7 +86,7 @@ public class LttngEventContentTest extends TestCase {
         try {
             testStream = null;
             final LTTngTextTrace tmpStream = initializeEventStream();
-            tmpEventContent = (LttngEventContent)tmpStream.readEvent( new TmfContext(new TmfLocation<Long>(0L), 0) ).getContent();
+            tmpEventContent = (LttngEventContent)tmpStream.readNextEvent( new TmfContext(new TmfLocation<Long>(0L), 0) ).getContent();
         }
         catch (final Exception e) {
             fail("ERROR : Failed to get content!");
@@ -148,7 +148,7 @@ public class LttngEventContentTest extends TestCase {
         // Require an event
         tmpStream = initializeEventStream();
         tmpContext = new TmfContext(new TmfLocation<Long>(0L), 0);
-        tmpEvent = (LttngEvent)tmpStream.readEvent(tmpContext);
+        tmpEvent = (LttngEvent)tmpStream.readNextEvent(tmpContext);
         testContent = prepareToTest();
         // getFieldS()
         assertNotSame("getFields() returned null!", null, testContent.getFields() );
@@ -177,10 +177,10 @@ public class LttngEventContentTest extends TestCase {
         // Skip first events and seek to event pass metadata
         tmpContext= tmpStream.seekEvent(new LttngTimestamp(timestampAfterMetadata) );
         // Skip first one
-        tmpEvent = (LttngEvent)tmpStream.readEvent(tmpContext);
+        tmpEvent = (LttngEvent)tmpStream.readNextEvent(tmpContext);
 
         // Second event past metadata should have more fields
-        tmpEvent = (LttngEvent)tmpStream.readEvent(tmpContext);
+        tmpEvent = (LttngEvent)tmpStream.readNextEvent(tmpContext);
         // Get the content
         testContent = tmpEvent.getContent();
 
@@ -211,7 +211,7 @@ public class LttngEventContentTest extends TestCase {
         // Require an event
         tmpStream = initializeEventStream();
         tmpContext = new TmfContext(new TmfLocation<Long>(0L), 0);
-        tmpEvent = (LttngEvent)tmpStream.readEvent(tmpContext);
+        tmpEvent = (LttngEvent)tmpStream.readNextEvent(tmpContext);
 
         final LttngEventContent tmpContent = prepareToTest();
         try {
@@ -240,7 +240,7 @@ public class LttngEventContentTest extends TestCase {
         // Require an event
         tmpStream = initializeEventStream();
         tmpContext = new TmfContext(new TmfLocation<Long>(0L), 0);
-        tmpEvent = (LttngEvent)tmpStream.readEvent(tmpContext);
+        tmpEvent = (LttngEvent)tmpStream.readNextEvent(tmpContext);
         // Get the content
         testContent = tmpEvent.getContent();
         // Get all the fields to make sure there is something in the HashMap