svn commit: r928159 - in /incubator/thrift/trunk/lib/java: build.xml test/org/apache/thrift/TestStruct.java test/org/apache/thrift/test/CompareTest.java

[bryanduxbury]

Author: bryanduxbury
Date: Sat Mar 27 06:24:12 2010
New Revision: 928159

URL: http://svn.apache.org/viewvc?rev=928159&view=rev
Log:
java: Move contents of CompareTest into TestStruct; delete old version

Removed:
    incubator/thrift/trunk/lib/java/test/org/apache/thrift/test/CompareTest.java
Modified:
    incubator/thrift/trunk/lib/java/build.xml
    incubator/thrift/trunk/lib/java/test/org/apache/thrift/TestStruct.java

Modified: incubator/thrift/trunk/lib/java/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/build.xml?rev=928159&r1=928158&r2=928159&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/build.xml (original)
+++ incubator/thrift/trunk/lib/java/build.xml Sat Mar 27 06:24:12 2010
@@ -195,8 +195,6 @@
       classpathref="test.classpath" failonerror="true" />
     <java classname="org.apache.thrift.test.ToStringTest"
       classpathref="test.classpath" failonerror="true" />
-    <java classname="org.apache.thrift.test.CompareTest"
-      classpathref="test.classpath" failonerror="true" />
     <java classname="org.apache.thrift.test.MetaDataTest"
       classpathref="test.classpath" failonerror="true" />
     <java classname="org.apache.thrift.test.JavaBeansTest"

Modified: incubator/thrift/trunk/lib/java/test/org/apache/thrift/TestStruct.java
URL: 
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/test/org/apache/thrift/TestStruct.java?rev=928159&r1=928158&r2=928159&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/test/org/apache/thrift/TestStruct.java 
(original)
+++ incubator/thrift/trunk/lib/java/test/org/apache/thrift/TestStruct.java Sat 
Mar 27 06:24:12 2010
@@ -9,6 +9,7 @@ import junit.framework.TestCase;
 
 import org.apache.thrift.protocol.TBinaryProtocol;
 
+import thrift.test.Bonk;
 import thrift.test.HolyMoley;
 import thrift.test.Nesting;
 import thrift.test.OneOfEach;
@@ -105,4 +106,33 @@ public class TestStruct extends TestCase
 
     assertFalse(hm.equals(hmCopy2));
   }
+
+  public void testCompareTo() throws Exception {
+    Bonk bonk1 = new Bonk();
+    Bonk bonk2 = new Bonk();
+
+    // Compare empty thrift objects.
+    assertEquals(0, bonk1.compareTo(bonk2));
+
+    bonk1.setMessage("m");
+
+    // Compare one thrift object with a filled in field and another without it.
+    assertTrue(bonk1.compareTo(bonk2) > 0);
+    assertTrue(bonk2.compareTo(bonk1) < 0);
+
+    // Compare both have filled-in fields.
+    bonk2.setMessage("z");
+    assertTrue(bonk1.compareTo(bonk2) < 0);
+    assertTrue(bonk2.compareTo(bonk1) > 0);
+
+    // Compare bonk1 has a field filled in that bonk2 doesn't.
+    bonk1.setType(123);
+    assertTrue(bonk1.compareTo(bonk2) > 0);
+    assertTrue(bonk2.compareTo(bonk1) < 0);
+
+    // Compare bonk1 and bonk2 equal.
+    bonk2.setType(123);
+    bonk2.setMessage("m");
+    assertEquals(0, bonk1.compareTo(bonk2));
+  }
 }