--- jsr166/src/test/tck/ScheduledExecutorTest.java	2004/01/21 01:47:07	1.18
+++ jsr166/src/test/tck/ScheduledExecutorTest.java	2004/01/22 15:17:35	1.21
@@ -144,7 +144,6 @@ public class ScheduledExecutorTest exten
             // an execution per SHORT delay, but no more than one SHORT more
             assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
             assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
-	    assertTrue(h.isDone());
             joinPool(p1);
         } catch(Exception e){
             unexpectedException();
@@ -165,7 +164,6 @@ public class ScheduledExecutorTest exten
             int c = counter.count.get();
             assertTrue(c >= SMALL_DELAY_MS / SHORT_DELAY_MS);
             assertTrue(c <= SMALL_DELAY_MS + SHORT_DELAY_MS);
-	    assertTrue(h.isDone());
             joinPool(p1);
         } catch(Exception e){
             unexpectedException();
@@ -525,15 +523,28 @@ public class ScheduledExecutorTest exten
         ScheduledThreadPoolExecutor p1 = new ScheduledThreadPoolExecutor(1);
         ScheduledFuture[] tasks = new ScheduledFuture[5];
         for(int i = 0; i < 5; i++){
-            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), 1, TimeUnit.MILLISECONDS);
+            tasks[i] = p1.schedule(new SmallPossiblyInterruptedRunnable(), SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
+        }
+        try {
+            int max = 5;
+            if (tasks[4].cancel(true)) --max;
+            if (tasks[3].cancel(true)) --max;
+            // There must eventually be an interference-free point at
+            // which purge will not fail. (At worst, when queue is empty.)
+            int k;
+            for (k = 0; k < SMALL_DELAY_MS; ++k) {
+                p1.purge();
+                long count = p1.getTaskCount();
+                if (count >= 0 && count <= max)
+                    break;
+                Thread.sleep(1);
+            }
+            assertTrue(k < SMALL_DELAY_MS);
+        } catch(Exception e) {
+            unexpectedException();
+        } finally {
+            joinPool(p1);
         }
-        int max = 5;
-        if (tasks[4].cancel(true)) --max;
-        if (tasks[3].cancel(true)) --max;
-        p1.purge();
-        long count = p1.getTaskCount();
-        assertTrue(count > 0 && count <= max);
-        joinPool(p1);
     }
 
     /**