diff options
author | Patrick Tasse | 2013-05-13 20:38:06 +0000 |
---|---|---|
committer | Patrick Tasse | 2013-05-14 17:54:07 +0000 |
commit | 29757e13db585dc1f6ee26d4a709a3acffa9e0f8 (patch) | |
tree | 700a56d29f90c0eda10f0d736aba2e7344c964d7 /lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java | |
parent | 15fbd5cb7cc171dd1a26dbe54fec8431a2aaee22 (diff) | |
download | org.eclipse.linuxtools-29757e13db585dc1f6ee26d4a709a3acffa9e0f8.tar.gz org.eclipse.linuxtools-29757e13db585dc1f6ee26d4a709a3acffa9e0f8.tar.xz org.eclipse.linuxtools-29757e13db585dc1f6ee26d4a709a3acffa9e0f8.zip |
Fix for experiment location hashCode and equals
Change-Id: Ib3456002492de585c53986c5c8384e227d5b9880
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/12769
Tested-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
IP-Clean: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Diffstat (limited to 'lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java')
-rw-r--r-- | lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java index 05bbddbfd8..82ff2679e8 100644 --- a/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java +++ b/lttng/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfLocationTest.java @@ -9,6 +9,7 @@ * Contributors: * Francois Chouinard - Initial API and implementation * Alexandre Montplaisir - Port to JUnit4 + * Patrick Tasse - Add tests for TmfExperimentLocation *******************************************************************************/ package org.eclipse.linuxtools.tmf.core.tests.trace; @@ -18,6 +19,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import org.eclipse.linuxtools.internal.tmf.core.trace.TmfExperimentLocation; +import org.eclipse.linuxtools.internal.tmf.core.trace.TmfLocationArray; import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.ITmfLocation; import org.eclipse.linuxtools.tmf.core.trace.TmfLongLocation; @@ -38,11 +41,13 @@ public class TmfLocationTest { private String aString = "some location"; private Long aLong = 12345L; private TmfTimestamp aTimestamp = new TmfTimestamp(); + private TmfLocationArray aLocationArray; private TmfStringLocation fLocation1; private TmfStringLocation fLocation2; private TmfLongLocation fLocation3; private TmfTimestampLocation fLocation4; + private TmfExperimentLocation fExpLocation; // ------------------------------------------------------------------------ // Housekeeping @@ -54,6 +59,11 @@ public class TmfLocationTest { fLocation2 = new TmfStringLocation(aString); fLocation3 = new TmfLongLocation(aLong); fLocation4 = new TmfTimestampLocation(aTimestamp); + aLocationArray = new TmfLocationArray( + new ITmfLocation[] { fLocation1, fLocation2, fLocation3, fLocation4 }, + new long[] { 1, 2, 3, 4 } + ); + fExpLocation = new TmfExperimentLocation(aLocationArray); } // ------------------------------------------------------------------------ @@ -66,6 +76,7 @@ public class TmfLocationTest { assertEquals("TmfLocation", aString, fLocation2.getLocationInfo()); assertEquals("TmfLocation", aLong, fLocation3.getLocationInfo()); assertEquals("TmfLocation", aTimestamp, fLocation4.getLocationInfo()); + assertEquals("TmfLocation", aLocationArray, fExpLocation.getLocationInfo()); } @Test @@ -74,11 +85,13 @@ public class TmfLocationTest { TmfStringLocation location2 = new TmfStringLocation(fLocation2); TmfLongLocation location3 = new TmfLongLocation(fLocation3); TmfTimestampLocation location4 = new TmfTimestampLocation(fLocation4); + TmfExperimentLocation expLocation = new TmfExperimentLocation(fExpLocation); assertNull("TmfLocation", location1.getLocationInfo()); assertEquals("TmfLocation", aString, location2.getLocationInfo()); assertEquals("TmfLocation", aLong, location3.getLocationInfo()); assertEquals("TmfLocation", aTimestamp, location4.getLocationInfo()); + assertEquals("TmfLocation", aLocationArray, expLocation.getLocationInfo()); } // ------------------------------------------------------------------------ @@ -90,13 +103,27 @@ public class TmfLocationTest { TmfStringLocation location1 = new TmfStringLocation((String) null); TmfStringLocation location2 = new TmfStringLocation(aString); TmfLongLocation location3 = new TmfLongLocation(aLong); + TmfExperimentLocation expLocation = new TmfExperimentLocation(fExpLocation); + TmfLocationArray locationArray1 = new TmfLocationArray(aLocationArray, 3, fLocation4, 5); + TmfExperimentLocation expLocation1 = new TmfExperimentLocation(locationArray1); + TmfLocationArray locationArray2 = new TmfLocationArray(aLocationArray, 3, fLocation3, 4); + TmfExperimentLocation expLocation2 = new TmfExperimentLocation(locationArray2); + TmfLocationArray locationArray3 = new TmfLocationArray( + new ITmfLocation[] { fLocation1, fLocation2, fLocation3 }, + new long[] { 1, 2, 3 } + ); + TmfExperimentLocation expLocation3 = new TmfExperimentLocation(locationArray3); assertTrue("hashCode", fLocation1.hashCode() == location1.hashCode()); assertTrue("hashCode", fLocation2.hashCode() == location2.hashCode()); assertTrue("hashCode", fLocation3.hashCode() == location3.hashCode()); + assertTrue("hashCode", fExpLocation.hashCode() == expLocation.hashCode()); assertTrue("hashCode", fLocation2.hashCode() != location3.hashCode()); assertTrue("hashCode", fLocation3.hashCode() != location2.hashCode()); + assertTrue("hashCode", fExpLocation.hashCode() != expLocation1.hashCode()); + assertTrue("hashCode", fExpLocation.hashCode() != expLocation2.hashCode()); + assertTrue("hashCode", fExpLocation.hashCode() != expLocation3.hashCode()); } // ------------------------------------------------------------------------ @@ -131,21 +158,41 @@ public class TmfLocationTest { public void testEqualsReflexivity() { assertTrue("equals", fLocation2.equals(fLocation2)); assertTrue("equals", fLocation3.equals(fLocation3)); + assertTrue("equals", fExpLocation.equals(fExpLocation)); assertTrue("equals", !fLocation2.equals(fLocation3)); assertTrue("equals", !fLocation3.equals(fLocation2)); + TmfLocationArray locationArray1 = new TmfLocationArray(aLocationArray, 3, fLocation4, 5); + TmfExperimentLocation expLocation1 = new TmfExperimentLocation(locationArray1); + TmfLocationArray locationArray2 = new TmfLocationArray(aLocationArray, 3, fLocation3, 4); + TmfExperimentLocation expLocation2 = new TmfExperimentLocation(locationArray2); + TmfLocationArray locationArray3 = new TmfLocationArray( + new ITmfLocation[] { fLocation1, fLocation2, fLocation3 }, + new long[] { 1, 2, 3 } + ); + TmfExperimentLocation expLocation3 = new TmfExperimentLocation(locationArray3); + assertTrue("equals", !fExpLocation.equals(expLocation1)); + assertTrue("equals", !expLocation1.equals(fExpLocation)); + assertTrue("equals", !fExpLocation.equals(expLocation2)); + assertTrue("equals", !expLocation2.equals(fExpLocation)); + assertTrue("equals", !fExpLocation.equals(expLocation3)); + assertTrue("equals", !expLocation3.equals(fExpLocation)); } @Test public void testEqualsSymmetry() { TmfStringLocation location2 = new TmfStringLocation(aString); TmfLongLocation location3 = new TmfLongLocation(aLong); + TmfExperimentLocation expLocation = new TmfExperimentLocation(fExpLocation); assertTrue("equals", location2.equals(fLocation2)); assertTrue("equals", fLocation2.equals(location2)); assertTrue("equals", location3.equals(fLocation3)); assertTrue("equals", fLocation3.equals(location3)); + + assertTrue("equals", expLocation.equals(fExpLocation)); + assertTrue("equals", fExpLocation.equals(expLocation)); } @Test @@ -153,16 +200,23 @@ public class TmfLocationTest { TmfStringLocation location1 = new TmfStringLocation(aString); TmfStringLocation location2 = new TmfStringLocation(aString); TmfStringLocation location3 = new TmfStringLocation(aString); + TmfExperimentLocation expLocation1 = new TmfExperimentLocation(aLocationArray); + TmfExperimentLocation expLocation2 = new TmfExperimentLocation(aLocationArray); + TmfExperimentLocation expLocation3 = new TmfExperimentLocation(aLocationArray); assertTrue("equals", location1.equals(location2)); assertTrue("equals", location2.equals(location3)); assertTrue("equals", location3.equals(location1)); + assertTrue("equals", expLocation1.equals(expLocation2)); + assertTrue("equals", expLocation2.equals(expLocation3)); + assertTrue("equals", expLocation3.equals(expLocation1)); } @Test public void testEqualsNull() { assertTrue("equals", !fLocation2.equals(null)); assertTrue("equals", !fLocation2.equals(null)); + assertTrue("equals", !fExpLocation.equals(null)); } // ------------------------------------------------------------------------ @@ -178,14 +232,17 @@ public class TmfLocationTest { TmfStringLocation location1 = new TmfStringLocation(str); TmfLongLocation location2 = new TmfLongLocation(lng); TmfTimestampLocation location3 = new TmfTimestampLocation(ts); + TmfExperimentLocation expLocation = new TmfExperimentLocation(aLocationArray); String expected1 = "TmfStringLocation [fLocationInfo=" + str + "]"; String expected2 = "TmfLongLocation [fLocationInfo=" + lng + "]"; String expected3 = "TmfTimestampLocation [fLocationInfo=" + ts + "]"; + String expected4 = "TmfExperimentLocation [" + aLocationArray + "]"; assertEquals("toString", expected1, location1.toString()); assertEquals("toString", expected2, location2.toString()); assertEquals("toString", expected3, location3.toString()); + assertEquals("toString", expected4, expLocation.toString()); } } |