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

Comparing jsr166/src/test/tck/ExecutorCompletionServiceTest.java (file contents):
Revision 1.15 by jsr166, Fri May 27 19:42:42 2011 UTC vs.
Revision 1.16 by jsr166, Sun May 29 06:50:55 2011 UTC

# Line 110 | Line 110 | public class ExecutorCompletionServiceTe
110      /**
111       * If poll returns non-null, the returned task is completed
112       */
113 <    public void testPoll1() throws InterruptedException {
113 >    public void testPoll1() throws Exception {
114          ExecutorService e = Executors.newCachedThreadPool();
115          ExecutorCompletionService ecs = new ExecutorCompletionService(e);
116          try {
117              assertNull(ecs.poll());
118              Callable c = new StringTask();
119              ecs.submit(c);
120 <            delay(SHORT_DELAY_MS);
121 <            for (;;) {
122 <                Future f = ecs.poll();
123 <                if (f != null) {
124 <                    assertTrue(f.isDone());
125 <                    break;
126 <                }
120 >
121 >            long startTime = System.nanoTime();
122 >            Future f;
123 >            while ((f = ecs.poll()) == null) {
124 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
125 >                    fail("timed out");
126 >                Thread.yield();
127              }
128 +            assertTrue(f.isDone());
129 +            assertSame(TEST_STRING, f.get());
130          } finally {
131              joinPool(e);
132          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines