fix ObjectId compareTo and more tests

erh · erh · commit e394110bc728 · 2009-12-08T23:06:39.000-05:00
diff --git a/src/main/com/mongodb/ObjectId.java b/src/main/com/mongodb/ObjectId.java
@@ -238,11 +238,13 @@ public int compareTo( ObjectId id ){
         if ( id == null )
             return -1;
         
-        int x = id._time - _time;
-        if ( x != 0 )
-            return x;
+        long xx = id.getTime() - getTime();
+        if ( xx > 0 )
+            return -1;
+        else if ( xx < 0 )
+            return 1;
 
-        x = id._machine - _machine;
+        int x = id._machine - _machine;
         if ( x != 0 )
             return -x;
 
diff --git a/src/test/com/mongodb/ByteTest.java b/src/test/com/mongodb/ByteTest.java
@@ -158,6 +158,12 @@ public void testArray1(){
     public void testObjcetId(){
         assertTrue( (new ObjectId()).compareTo( new ObjectId() ) < 0 );
         assertTrue( (new ObjectId(0 , 0 , 0 )).compareTo( new ObjectId() ) < 0 );
+        assertTrue( (new ObjectId(0 , 0 , 0 )).compareTo( new ObjectId( 0 , 0 , 1 ) ) < 0 );
+
+        assertTrue( (new ObjectId(5 , 5 , 5 )).compareTo( new ObjectId( 5 , 5 , 6 ) ) < 0 );
+        assertTrue( (new ObjectId(5 , 5 , 5 )).compareTo( new ObjectId( 5 , 6 , 5 ) ) < 0 );
+        assertTrue( (new ObjectId(5 , 5 , 5 )).compareTo( new ObjectId( 6 , 5 , 5 ) ) < 0 );
+
     }
 
 
