Ensure threads in test330 have terminated

Author: Ian Craggs

org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/BasicTest.java

@@ -335,6 +335,7 @@ public void test330() throws Exception {
     String methodName = Utility.getMethodName();
     LoggingUtilities.banner(log, cclass, methodName);
 
+    int before_thread_count = Thread.activeCount();
     URI uri = new URI("tcp://iot.eclipse.org:1882");
     IMqttAsyncClient client = clientFactory.createMqttAsyncClient(uri, "client-1");
 
@@ -353,6 +354,17 @@ public void test330() throws Exception {
     } finally {
       client.close();
     }
+    
+    int after_count = Thread.activeCount();
+    Thread[] tarray = new Thread[after_count];
+    while (after_count > before_thread_count) {
+      after_count = Thread.enumerate(tarray);
+      for (int i = 0; i < after_count; ++i) {
+    	    log.info(i + " " + tarray[i].getName());
+      }
+      Thread.sleep(100);
+    }
+    Assert.assertEquals(before_thread_count, after_count);
   }
 
 
@@ -465,7 +477,7 @@ public void test402a() throws Exception {
     for (int i = 0; i < after_count; ++i) {
       log.info(i + " " + tarray[i].getName());
     }
-    Assert.assertEquals(before_thread_count, after_count - pool_size);
+    Assert.assertEquals(after_count, before_thread_count + pool_size);
   }