Revert "Changed testng.xml to run tests in all packages under com.mongodb and org.bson, instead of explicitly naming test classes. This is less error prone, since committers have not always added new test classes to testng.xml. Now unit tests run a lot more tests. Two tests that weren't running before are failing, so I commented them out. For one there is a known bug which is referenced, the other I'm still debugging with the committer."

This reverts commit d846b7a.

Author: Brendan W. McAdams

src/test/com/mongodb/DBPortPoolTest.java

@@ -23,11 +23,11 @@
 import java.util.concurrent.TimeUnit;
 
 import org.testng.Assert;
-import org.testng.annotations.Test;
+
 
 public class DBPortPoolTest extends com.mongodb.util.TestCase {
 
-    @Test
+    @org.testng.annotations.Test
     public void testReuse() throws Exception {
         final DBPortPool pool = new DBPortPool( new ServerAddress( "localhost" ), new MongoOptions() );
         DBPort[] ports = new DBPort[10];
@@ -43,11 +43,10 @@ public void testReuse() throws Exception {
                 @Override
                 public void run(){
                     try { 
-                        Thread.sleep( 100 );
-                    } catch ( InterruptedException e ) {
-                    }
+                        Thread.sleep( 100 ); } catch ( InterruptedException e ) { e.printStackTrace( System.out );}
                     DBPort p = pool.get();
                     pool.done( p );
+                    //System.out.println( "threadId:" + p._lastThread + " , code:" + p.hashCode() );
                 }
             });
         }
@@ -58,7 +57,7 @@ public void run(){
         Assert.assertTrue(es.awaitTermination( 1, TimeUnit.SECONDS ));
 
         for(int x = 2; x<8; x++) {
-//            Assert.assertNotSame( 0 , ports[x]._lastThread, x + ":" + ports[x].hashCode());
+            Assert.assertNotSame( 0 , ports[x]._lastThread, x + ":" + ports[x].hashCode());
         }
 
         assertEquals( 10 , pool.everCreated() );

src/test/com/mongodb/DBTCPConnectorTest.java

@@ -87,15 +87,14 @@ public void testConnectionReservationForWriteThenRead() {
     /**
      * Tests that same connections is used for sequential reads
      */
-    // TODO: re-enable this test for JAVA-498
-//    @Test
-//    public void testConnectionReservationForReads() {
-//        _connector.requestStart();
-//        _connector.call(_db, _collection,
-//                OutMessage.query(cleanupMongo, 0, _collection.getFullName(), 0, -1, new BasicDBObject(), new BasicDBObject(), ReadPreference.PRIMARY),
-//                null, 0);
-//        assertNotNull(_connector.getMyPort()._requestPort);
-//    }
+    @Test
+    public void testConnectionReservationForReads() {
+        _connector.requestStart();
+        _connector.call(_db, _collection,
+                OutMessage.query(cleanupMongo, 0, _collection.getFullName(), 0, -1, new BasicDBObject(), new BasicDBObject(), ReadPreference.PRIMARY),
+                null, 0);
+        assertNotNull(_connector.getMyPort()._requestPort);
+    }
 
 
     private OutMessage createOutMessageForInsert() {

testng.xml

@@ -1,4 +1,4 @@
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd">
 
 <!--
 Copyright 2011, 10gen
@@ -16,13 +16,38 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-<suite name="driver">
+<suite name="appserver" >
 
-    <test name="main">
-        <packages>
-            <package name="com.mongodb.*"/>
-            <package name="org.bson.*"/>
-        </packages>
+    <test name="main tests">
+        <classes>
+            <class name="com.mongodb.util.SimplePoolTest"/>
+            <class name="com.mongodb.util.JSONTest"/>
+            <class name="com.mongodb.io.ByteBufferStreamTest"/>
+            <class name="org.bson.PoolOutputBufferTest"/>
+            <class name="org.bson.BSONTest"/>
+            <class name="org.bson.util.ClassMapTest"/>
+            <class name="org.bson.util.StringRangeSetTest"/>
+            <class name="com.mongodb.ByteTest"/>
+            <class name="com.mongodb.BasicDBObjectTest"/>
+            <class name="com.mongodb.JavaClientTest"/>
+            <class name="com.mongodb.ReflectionTest"/>
+            <class name="com.mongodb.DBAddressTest"/>
+            <class name="com.mongodb.DBTest"/>
+            <class name="com.mongodb.DBTests"/>
+            <class name="com.mongodb.DBObjectTest"/>
+            <class name="com.mongodb.DBCollectionTest"/>
+            <class name="com.mongodb.ReplicaSetStatusTest"/>
+            <class name="com.mongodb.DBCursorTest"/>
+            <class name="com.mongodb.ObjectIdTest"/>
+            <class name="com.mongodb.DBRefTest"/>
+            <class name="com.mongodb.QueryBuilderTest"/>
+            <class name="com.mongodb.ErrorTest"/>
+            <class name="com.mongodb.ThreadingTest"/>
+            <class name="com.mongodb.MongoURITest"/>
+            <class name="com.mongodb.MongoOptionsTest"/>
+            <class name="com.mongodb.SecondaryReadTest"/>
+            <class name="com.mongodb.SecondaryLoadBalanceTest"/>
+        </classes>
     </test>
 
 </suite>