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

Comparing jsr166/src/test/tck/SynchronousQueueTest.java (file contents):
Revision 1.19 by jsr166, Tue Dec 1 06:03:49 2009 UTC vs.
Revision 1.32 by jsr166, Thu Apr 14 22:55:08 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   */
# Line 14 | Line 14 | import java.io.*;
14  
15   public class SynchronousQueueTest extends JSR166TestCase {
16  
17 +    public static class Fair extends BlockingQueueTest {
18 +        protected BlockingQueue emptyCollection() {
19 +            return new SynchronousQueue(true);
20 +        }
21 +    }
22 +
23 +    public static class NonFair extends BlockingQueueTest {
24 +        protected BlockingQueue emptyCollection() {
25 +            return new SynchronousQueue(false);
26 +        }
27 +    }
28 +
29      public static void main(String[] args) {
30 <        junit.textui.TestRunner.run (suite());
30 >        junit.textui.TestRunner.run(suite());
31      }
32  
33      public static Test suite() {
34 <        return new TestSuite(SynchronousQueueTest.class);
34 >        return newTestSuite(SynchronousQueueTest.class,
35 >                            new Fair().testSuite(),
36 >                            new NonFair().testSuite());
37      }
38  
39      /**
40 <     * A SynchronousQueue is both empty and full
40 >     * Any SynchronousQueue is both empty and full
41       */
42 <    public void testEmptyFull() {
29 <        SynchronousQueue q = new SynchronousQueue();
42 >    public void testEmptyFull(SynchronousQueue q) {
43          assertTrue(q.isEmpty());
44          assertEquals(0, q.size());
45          assertEquals(0, q.remainingCapacity());
# Line 34 | Line 47 | public class SynchronousQueueTest extend
47      }
48  
49      /**
50 +     * A non-fair SynchronousQueue is both empty and full
51 +     */
52 +    public void testEmptyFull() {
53 +        testEmptyFull(new SynchronousQueue());
54 +    }
55 +
56 +    /**
57       * A fair SynchronousQueue is both empty and full
58       */
59      public void testFairEmptyFull() {
60 <        SynchronousQueue q = new SynchronousQueue(true);
41 <        assertTrue(q.isEmpty());
42 <        assertEquals(0, q.size());
43 <        assertEquals(0, q.remainingCapacity());
44 <        assertFalse(q.offer(zero));
60 >        testEmptyFull(new SynchronousQueue(true));
61      }
62  
63      /**
# Line 119 | Line 135 | public class SynchronousQueueTest extend
135              shouldThrow();
136          } catch (NullPointerException success) {}
137      }
138 +
139      /**
140       * addAll throws ISE if no active taker
141       */
# Line 142 | Line 159 | public class SynchronousQueueTest extend
159              q.put(null);
160              shouldThrow();
161          } catch (NullPointerException success) {}
162 <     }
162 >    }
163  
164      /**
165       * put blocks interruptibly if no active taker
# Line 174 | Line 191 | public class SynchronousQueueTest extend
191                          ++added;
192                      }
193                  } catch (InterruptedException success) {
194 <                    assertTrue(added == 1);
194 >                    assertEquals(1, added);
195                  }
196              }});
197  
# Line 189 | Line 206 | public class SynchronousQueueTest extend
206      /**
207       * timed offer times out if elements not taken
208       */
209 <    public void testTimedOffer() throws InterruptedException {
210 <        final SynchronousQueue q = new SynchronousQueue();
211 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
209 >    public void testTimedOffer(final SynchronousQueue q)
210 >            throws InterruptedException {
211 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
212 >        Thread t = newStartedThread(new CheckedRunnable() {
213              public void realRun() throws InterruptedException {
214 +                long t0 = System.nanoTime();
215                  assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
216 <                q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
216 >                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
217 >                pleaseInterrupt.countDown();
218 >                t0 = System.nanoTime();
219 >                try {
220 >                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
221 >                    shouldThrow();
222 >                } catch (InterruptedException success) {}
223 >                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
224              }});
225  
226 <        t.start();
201 <        Thread.sleep(SMALL_DELAY_MS);
226 >        assertTrue(pleaseInterrupt.await(MEDIUM_DELAY_MS, MILLISECONDS));
227          t.interrupt();
228 <        t.join();
228 >        awaitTermination(t, MEDIUM_DELAY_MS);
229      }
230  
206
231      /**
232 <     * take blocks interruptibly when empty
232 >     * timed offer times out if elements not taken
233       */
234 <    public void testTakeFromEmpty() throws InterruptedException {
235 <        final SynchronousQueue q = new SynchronousQueue();
212 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
213 <            public void realRun() throws InterruptedException {
214 <                q.take();
215 <            }});
216 <
217 <        t.start();
218 <        Thread.sleep(SHORT_DELAY_MS);
219 <        t.interrupt();
220 <        t.join();
234 >    public void testTimedOffer() throws InterruptedException {
235 >        testTimedOffer(new SynchronousQueue());
236      }
237  
238 +    /**
239 +     * timed offer times out if elements not taken
240 +     */
241 +    public void testFairTimedOffer() throws InterruptedException {
242 +        testTimedOffer(new SynchronousQueue(true));
243 +    }
244  
245      /**
246       * put blocks interruptibly if no active taker
# Line 251 | Line 272 | public class SynchronousQueueTest extend
272                          ++added;
273                      }
274                  } catch (InterruptedException success) {
275 <                    assertTrue(added == 1);
275 >                    assertEquals(1, added);
276                  }
277              }});
278  
# Line 264 | Line 285 | public class SynchronousQueueTest extend
285      }
286  
287      /**
267     * timed offer times out if elements not taken
268     */
269    public void testFairTimedOffer() throws InterruptedException {
270        final SynchronousQueue q = new SynchronousQueue(true);
271        Thread t = new Thread(new CheckedInterruptedRunnable() {
272            public void realRun() throws InterruptedException {
273                assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
274                q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
275            }});
276
277        t.start();
278        Thread.sleep(SMALL_DELAY_MS);
279        t.interrupt();
280        t.join();
281    }
282
283
284    /**
288       * take blocks interruptibly when empty
289       */
290      public void testFairTakeFromEmpty() throws InterruptedException {
# Line 298 | Line 301 | public class SynchronousQueueTest extend
301      }
302  
303      /**
304 <     * poll fails unless active taker
304 >     * poll return null if no active putter
305       */
306      public void testPoll() {
307          SynchronousQueue q = new SynchronousQueue();
# Line 306 | Line 309 | public class SynchronousQueueTest extend
309      }
310  
311      /**
312 <     * timed pool with zero timeout times out if no active taker
312 >     * timed poll with zero timeout times out if no active putter
313       */
314      public void testTimedPoll0() throws InterruptedException {
315          SynchronousQueue q = new SynchronousQueue();
# Line 314 | Line 317 | public class SynchronousQueueTest extend
317      }
318  
319      /**
320 <     * timed pool with nonzero timeout times out if no active taker
320 >     * timed poll with nonzero timeout times out if no active putter
321       */
322      public void testTimedPoll() throws InterruptedException {
323          SynchronousQueue q = new SynchronousQueue();
324 +        long t0 = System.nanoTime();
325          assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
326 +        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
327      }
328  
329      /**
330       * Interrupted timed poll throws InterruptedException instead of
331       * returning timeout status
332       */
333 <    public void testInterruptedTimedPoll() throws InterruptedException {
334 <        final SynchronousQueue q = new SynchronousQueue();
335 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
333 >    public void testInterruptedTimedPoll(final SynchronousQueue q)
334 >            throws InterruptedException {
335 >        final CountDownLatch threadStarted = new CountDownLatch(1);
336 >        Thread t = newStartedThread(new CheckedRunnable() {
337              public void realRun() throws InterruptedException {
338 <                q.poll(SMALL_DELAY_MS, MILLISECONDS);
338 >                long t0 = System.nanoTime();
339 >                threadStarted.countDown();
340 >                try {
341 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
342 >                    shouldThrow();
343 >                } catch (InterruptedException success) {}
344 >                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
345 >                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
346              }});
347  
348 <        t.start();
348 >        threadStarted.await();
349          Thread.sleep(SHORT_DELAY_MS);
350          t.interrupt();
351 <        t.join();
351 >        awaitTermination(t, MEDIUM_DELAY_MS);
352      }
353  
354      /**
355 <     *  timed poll before a delayed offer fails; after offer succeeds;
356 <     *  on interruption throws
355 >     * Interrupted timed poll throws InterruptedException instead of
356 >     * returning timeout status
357       */
358 <    public void testTimedPollWithOffer() throws InterruptedException {
359 <        final SynchronousQueue q = new SynchronousQueue();
347 <        Thread t = new Thread(new CheckedRunnable() {
348 <            public void realRun() throws InterruptedException {
349 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
350 <                assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
351 <                try {
352 <                    q.poll(LONG_DELAY_MS, MILLISECONDS);
353 <                    shouldThrow();
354 <                } catch (InterruptedException success) {}
355 <            }});
356 <
357 <        t.start();
358 <        Thread.sleep(SMALL_DELAY_MS);
359 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
360 <        t.interrupt();
361 <        t.join();
358 >    public void testInterruptedTimedPoll() throws InterruptedException {
359 >        testInterruptedTimedPoll(new SynchronousQueue());
360      }
361  
362      /**
# Line 366 | Line 364 | public class SynchronousQueueTest extend
364       * returning timeout status
365       */
366      public void testFairInterruptedTimedPoll() throws InterruptedException {
367 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
370 <            public void realRun() throws InterruptedException {
371 <                SynchronousQueue q = new SynchronousQueue(true);
372 <                q.poll(SMALL_DELAY_MS, MILLISECONDS);
373 <            }});
374 <
375 <        t.start();
376 <        Thread.sleep(SHORT_DELAY_MS);
377 <        t.interrupt();
378 <        t.join();
367 >        testInterruptedTimedPoll(new SynchronousQueue(true));
368      }
369  
370      /**
371 <     *  timed poll before a delayed offer fails; after offer succeeds;
372 <     *  on interruption throws
371 >     * timed poll before a delayed offer times out, returning null;
372 >     * after offer succeeds; on interruption throws
373       */
374      public void testFairTimedPollWithOffer() throws InterruptedException {
375          final SynchronousQueue q = new SynchronousQueue(true);
376 <        Thread t = new Thread(new CheckedRunnable() {
376 >        final CountDownLatch pleaseOffer = new CountDownLatch(1);
377 >        Thread t = newStartedThread(new CheckedRunnable() {
378              public void realRun() throws InterruptedException {
379 +                long t0 = System.nanoTime();
380                  assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
381 +                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
382 +
383 +                pleaseOffer.countDown();
384 +                t0 = System.nanoTime();
385                  assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
386 +                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
387 +
388 +                t0 = System.nanoTime();
389                  try {
390                      q.poll(LONG_DELAY_MS, MILLISECONDS);
391 <                    threadShouldThrow();
391 >                    shouldThrow();
392                  } catch (InterruptedException success) {}
393 +                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
394              }});
395  
396 <        t.start();
397 <        Thread.sleep(SMALL_DELAY_MS);
398 <        assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
396 >        assertTrue(pleaseOffer.await(MEDIUM_DELAY_MS, MILLISECONDS));
397 >        long t0 = System.nanoTime();
398 >        assertTrue(q.offer(zero, LONG_DELAY_MS, MILLISECONDS));
399 >        assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
400 >
401          t.interrupt();
402 <        t.join();
402 >        awaitTermination(t, MEDIUM_DELAY_MS);
403      }
404  
404
405      /**
406 <     * peek returns null
406 >     * peek() returns null if no active putter
407       */
408      public void testPeek() {
409          SynchronousQueue q = new SynchronousQueue();
# Line 411 | Line 411 | public class SynchronousQueueTest extend
411      }
412  
413      /**
414 <     * element throws NSEE
414 >     * element() throws NSEE if no active putter
415       */
416      public void testElement() {
417          SynchronousQueue q = new SynchronousQueue();
# Line 422 | Line 422 | public class SynchronousQueueTest extend
422      }
423  
424      /**
425 <     * remove throws NSEE if no active taker
425 >     * remove() throws NSEE if no active putter
426       */
427      public void testRemove() {
428          SynchronousQueue q = new SynchronousQueue();
# Line 578 | Line 578 | public class SynchronousQueueTest extend
578              }});
579  
580          joinPool(executor);
581
581      }
582  
583      /**
# Line 717 | Line 716 | public class SynchronousQueueTest extend
716          ArrayList l = new ArrayList();
717          Thread.sleep(SHORT_DELAY_MS);
718          q.drainTo(l, 1);
719 <        assertTrue(l.size() == 1);
719 >        assertEquals(1, l.size());
720          q.drainTo(l, 1);
721 <        assertTrue(l.size() == 2);
721 >        assertEquals(2, l.size());
722          assertTrue(l.contains(one));
723          assertTrue(l.contains(two));
724          t1.join();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines