X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=org.eclipse.linuxtools.tmf.core.tests%2Fsrc%2Forg%2Feclipse%2Flinuxtools%2Ftmf%2Fcore%2Ftests%2Fctfadaptor%2FFunkyTraceTest.java;h=84ae3dd1b304d84c6a18a5b27402bdc4fb1a072c;hb=33803b9b600e79f9973ab1d49f1221f7447af371;hp=58c4bcd95a4d44a01a9cc6ef5e9eafec134be05c;hpb=089a48722c47e87b9af7659823890fac05efbc33;p=deliverable%2Ftracecompass.git

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/FunkyTraceTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/FunkyTraceTest.java
index 58c4bcd95a..84ae3dd1b3 100644
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/FunkyTraceTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/FunkyTraceTest.java
@@ -85,7 +85,7 @@ public class FunkyTraceTest {
     @Test
     public void testFirstEvent() {
         CtfTmfEvent event = getEvent(0);
-        assertEquals("Simple Event", event.getEventName());
+        assertEquals("Simple Event", event.getType().getName());
         assertEquals(1234567, event.getTimestamp().getValue());
         assertEquals(42, ((Long) event.getContent().getField("integer_field").getValue()).intValue());
         assertEquals(3.1415, ((Double) event.getContent().getField("float_field").getValue()).doubleValue(), DELTA);
@@ -97,7 +97,7 @@ public class FunkyTraceTest {
     @Test
     public void testSecondEvent() {
         CtfTmfEvent event = getEvent(1);
-        assertEquals("Spammy_Event", event.getEventName());
+        assertEquals("Spammy_Event", event.getType().getName());
         assertEquals(1234568, event.getTimestamp().getValue());
         assertEquals(0, ((Long) event.getContent().getField("field_1").getValue()).intValue());
         assertEquals("This is a test", event.getContent().getField("a_string").getValue());
@@ -109,7 +109,7 @@ public class FunkyTraceTest {
     @Test
     public void testSecondToLastEvent() {
         CtfTmfEvent event = getEvent(100000);
-        assertEquals("Spammy_Event", event.getEventName());
+        assertEquals("Spammy_Event", event.getType().getName());
         assertEquals(1334567, event.getTimestamp().getValue());
         assertEquals(99999, ((Long) event.getContent().getField("field_1").getValue()).intValue());
         assertEquals("This is a test", event.getContent().getField("a_string").getValue());
@@ -138,7 +138,7 @@ public class FunkyTraceTest {
          */
 
         CtfTmfEvent event = getEvent(100001);
-        assertEquals("Complex Test Event", event.getEventName());
+        assertEquals("Complex Test Event", event.getType().getName());
         assertEquals(1334568, event.getTimestamp().getValue());
         assertEquals(0xddf00d, ((Long) event.getContent().getField("uint_35").getValue()).intValue());
         assertEquals(-12345, ((Long) event.getContent().getField("int_16").getValue()).intValue());