Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/lttng/org.eclipse.linuxtools.tmf.ui.tests
diff options
context:
space:
mode:
authorFrancois Chouinard2012-03-02 16:45:40 +0000
committerFrancois Chouinard2012-03-02 16:45:40 +0000
commit9b9912c0894dde944a2d85f3ce47436a98e65b8e (patch)
tree7b4df78c79529197a36c97d5be125a74a97b10ca /lttng/org.eclipse.linuxtools.tmf.ui.tests
parent143a900411fb5fb63c0b166b626cfaf06915a36d (diff)
downloadorg.eclipse.linuxtools-9b9912c0894dde944a2d85f3ce47436a98e65b8e.tar.gz
org.eclipse.linuxtools-9b9912c0894dde944a2d85f3ce47436a98e65b8e.tar.xz
org.eclipse.linuxtools-9b9912c0894dde944a2d85f3ce47436a98e65b8e.zip
Fix for Bug373118
Diffstat (limited to 'lttng/org.eclipse.linuxtools.tmf.ui.tests')
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java9
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java9
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfStatisticsTreeNodeTest.java11
-rwxr-xr-xlttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java6
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java3
5 files changed, 13 insertions, 25 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java b/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java
index 6e31cf85a8..84f373965b 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseColumnDataProviderTest.java
@@ -87,17 +87,14 @@ public class TmfBaseColumnDataProviderTest extends TestCase {
fTestName = name;
- fEvent1 = new TmfEvent(fTimestamp1, fSource, fType1, fReference);
fContent1 = new TmfEventField(ITmfEventField.ROOT_ID, "Some content");
- fEvent1.setContent(fContent1);
+ fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType1, fContent1, fReference);
- fEvent2 = new TmfEvent(fTimestamp2, fSource, fType2, fReference);
fContent2 = new TmfEventField(ITmfEventField.ROOT_ID, "Some other content");
- fEvent2.setContent(fContent2);
+ fEvent2 = new TmfEvent(null, fTimestamp2, fSource, fType2, fContent2, fReference);
- fEvent3 = new TmfEvent(fTimestamp3, fSource, fType3, fReference);
fContent3 = new TmfEventField(ITmfEventField.ROOT_ID, "Some other different content");
- fEvent3.setContent(fContent3);
+ fEvent3 = new TmfEvent(null, fTimestamp3, fSource, fType3, fContent3, fReference);
fStatsData = new TmfBaseStatisticsTree();
fExtraInfo = new ITmfExtraEventInfo() {
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java b/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java
index f3be43e0d1..4f7dcec53d 100755
--- a/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfBaseStatisticsDataTest.java
@@ -84,17 +84,14 @@ public class TmfBaseStatisticsDataTest extends TestCase {
fTestName = name;
- fEvent1 = new TmfEvent(fTimestamp1, fSource, fType1, fReference);
fContent1 = new TmfEventField(ITmfEventField.ROOT_ID, "Some content");
- fEvent1.setContent(fContent1);
+ fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType1, fContent1, fReference);
- fEvent2 = new TmfEvent(fTimestamp2, fSource, fType2, fReference);
fContent2 = new TmfEventField(ITmfEventField.ROOT_ID, "Some other content");
- fEvent2.setContent(fContent2);
+ fEvent2 = new TmfEvent(null, fTimestamp2, fSource, fType2, fContent2, fReference);
- fEvent3 = new TmfEvent(fTimestamp3, fSource, fType3, fReference);
fContent3 = new TmfEventField(ITmfEventField.ROOT_ID, "Some other different content");
- fEvent3.setContent(fContent3);
+ fEvent3 = new TmfEvent(null, fTimestamp3, fSource, fType3, fContent3, fReference);
fStatsData = new TmfBaseStatisticsTree();
fExtraInfo = new ITmfExtraEventInfo() {
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfStatisticsTreeNodeTest.java b/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfStatisticsTreeNodeTest.java
index 88acdba338..3793d5136a 100755
--- a/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfStatisticsTreeNodeTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfStatisticsTreeNodeTest.java
@@ -85,18 +85,15 @@ public class TmfStatisticsTreeNodeTest extends TestCase {
fTestName = name;
- fEvent1 = new TmfEvent(fTimestamp1, fSource, fType1, fReference);
fContent1 = new TmfEventField(ITmfEventField.ROOT_ID, "Some content");
- fEvent1.setContent(fContent1);
+ fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType1, fContent1, fReference);
- fEvent2 = new TmfEvent(fTimestamp2, fSource, fType2, fReference);
fContent2 = new TmfEventField(ITmfEventField.ROOT_ID, "Some other content");
- fEvent2.setContent(fContent2);
+ fEvent2 = new TmfEvent(null, fTimestamp2, fSource, fType2, fContent2, fReference);
- fEvent3 = new TmfEvent(fTimestamp3, fSource, fType3, fReference);
fContent3 = new TmfEventField(ITmfEventField.ROOT_ID, "Some other different content");
- fEvent3.setContent(fContent3);
-
+ fEvent3 = new TmfEvent(null, fTimestamp3, fSource, fType3, fContent3, fReference);
+
fStatsData = new TmfBaseStatisticsTree();
fExtraInfo = new ITmfExtraEventInfo() {
@Override
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java b/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java
index db218effc6..f50fb8ed4d 100755
--- a/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui.tests/src/org/eclipse/linuxtools/tmf/ui/tests/statistics/TmfTreeContentProviderTest.java
@@ -84,13 +84,11 @@ public class TmfTreeContentProviderTest extends TestCase {
fTestName = name;
- fEvent1 = new TmfEvent(fTimestamp1, fSource, fType1, fReference);
fContent1 = new TmfEventField(ITmfEventField.ROOT_ID, "Some content");
- fEvent1.setContent(fContent1);
+ fEvent1 = new TmfEvent(null, fTimestamp1, fSource, fType1, fContent1, fReference);
- fEvent2 = new TmfEvent(fTimestamp2, fSource, fType2, fReference);
fContent2 = new TmfEventField(ITmfEventField.ROOT_ID, "Some other content");
- fEvent2.setContent(fContent2);
+ fEvent2 = new TmfEvent(null, fTimestamp2, fSource, fType2, fContent2, fReference);
fStatsData = new TmfBaseStatisticsTree();
fExtraInfo = new ITmfExtraEventInfo() {
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java b/lttng/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java
index 15ae4737f5..db31e1b9da 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui.tests/widgetStubs/org/eclipse/linuxtools/tmf/ui/tests/uml2sd/trace/TmfUml2SDTestTrace.java
@@ -58,7 +58,6 @@ public class TmfUml2SDTestTrace implements ITmfEventParser<TmfEvent> {
String[] labels = {"sender", "receiver", "signal"};
TmfEventType tmfEventType = new TmfEventType("UnitTest", type, TmfEventField.makeRoot(labels));
- TmfEvent tmfEvent = new TmfEvent(new TmfTimestamp(ts, -9), source, tmfEventType, reference);
String content = "[";
content += sender;
@@ -73,7 +72,7 @@ public class TmfUml2SDTestTrace implements ITmfEventParser<TmfEvent> {
fields[2] = new TmfEventField("signal", signal);
ITmfEventField tmfContent = new TmfEventField(ITmfEventField.ROOT_ID, content, fields);
- tmfEvent.setContent(tmfContent);
+ TmfEvent tmfEvent = new TmfEvent(eventStream, new TmfTimestamp(ts, -9), source, tmfEventType, tmfContent, reference);
return tmfEvent;
} catch (EOFException e) {

Back to the top