--- jsr166/src/test/tck/ScheduledExecutorTest.java	2003/12/27 19:26:43	1.13
+++ jsr166/src/test/tck/ScheduledExecutorTest.java	2004/01/08 01:29:46	1.16
@@ -586,7 +586,7 @@ public class ScheduledExecutorTest exten
         try {
             p1.setContinueExistingPeriodicTasksAfterShutdownPolicy(true);
             ScheduledFuture task =
-                p1.scheduleAtFixedRate(new NoOpRunnable(), 5, 5, TimeUnit.MILLISECONDS);
+                p1.scheduleAtFixedRate(new NoOpRunnable(), 1, 1, TimeUnit.MILLISECONDS);
             assertFalse(task.isCancelled());
             p1.shutdown();
             assertFalse(task.isCancelled());
@@ -594,8 +594,8 @@ public class ScheduledExecutorTest exten
             assertTrue(p1.isShutdown());
             Thread.sleep(SHORT_DELAY_MS);
             assertFalse(task.isCancelled());
-            task.cancel(true);
-            assertTrue(task.isCancelled());
+            assertTrue(task.cancel(true));
+            assertTrue(task.isDone());
             Thread.sleep(SHORT_DELAY_MS);
             assertTrue(p1.isTerminated());
         }
@@ -1061,14 +1061,17 @@ public class ScheduledExecutorTest exten
             ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
             l.add(new StringTask());
             l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
+            l.add(new StringTask());
             List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
-            assertEquals(2, result.size());
+            assertEquals(3, result.size());
             Iterator<Future<String>> it = result.iterator(); 
             Future<String> f1 = it.next();
             Future<String> f2 = it.next();
+            Future<String> f3 = it.next();
             assertTrue(f1.isDone());
-            assertFalse(f1.isCancelled());
             assertTrue(f2.isDone());
+            assertTrue(f3.isDone());
+            assertFalse(f1.isCancelled());
             assertTrue(f2.isCancelled());
         } catch(Exception ex) {
             unexpectedException();