Fixed findAndModify test to work with stricter error checking in server > 2.1

jyemin · jyemin · commit b857e44a2af4 · 2012-07-19T12:45:59.000-04:00
diff --git a/src/test/com/mongodb/JavaClientTest.java b/src/test/com/mongodb/JavaClientTest.java
@@ -849,15 +849,20 @@ public void testFindAndModify(){
         // test exception throwing
         c.insert( new BasicDBObject( "a" , 1 ) );
         try {
-            dbObj = c.findAndModify( null, null );
-            assertTrue(false, "Exception not thrown when no update nor remove");
+            c.findAndModify( null, null );
+            fail("Exception not thrown when no update nor remove");
         } catch (MongoException e) {
         }
 
         try {
             dbObj = c.findAndModify( new BasicDBObject("a", "noexist"), null );
+            if (!serverIsAtLeastVersion(2.1)) {
+               assertNull(dbObj);
+            }
         } catch (MongoException e) {
-            assertTrue(false, "Exception thrown when matching record");
+            if (!serverIsAtLeastVersion(2.1)) {
+                fail("Exception thrown when matching record");
+            }
         }
     }
 
