Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Chouinard2012-03-03 16:49:16 +0000
committerFrancois Chouinard2012-03-03 16:49:16 +0000
commit3b6089dd370d017643257027f70484bfb5d736bd (patch)
tree7e18cb577ab62a77699976886c0d05c128114bff
parentc8363e15af5d2c3321c727a2cb9dbbda486c1256 (diff)
downloadorg.eclipse.linuxtools-3b6089dd370d017643257027f70484bfb5d736bd.tar.gz
org.eclipse.linuxtools-3b6089dd370d017643257027f70484bfb5d736bd.tar.xz
org.eclipse.linuxtools-3b6089dd370d017643257027f70484bfb5d736bd.zip
Improve unit tests
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java24
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java22
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java18
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfSimpleTimestampTest.java14
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java3
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java10
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java8
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java37
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java2
-rw-r--r--lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlEvent.java2
10 files changed, 117 insertions, 23 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java
index 310c84449a..713fb3713d 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java
@@ -223,18 +223,32 @@ public class TmfEventFieldTest extends TestCase {
// clone
// ------------------------------------------------------------------------
- public void testClone() throws Exception {
- ITmfEventField clone = fStructTerminalField1.clone();
- assertEquals("clone", fStructTerminalField1, clone);
-
- clone = fField1.clone();
+ public void testFieldClone() throws Exception {
+ TmfEventField clone = fField1.clone();
+ assertTrue("clone", fField1.clone().equals(fField1));
+ assertTrue("clone", clone.clone().equals(clone));
assertEquals("clone", fField1, clone);
+ assertEquals("clone", clone, fField1);
clone = fRootField.clone();
+ assertTrue("clone", fRootField.clone().equals(fRootField));
+ assertTrue("clone", clone.clone().equals(clone));
assertEquals("clone", fRootField, clone);
+ assertEquals("clone", clone, fRootField);
+ }
+
+ public void testStructFieldClone() throws Exception {
+ TmfEventField clone = fStructTerminalField1.clone();
+ assertTrue("clone", fStructTerminalField1.clone().equals(fStructTerminalField1));
+ assertTrue("clone", clone.clone().equals(clone));
+ assertEquals("clone", fStructTerminalField1, clone);
+ assertEquals("clone", clone, fStructTerminalField1);
clone = fStructRootField.clone();
+ assertTrue("clone", fStructRootField.clone().equals(fStructRootField));
+ assertTrue("clone", clone.clone().equals(clone));
assertEquals("clone", fStructRootField, clone);
+ assertEquals("clone", clone, fStructRootField);
}
// ------------------------------------------------------------------------
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java
index a563c1839b..a1dd5a3df5 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTest.java
@@ -64,7 +64,7 @@ public class TmfEventTest extends TestCase {
private final ITmfEventField fContent1 = new TmfEventField(fRawContent1, fFields1);
private final TmfTimestamp fTimestamp1 = new TmfTimestamp(12345, 2, 5);
private final String fReference1 = "Some reference";
- private final TmfEvent fEvent1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
+ private final ITmfEvent fEvent1 = new TmfEvent(null, 0, fTimestamp1, fSource, fType, fContent1, fReference1);
private final Object fValue2a = "Another string";
private final Object fValue2b = Integer.valueOf(-4);
@@ -75,7 +75,7 @@ public class TmfEventTest extends TestCase {
private final ITmfEventField fContent2 = new TmfEventField(fRawContent2, fFields2);
private final TmfTimestamp fTimestamp2 = new TmfTimestamp(12350, 2, 5);
private final String fReference2 = "Some other reference";
- private final TmfEvent fEvent2 = new TmfEvent(null, 1, fTimestamp2, fSource, fType, fContent2, fReference2);
+ private final ITmfEvent fEvent2 = new TmfEvent(null, 1, fTimestamp2, fSource, fType, fContent2, fReference2);
private final String fTracePath = "testfiles" + File.separator + "A-Test-10K";
@@ -227,7 +227,7 @@ public class TmfEventTest extends TestCase {
private class TestEvent extends TmfEvent {
- public TestEvent(TmfEvent event) {
+ public TestEvent(ITmfEvent event) {
super(event);
}
@@ -403,14 +403,24 @@ public class TmfEventTest extends TestCase {
}
}
- public void testClone() throws Exception {
+ public void testClone1() throws Exception {
ITmfEvent clone = fEvent1.clone();
+
+ assertTrue("clone", fEvent1.clone().equals(fEvent1));
+ assertTrue("clone", clone.clone().equals(clone));
+
assertEquals("clone", fEvent1, clone);
+ assertEquals("clone", clone, fEvent1);
}
public void testClone2() throws Exception {
- ITmfEvent event = new MyEvent();
- ITmfEvent clone = event.clone();
+ TmfEvent event = new MyEvent();
+ TmfEvent clone = event.clone();
+
+ assertTrue("clone", event.clone().equals(event));
+ assertTrue("clone", clone.clone().equals(clone));
+
+ assertEquals("clone", event, clone);
assertEquals("clone", clone, event);
}
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java
index 8d57b975e6..ed8a86c22f 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java
@@ -44,10 +44,10 @@ public class TmfEventTypeTest extends TestCase {
private final String[] fLabels1 = new String[] { fLabel0, fLabel1 };
private final String[] fLabels2 = new String[] { fLabel1, fLabel0, fLabel1 };
- private final TmfEventType fType0 = new TmfEventType(fContext1, fTypeId1, TmfEventField.makeRoot(fLabels0));
- private final TmfEventType fType1 = new TmfEventType(fContext1, fTypeId2, TmfEventField.makeRoot(fLabels1));
- private final TmfEventType fType2 = new TmfEventType(fContext2, fTypeId1, TmfEventField.makeRoot(fLabels2));
- private final TmfEventType fType3 = new TmfEventType(fContext2, fTypeId2, TmfEventField.makeRoot(fLabels1));
+ private final ITmfEventType fType0 = new TmfEventType(fContext1, fTypeId1, TmfEventField.makeRoot(fLabels0));
+ private final ITmfEventType fType1 = new TmfEventType(fContext1, fTypeId2, TmfEventField.makeRoot(fLabels1));
+ private final ITmfEventType fType2 = new TmfEventType(fContext2, fTypeId1, TmfEventField.makeRoot(fLabels2));
+ private final ITmfEventType fType3 = new TmfEventType(fContext2, fTypeId2, TmfEventField.makeRoot(fLabels1));
// ------------------------------------------------------------------------
// Housekeeping
@@ -174,13 +174,23 @@ public class TmfEventTypeTest extends TestCase {
public void testClone() throws Exception {
ITmfEventType clone = fType1.clone();
+
+ assertTrue("clone", fType1.clone().equals(fType1));
+ assertTrue("clone", clone.clone().equals(clone));
+
+ assertEquals("clone", clone, fType1);
assertEquals("clone", fType1, clone);
}
public void testClone2() throws Exception {
ITmfEventType type = new TmfEventType();
ITmfEventType clone = type.clone();
+
+ assertTrue("clone", type.clone().equals(type));
+ assertTrue("clone", clone.clone().equals(clone));
+
assertEquals("clone", clone, type);
+ assertEquals("clone", type, clone);
}
// ------------------------------------------------------------------------
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfSimpleTimestampTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfSimpleTimestampTest.java
index 683ccd2c62..fb974c7685 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfSimpleTimestampTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfSimpleTimestampTest.java
@@ -124,14 +124,24 @@ public class TmfSimpleTimestampTest extends TestCase {
}
public void testClone() throws Exception {
- ITmfTimestamp timestamp = ts0.clone();
- assertEquals("clone", timestamp, ts0);
+ ITmfTimestamp clone = ts0.clone();
+
+ assertTrue("clone", ts0.clone().equals(ts0));
+ assertTrue("clone", clone.clone().equals(clone));
+
+ assertEquals("clone", clone, ts0);
+ assertEquals("clone", ts0, clone);
}
public void testClone2() throws Exception {
MyTimestamp timestamp = new MyTimestamp();
MyTimestamp clone = timestamp.clone();
+
+ assertTrue("clone", timestamp.clone().equals(timestamp));
+ assertTrue("clone", clone.clone().equals(clone));
+
assertEquals("clone", clone, timestamp);
+ assertEquals("clone", timestamp, clone);
}
// ------------------------------------------------------------------------
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java
index 3ee4a673ef..720d0870fc 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimeRangeTest.java
@@ -133,6 +133,9 @@ public class TmfTimeRangeTest extends TestCase {
TmfTimeRange range = new TmfTimeRange(ts1, ts2);
TmfTimeRange clone = range.clone();
+ assertTrue("clone", range.clone().equals(range));
+ assertTrue("clone", clone.clone().equals(clone));
+
assertEquals("clone", range, clone);
assertEquals("clone", ts1, clone.getStartTime());
assertEquals("clone", ts2, clone.getEndTime());
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java
index fd9de9f46c..6b7dcea332 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java
@@ -145,13 +145,23 @@ public class TmfTimestampTest extends TestCase {
public void testClone() throws Exception {
ITmfTimestamp clone = ts0.clone();
+
+ assertTrue("clone", ts0.clone().equals(ts0));
+ assertTrue("clone", clone.clone().equals(clone));
+
assertEquals("clone", clone, ts0);
+ assertEquals("clone", ts0, clone);
}
public void testClone2() throws Exception {
MyTimestamp timestamp = new MyTimestamp();
MyTimestamp clone = timestamp.clone();
+
+ assertTrue("clone", timestamp.clone().equals(timestamp));
+ assertTrue("clone", clone.clone().equals(clone));
+
assertEquals("clone", clone, timestamp);
+ assertEquals("clone", timestamp, clone);
}
// ------------------------------------------------------------------------
diff --git a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java
index 5339bc9b9b..0972d52ce1 100644
--- a/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java
+++ b/lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java
@@ -62,12 +62,12 @@ public class TmfEventType implements ITmfEventType {
*
* @param type the other type
*/
- public TmfEventType(TmfEventType type) {
+ public TmfEventType(ITmfEventType type) {
if (type == null)
throw new IllegalArgumentException();
- fContext = type.fContext;
- fTypeId = type.fTypeId;
- fRootField = type.fRootField;
+ fContext = type.getContext();
+ fTypeId = type.getName();
+ fRootField = type.getRootField();
}
// ------------------------------------------------------------------------
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java
index f471e07677..87e0cbac4c 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomEvent.java
@@ -14,6 +14,7 @@ package org.eclipse.linuxtools.tmf.ui.parsers.custom;
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -94,4 +95,40 @@ public class CustomEvent extends TmfEvent {
fData = null;
}
+ /* (non-Javadoc)
+ * @see java.lang.Object#hashCode()
+ */
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = super.hashCode();
+ result = prime * result + ((fDefinition == null) ? 0 : fDefinition.hashCode());
+ return result;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (!super.equals(obj)) {
+ return false;
+ }
+ if (!(obj instanceof CustomEvent)) {
+ return false;
+ }
+ CustomEvent other = (CustomEvent) obj;
+ if (fDefinition == null) {
+ if (other.fDefinition != null) {
+ return false;
+ }
+ } else if (!fDefinition.equals(other.fDefinition)) {
+ return false;
+ }
+ return true;
+ }
+
}
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java
index 086ba86f9c..4f98191002 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomTxtEvent.java
@@ -39,7 +39,7 @@ public class CustomTxtEvent extends CustomEvent {
@Override
public void setContent(ITmfEventField content) {
- setContent(content);
+ super.setContent(content);
}
public void processGroups(InputLine input, Matcher matcher) {
diff --git a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlEvent.java b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlEvent.java
index e69b9d5809..c1f820f942 100644
--- a/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlEvent.java
+++ b/lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/parsers/custom/CustomXmlEvent.java
@@ -35,7 +35,7 @@ public class CustomXmlEvent extends CustomEvent {
@Override
public void setContent(ITmfEventField content) {
- setContent(content);
+ super.setContent(content);
}
public void parseInput(String value, String name, int inputAction, String inputFormat) {

Back to the top