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.12 by jsr166, Wed Aug 25 01:44:48 2010 UTC vs.
Revision 1.16 by jsr166, Sun May 29 06:50:55 2011 UTC

# Line 1 | Line 1
1   /*
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
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
8  
9 –
9   import junit.framework.*;
10   import java.util.*;
11   import java.util.concurrent.*;
# Line 23 | Line 22 | public class ExecutorCompletionServiceTe
22          return new TestSuite(ExecutorCompletionServiceTest.class);
23      }
24  
26 –
25      /**
26       * Creating a new ECS with null Executor throw NPE
27       */
# Line 112 | 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 <            Thread.sleep(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