JAVA-635: Improved test coverage for InterruptedException/MongoInterruptedException

Author: jyemin

src/test/com/mongodb/DBPortPoolTest.java

@@ -20,9 +20,14 @@
 
 import org.testng.annotations.Test;
 
+import java.net.UnknownHostException;
+import java.util.concurrent.BrokenBarrierException;
+import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 public class DBPortPoolTest extends com.mongodb.util.TestCase {
@@ -76,13 +81,48 @@ public void run(){
         es.shutdown();
         es.awaitTermination( Integer.MAX_VALUE, TimeUnit.SECONDS);
 
-        for(int x = 2; x<8; x++) {
-//            Assert.assertNotSame( 0 , ports[x]._lastThread, x + ":" + ports[x].hashCode());
-        }
-        
         assertEquals( pool.getMaxSize() , pool.getAvailable() );
     }
 
+    @Test
+    public void testInterruptedException() throws UnknownHostException, InterruptedException {
+        MongoOptions options = new MongoOptions();
+        options.connectionsPerHost = 1;
+        final DBPortPool pool = new DBPortPool( new ServerAddress("localhost"), options );
+        pool.get();
+
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        final CountDownLatch ready = new CountDownLatch(1);
+
+        Callable<Boolean> callable = new Callable<Boolean>() {
+            @Override
+            public Boolean call() throws BrokenBarrierException, InterruptedException {
+                try {
+                    ready.countDown();
+                    pool.get();
+                    return false;
+                } catch (MongoInterruptedException e) {
+                    // return true if interrupted
+                    return true;
+                }
+            }
+        };
+        Future<Boolean> future = executor.submit(callable);
+
+        ready.await();
+        // Interrupt the thread
+        executor.shutdownNow();
+
+        try {
+            assertEquals(true, future.get());
+        } catch (InterruptedException e) {
+            fail("Should not happen, since this thread was not interrupted");
+        } catch (ExecutionException e) {
+            e.printStackTrace();
+            fail("Should not happen");
+        }
+    }
+
     public static void main( String args[] ){
         (new DBPortPoolTest()).runConsole();
     }

src/test/com/mongodb/util/SimplePoolTest.java

@@ -17,6 +17,7 @@
 package com.mongodb.util;
 
 import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -170,19 +171,22 @@ public void testReturnNullFromCreate() throws InterruptedException {
     }
 
     @org.testng.annotations.Test()
-    public void testThrowsInterruptedException() {
-        final MyPool p = new MyPool(1);
+    public void testThrowsInterruptedException() throws InterruptedException {
+            final MyPool p = new MyPool(1);
         try {
             p.get();
         } catch (InterruptedException e) {
             fail("Should not throw InterruptedException here");
         }
 
         ExecutorService executor = Executors.newSingleThreadExecutor();
+        final CountDownLatch ready = new CountDownLatch(1);
+
         Callable<Boolean> callable = new Callable<Boolean>() {
             @Override
             public Boolean call() {
                 try {
+                    ready.countDown();
                     p.get();
                     return false;
                 } catch (InterruptedException e) {
@@ -193,6 +197,7 @@ public Boolean call() {
         };
         Future<Boolean> future = executor.submit(callable);
 
+        ready.await();
         // Interrupt the thread
         executor.shutdownNow();