Work on TmfCheckpoint

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java
index 5e15ffd749f5fa0eb582ea22831b092f699348cf..ccdcb468747109ac42ee78dd422d1fc42b2267a0 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/trace/TmfCheckpointTest.java
@@ -127,6 +127,75 @@ public class TmfCheckpointTest extends TestCase {
         }
     }
 
+    // ------------------------------------------------------------------------
+    // compareTo
+    // ------------------------------------------------------------------------
+
+    public void testCompareTo() {
+        assertEquals("compareTo",  0, fCheckpoint1.compareTo(fCheckpoint1));
+        assertEquals("compareTo",  1, fCheckpoint1.compareTo(fCheckpoint2));
+        assertEquals("compareTo", -1, fCheckpoint1.compareTo(fCheckpoint3));
+
+        assertEquals("compareTo", -1, fCheckpoint2.compareTo(fCheckpoint1));
+        assertEquals("compareTo",  0, fCheckpoint2.compareTo(fCheckpoint2));
+        assertEquals("compareTo", -1, fCheckpoint2.compareTo(fCheckpoint3));
+
+        assertEquals("compareTo",  1, fCheckpoint3.compareTo(fCheckpoint1));
+        assertEquals("compareTo",  1, fCheckpoint3.compareTo(fCheckpoint2));
+        assertEquals("compareTo",  0, fCheckpoint3.compareTo(fCheckpoint3));
+    }
+
+    public void testCompareToNull() {
+        final TmfCheckpoint checkpoint1 = new TmfCheckpoint(null, fLocation1);
+        final TmfCheckpoint checkpoint2 = new TmfCheckpoint(null, fLocation2);
+        final TmfCheckpoint checkpoint3 = new TmfCheckpoint(null, fLocation3);
+        final TmfCheckpoint checkpoint4 = new TmfCheckpoint(null, fLocation1);
+
+        // Test the various 'null' vs. '!null' combinations
+        assertEquals("compareTo",  0, checkpoint1.compareTo(fCheckpoint1));
+        assertEquals("compareTo",  0, fCheckpoint1.compareTo(checkpoint1));
+        assertEquals("compareTo", -1, checkpoint1.compareTo(fCheckpoint2));
+        assertEquals("compareTo",  1, fCheckpoint2.compareTo(checkpoint1));
+        assertEquals("compareTo", -1, checkpoint1.compareTo(fCheckpoint3));
+        assertEquals("compareTo",  1, fCheckpoint3.compareTo(checkpoint1));
+
+        // Test the 'null' vs. 'null' combinations
+        assertEquals("compareTo",  0, checkpoint1.compareTo(checkpoint4));
+        assertEquals("compareTo",  0, checkpoint4.compareTo(checkpoint1));
+        assertEquals("compareTo", -1, checkpoint1.compareTo(checkpoint2));
+        assertEquals("compareTo",  1, checkpoint2.compareTo(checkpoint1));
+        assertEquals("compareTo", -1, checkpoint1.compareTo(checkpoint3));
+        assertEquals("compareTo",  1, checkpoint3.compareTo(checkpoint1));
+    }
+
+    // ------------------------------------------------------------------------
+    // hashCode
+    // ------------------------------------------------------------------------
+
+    public void testHashCode() throws Exception {
+        final TmfCheckpoint checkpoint1 = new TmfCheckpoint(fCheckpoint1);
+        final TmfCheckpoint checkpoint2 = new TmfCheckpoint(fCheckpoint2);
+
+        assertTrue("hashCode", fCheckpoint1.hashCode() == checkpoint1.hashCode());
+        assertTrue("hashCode", fCheckpoint2.hashCode() == checkpoint2.hashCode());
+
+        assertTrue("hashCode", fCheckpoint1.hashCode() != checkpoint2.hashCode());
+        assertTrue("hashCode", fCheckpoint2.hashCode() != checkpoint1.hashCode());
+    }
+
+    public void testHashCodeNull() throws Exception {
+        final TmfCheckpoint checkpoint1 = new TmfCheckpoint(null, fLocation1);
+        final TmfCheckpoint checkpoint2 = new TmfCheckpoint(fTimestamp1, null);
+        final TmfCheckpoint checkpoint3 = new TmfCheckpoint(checkpoint1);
+        final TmfCheckpoint checkpoint4 = new TmfCheckpoint(checkpoint2);
+
+        assertTrue("hashCode", fCheckpoint1.hashCode() != checkpoint1.hashCode());
+        assertTrue("hashCode", fCheckpoint1.hashCode() != checkpoint2.hashCode());
+
+        assertTrue("hashCode", checkpoint1.hashCode() == checkpoint3.hashCode());
+        assertTrue("hashCode", checkpoint2.hashCode() == checkpoint4.hashCode());
+    }
+
     // ------------------------------------------------------------------------
     // equals
     // ------------------------------------------------------------------------
@@ -165,21 +234,6 @@ public class TmfCheckpointTest extends TestCase {
         assertTrue("equals", !fCheckpoint2.equals(null));
     }
 
-    // ------------------------------------------------------------------------
-    // hashCode
-    // ------------------------------------------------------------------------
-
-    public void testHashCode() throws Exception {
-        final TmfCheckpoint checkpoint1 = new TmfCheckpoint(fCheckpoint1);
-        final TmfCheckpoint checkpoint2 = new TmfCheckpoint(fCheckpoint2);
-
-        assertTrue("hashCode", fCheckpoint1.hashCode() == checkpoint1.hashCode());
-        assertTrue("hashCode", fCheckpoint2.hashCode() == checkpoint2.hashCode());
-
-        assertTrue("hashCode", fCheckpoint1.hashCode() != checkpoint2.hashCode());
-        assertTrue("hashCode", fCheckpoint2.hashCode() != checkpoint1.hashCode());
-    }
-
     // ------------------------------------------------------------------------
     // toString
     // ------------------------------------------------------------------------
@@ -197,22 +251,4 @@ public class TmfCheckpointTest extends TestCase {
         assertEquals("toString", expected3, fCheckpoint3.toString());
     }
 
-    // ------------------------------------------------------------------------
-    // compareTo
-    // ------------------------------------------------------------------------
-
-    public void testCompareTo() {
-        assertEquals("compareTo",  0, fCheckpoint1.compareTo(fCheckpoint1));
-        assertEquals("compareTo",  1, fCheckpoint1.compareTo(fCheckpoint2));
-        assertEquals("compareTo", -1, fCheckpoint1.compareTo(fCheckpoint3));
-
-        assertEquals("compareTo", -1, fCheckpoint2.compareTo(fCheckpoint1));
-        assertEquals("compareTo",  0, fCheckpoint2.compareTo(fCheckpoint2));
-        assertEquals("compareTo", -1, fCheckpoint2.compareTo(fCheckpoint3));
-
-        assertEquals("compareTo",  1, fCheckpoint3.compareTo(fCheckpoint1));
-        assertEquals("compareTo",  1, fCheckpoint3.compareTo(fCheckpoint2));
-        assertEquals("compareTo",  0, fCheckpoint3.compareTo(fCheckpoint3));
-    }
-
 }

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfCheckpoint.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfCheckpoint.java
index ef4aec84209b4d74975f68092a4b7668d9889a9e..db907589b049d3eb4f6f48c940d8a135c8d9b50e 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfCheckpoint.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/ITmfCheckpoint.java
@@ -49,10 +49,10 @@ public interface ITmfCheckpoint extends Cloneable, Comparable<ITmfCheckpoint> {
     // Comparable
     // ------------------------------------------------------------------------
 
-    /*
-     * (non-Javadoc)
-     * 
+    /* (non-Javadoc)
      * @see java.lang.Comparable#compareTo(java.lang.Object)
+     * 
+     * 
      */
     @Override
     public int compareTo(ITmfCheckpoint checkpoint);

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java
index 370fc1c220678940f6ab052052e808f4fbd3657f..675f1899f613ce894bef5b904786eb0c6351d94f 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfCheckpoint.java
@@ -109,8 +109,8 @@ public class TmfCheckpoint implements ITmfCheckpoint {
     // Comparable
     // ------------------------------------------------------------------------
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     @Override
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public int compareTo(final ITmfCheckpoint other) {
         if (fTimestamp == null || other.getTimestamp() == null) {
             final Comparable location1 = fLocation.getLocation();