Refactor TmfEventType and TmfEventField

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.ui.tests / src / org / eclipse / linuxtools / tmf / ui / tests / statistics / TmfBaseColumnDataProviderTest.java

diff --git a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java
index c5dbbaa789af216395e4826dc05293091af71943..90819878e408a48cfc909a316f708db3e5099b1c 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java
+++ b/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java
@@ -20,8 +20,6 @@ import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.ViewerComparator;
 import org.eclipse.linuxtools.tmf.core.event.TmfEvent;
 import org.eclipse.linuxtools.tmf.core.event.TmfEventContent;
-import org.eclipse.linuxtools.tmf.core.event.TmfEventReference;
-import org.eclipse.linuxtools.tmf.core.event.TmfEventSource;
 import org.eclipse.linuxtools.tmf.core.event.TmfEventType;
 import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.util.TmfFixedArray;
@@ -45,6 +43,8 @@ public class TmfBaseColumnDataProviderTest extends TestCase {
 
     private String fTestName;
 
+    private final String fContext = "UnitTest";
+    
     private final String fTypeId1 = "Some type1";
     private final String fTypeId2 = "Some type2";
 
@@ -57,13 +57,13 @@ public class TmfBaseColumnDataProviderTest extends TestCase {
     private final TmfTimestamp fTimestamp2 = new TmfTimestamp(12350, (byte) 2, 5);
     private final TmfTimestamp fTimestamp3 = new TmfTimestamp(12355, (byte) 2, 5);
 
-    private final TmfEventSource fSource = new TmfEventSource("Source");
+    private final String       fSource = "Source";
 
-    private final TmfEventType fType1 = new TmfEventType(fTypeId1, fLabels);
-    private final TmfEventType fType2 = new TmfEventType(fTypeId1, fLabels);
-    private final TmfEventType fType3 = new TmfEventType(fTypeId2, fLabels);
+    private final TmfEventType fType1 = new TmfEventType(fContext, fTypeId1, fLabels);
+    private final TmfEventType fType2 = new TmfEventType(fContext, fTypeId1, fLabels);
+    private final TmfEventType fType3 = new TmfEventType(fContext, fTypeId2, fLabels);
 
-    private final TmfEventReference fReference = new TmfEventReference("Some reference");
+    private final String fReference = "Some reference";
 
     private final TmfEvent fEvent1;
     private final TmfEvent fEvent2;
@@ -90,11 +90,11 @@ public class TmfBaseColumnDataProviderTest extends TestCase {
         fContent1 = new TmfEventContent(fEvent1, "Some content");
         fEvent1.setContent(fContent1);
 
-        fEvent2 = new TmfEvent(fTimestamp1, fTimestamp2, fSource, fType2, fReference);
+        fEvent2 = new TmfEvent(fTimestamp2, fSource, fType2, fReference);
         fContent2 = new TmfEventContent(fEvent2, "Some other content");
         fEvent2.setContent(fContent2);
 
-        fEvent3 = new TmfEvent(fTimestamp2, fTimestamp3, fSource, fType3, fReference);
+        fEvent3 = new TmfEvent(fTimestamp3, fSource, fType3, fReference);
         fContent3 = new TmfEventContent(fEvent3, "Some other different content");
         fEvent3.setContent(fContent3);