ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ScheduledExecutorTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ScheduledExecutorTest.java (file contents):
Revision 1.11 by dl, Tue Dec 23 19:40:24 2003 UTC vs.
Revision 1.15 by dl, Wed Jan 7 01:13:50 2004 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
2 > * Written by Doug Lea with assistance from members of JCP JSR-166
3 > * Expert Group and released to the public domain, as explained at
4 > * http://creativecommons.org/licenses/publicdomain
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9   import junit.framework.*;
# Line 594 | Line 595 | public class ScheduledExecutorTest exten
595              Thread.sleep(SHORT_DELAY_MS);
596              assertFalse(task.isCancelled());
597              task.cancel(true);
598 <            assertTrue(task.isCancelled());
598 >            assertTrue(task.isDone());
599              Thread.sleep(SHORT_DELAY_MS);
600              assertTrue(p1.isTerminated());
601          }
# Line 1059 | Line 1060 | public class ScheduledExecutorTest exten
1060          try {
1061              ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1062              l.add(new StringTask());
1063 <            l.add(Executors.callable(new MediumInterruptedRunnable(), TEST_STRING));
1063 >            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1064 >            l.add(new StringTask());
1065              List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
1066 <            assertEquals(2, result.size());
1066 >            assertEquals(3, result.size());
1067              Iterator<Future<String>> it = result.iterator();
1068              Future<String> f1 = it.next();
1069              Future<String> f2 = it.next();
1070 +            Future<String> f3 = it.next();
1071              assertTrue(f1.isDone());
1069 –            assertFalse(f1.isCancelled());
1072              assertTrue(f2.isDone());
1073 +            assertTrue(f3.isDone());
1074 +            assertFalse(f1.isCancelled());
1075              assertTrue(f2.isCancelled());
1076          } catch(Exception ex) {
1077              unexpectedException();

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines