From 63913d516f35be9cfecce9dd8b8fdc8b5137c592 Mon Sep 17 00:00:00 2001
From: Mark DePristo <depristo@broadinstitute.org>
Date: Sun, 27 Jan 2013 16:52:45 -0500
Subject: [PATCH] Add join call to Progress meter unit test so we actually know
 the daemon thread has finished

---
 .../utils/progressmeter/ProgressMeterDaemonUnitTest.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/java/test/org/broadinstitute/sting/utils/progressmeter/ProgressMeterDaemonUnitTest.java b/public/java/test/org/broadinstitute/sting/utils/progressmeter/ProgressMeterDaemonUnitTest.java
index 4de24bc15..c33c1976b 100644
--- a/public/java/test/org/broadinstitute/sting/utils/progressmeter/ProgressMeterDaemonUnitTest.java
+++ b/public/java/test/org/broadinstitute/sting/utils/progressmeter/ProgressMeterDaemonUnitTest.java
@@ -84,7 +84,7 @@ public class ProgressMeterDaemonUnitTest extends BaseTest {
     }
 
     @Test(dataProvider = "PollingData", invocationCount = 10, successPercentage = 90)
-    public void testMe(final long poll, final int ticks) throws InterruptedException {
+    public void testProgressMeterDaemon(final long poll, final int ticks) throws InterruptedException {
         final TestingProgressMeter meter = new TestingProgressMeter(poll);
         final ProgressMeterDaemon daemon = meter.getProgressMeterDaemon();
         Assert.assertTrue(daemon.isDaemon());
@@ -96,6 +96,9 @@ public class ProgressMeterDaemonUnitTest extends BaseTest {
         daemon.done();
         Assert.assertTrue(daemon.isDone());
 
+        // wait for the thread to actually finish
+        daemon.join();
+
         Assert.assertTrue(meter.progressCalls.size() >= 1,
                 "Expected at least one progress update call from daemon thread, but only got " + meter.progressCalls.size() + " with exact calls " + meter.progressCalls);