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.29 by jsr166, Thu Nov 18 20:18:43 2010 UTC vs.
Revision 1.50 by jsr166, Thu Oct 8 00:26:16 2015 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 import junit.framework.*;
10 import java.util.*;
11 import java.util.concurrent.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.io.*;
10 >
11 > import java.util.ArrayList;
12 > import java.util.Arrays;
13 > import java.util.Collection;
14 > import java.util.Iterator;
15 > import java.util.NoSuchElementException;
16 > import java.util.concurrent.BlockingQueue;
17 > import java.util.concurrent.CountDownLatch;
18 > import java.util.concurrent.Executors;
19 > import java.util.concurrent.ExecutorService;
20 > import java.util.concurrent.SynchronousQueue;
21 >
22 > import junit.framework.Test;
23  
24   public class SynchronousQueueTest extends JSR166TestCase {
25  
# Line 27 | Line 36 | public class SynchronousQueueTest extend
36      }
37  
38      public static void main(String[] args) {
39 <        junit.textui.TestRunner.run(suite());
39 >        main(suite(), args);
40      }
41  
42      public static Test suite() {
# Line 39 | Line 48 | public class SynchronousQueueTest extend
48      /**
49       * Any SynchronousQueue is both empty and full
50       */
51 <    public void testEmptyFull(SynchronousQueue q) {
51 >    public void testEmptyFull()      { testEmptyFull(false); }
52 >    public void testEmptyFull_fair() { testEmptyFull(true); }
53 >    public void testEmptyFull(boolean fair) {
54 >        final SynchronousQueue q = new SynchronousQueue(fair);
55          assertTrue(q.isEmpty());
56          assertEquals(0, q.size());
57          assertEquals(0, q.remainingCapacity());
# Line 47 | Line 59 | public class SynchronousQueueTest extend
59      }
60  
61      /**
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        testEmptyFull(new SynchronousQueue(true));
61    }
62
63    /**
64     * offer(null) throws NPE
65     */
66    public void testOfferNull() {
67        try {
68            SynchronousQueue q = new SynchronousQueue();
69            q.offer(null);
70            shouldThrow();
71        } catch (NullPointerException success) {}
72    }
73
74    /**
75     * add(null) throws NPE
76     */
77    public void testAddNull() {
78        try {
79            SynchronousQueue q = new SynchronousQueue();
80            q.add(null);
81            shouldThrow();
82        } catch (NullPointerException success) {}
83    }
84
85    /**
62       * offer fails if no active taker
63       */
64 <    public void testOffer() {
65 <        SynchronousQueue q = new SynchronousQueue();
64 >    public void testOffer()      { testOffer(false); }
65 >    public void testOffer_fair() { testOffer(true); }
66 >    public void testOffer(boolean fair) {
67 >        SynchronousQueue q = new SynchronousQueue(fair);
68          assertFalse(q.offer(one));
69      }
70  
71      /**
72 <     * add throws ISE if no active taker
72 >     * add throws IllegalStateException if no active taker
73       */
74 <    public void testAdd() {
74 >    public void testAdd()      { testAdd(false); }
75 >    public void testAdd_fair() { testAdd(true); }
76 >    public void testAdd(boolean fair) {
77 >        SynchronousQueue q = new SynchronousQueue(fair);
78 >        assertEquals(0, q.remainingCapacity());
79          try {
98            SynchronousQueue q = new SynchronousQueue();
99            assertEquals(0, q.remainingCapacity());
80              q.add(one);
81              shouldThrow();
82          } catch (IllegalStateException success) {}
83      }
84  
85      /**
86 <     * addAll(null) throws NPE
86 >     * addAll(this) throws IllegalArgumentException
87       */
88 <    public void testAddAll1() {
88 >    public void testAddAll_self()      { testAddAll_self(false); }
89 >    public void testAddAll_self_fair() { testAddAll_self(true); }
90 >    public void testAddAll_self(boolean fair) {
91 >        SynchronousQueue q = new SynchronousQueue(fair);
92          try {
110            SynchronousQueue q = new SynchronousQueue();
111            q.addAll(null);
112            shouldThrow();
113        } catch (NullPointerException success) {}
114    }
115
116    /**
117     * addAll(this) throws IAE
118     */
119    public void testAddAllSelf() {
120        try {
121            SynchronousQueue q = new SynchronousQueue();
93              q.addAll(q);
94              shouldThrow();
95          } catch (IllegalArgumentException success) {}
96      }
97  
98      /**
128     * addAll of a collection with null elements throws NPE
129     */
130    public void testAddAll2() {
131        try {
132            SynchronousQueue q = new SynchronousQueue();
133            Integer[] ints = new Integer[1];
134            q.addAll(Arrays.asList(ints));
135            shouldThrow();
136        } catch (NullPointerException success) {}
137    }
138
139    /**
99       * addAll throws ISE if no active taker
100       */
101 <    public void testAddAll4() {
101 >    public void testAddAll_ISE()      { testAddAll_ISE(false); }
102 >    public void testAddAll_ISE_fair() { testAddAll_ISE(true); }
103 >    public void testAddAll_ISE(boolean fair) {
104 >        SynchronousQueue q = new SynchronousQueue(fair);
105 >        Integer[] ints = new Integer[1];
106 >        for (int i = 0; i < ints.length; i++)
107 >            ints[i] = i;
108 >        Collection<Integer> coll = Arrays.asList(ints);
109          try {
110 <            SynchronousQueue q = new SynchronousQueue();
145 <            Integer[] ints = new Integer[1];
146 <            for (int i = 0; i < 1; ++i)
147 <                ints[i] = new Integer(i);
148 <            q.addAll(Arrays.asList(ints));
110 >            q.addAll(coll);
111              shouldThrow();
112          } catch (IllegalStateException success) {}
113      }
114  
115      /**
154     * put(null) throws NPE
155     */
156    public void testPutNull() throws InterruptedException {
157        try {
158            SynchronousQueue q = new SynchronousQueue();
159            q.put(null);
160            shouldThrow();
161        } catch (NullPointerException success) {}
162     }
163
164    /**
116       * put blocks interruptibly if no active taker
117       */
118 <    public void testBlockingPut() throws InterruptedException {
119 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
118 >    public void testBlockingPut()      { testBlockingPut(false); }
119 >    public void testBlockingPut_fair() { testBlockingPut(true); }
120 >    public void testBlockingPut(boolean fair) {
121 >        final SynchronousQueue q = new SynchronousQueue(fair);
122 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
123 >        Thread t = newStartedThread(new CheckedRunnable() {
124              public void realRun() throws InterruptedException {
125 <                SynchronousQueue q = new SynchronousQueue();
126 <                q.put(zero);
127 <            }});
128 <
129 <        t.start();
130 <        Thread.sleep(SHORT_DELAY_MS);
176 <        t.interrupt();
177 <        t.join();
178 <    }
125 >                Thread.currentThread().interrupt();
126 >                try {
127 >                    q.put(99);
128 >                    shouldThrow();
129 >                } catch (InterruptedException success) {}
130 >                assertFalse(Thread.interrupted());
131  
132 <    /**
181 <     * put blocks waiting for take
182 <     */
183 <    public void testPutWithTake() throws InterruptedException {
184 <        final SynchronousQueue q = new SynchronousQueue();
185 <        Thread t = new Thread(new CheckedRunnable() {
186 <            public void realRun() throws InterruptedException {
187 <                int added = 0;
132 >                pleaseInterrupt.countDown();
133                  try {
134 <                    while (true) {
135 <                        q.put(added);
136 <                        ++added;
137 <                    }
193 <                } catch (InterruptedException success) {
194 <                    assertEquals(1, added);
195 <                }
134 >                    q.put(99);
135 >                    shouldThrow();
136 >                } catch (InterruptedException success) {}
137 >                assertFalse(Thread.interrupted());
138              }});
139  
140 <        t.start();
141 <        Thread.sleep(SHORT_DELAY_MS);
200 <        assertEquals(0, q.take());
201 <        Thread.sleep(SHORT_DELAY_MS);
140 >        await(pleaseInterrupt);
141 >        assertThreadStaysAlive(t);
142          t.interrupt();
143 <        t.join();
143 >        awaitTermination(t);
144 >        assertEquals(0, q.remainingCapacity());
145      }
146  
147      /**
148 <     * timed offer times out if elements not taken
148 >     * put blocks interruptibly waiting for take
149       */
150 <    public void testTimedOffer(final SynchronousQueue q)
151 <            throws InterruptedException {
150 >    public void testPutWithTake()      { testPutWithTake(false); }
151 >    public void testPutWithTake_fair() { testPutWithTake(true); }
152 >    public void testPutWithTake(boolean fair) {
153 >        final SynchronousQueue q = new SynchronousQueue(fair);
154 >        final CountDownLatch pleaseTake = new CountDownLatch(1);
155          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
156          Thread t = newStartedThread(new CheckedRunnable() {
157              public void realRun() throws InterruptedException {
158 <                long t0 = System.nanoTime();
159 <                assertFalse(q.offer(new Object(), SHORT_DELAY_MS, MILLISECONDS));
160 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
158 >                pleaseTake.countDown();
159 >                q.put(one);
160 >
161                  pleaseInterrupt.countDown();
218                t0 = System.nanoTime();
162                  try {
163 <                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
163 >                    q.put(99);
164                      shouldThrow();
165                  } catch (InterruptedException success) {}
166 <                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
166 >                assertFalse(Thread.interrupted());
167              }});
168  
169 <        assertTrue(pleaseInterrupt.await(MEDIUM_DELAY_MS, MILLISECONDS));
170 <        t.interrupt();
171 <        awaitTermination(t, MEDIUM_DELAY_MS);
172 <    }
230 <
231 <    /**
232 <     * timed offer times out if elements not taken
233 <     */
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
247 <     */
248 <    public void testFairBlockingPut() throws InterruptedException {
249 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
250 <            public void realRun() throws InterruptedException {
251 <                SynchronousQueue q = new SynchronousQueue(true);
252 <                q.put(zero);
253 <            }});
169 >        await(pleaseTake);
170 >        assertEquals(0, q.remainingCapacity());
171 >        try { assertSame(one, q.take()); }
172 >        catch (InterruptedException e) { threadUnexpectedException(e); }
173  
174 <        t.start();
175 <        Thread.sleep(SHORT_DELAY_MS);
174 >        await(pleaseInterrupt);
175 >        assertThreadStaysAlive(t);
176          t.interrupt();
177 <        t.join();
177 >        awaitTermination(t);
178 >        assertEquals(0, q.remainingCapacity());
179      }
180  
181      /**
182 <     * put blocks waiting for take
182 >     * timed offer times out if elements not taken
183       */
184 <    public void testFairPutWithTake() throws InterruptedException {
185 <        final SynchronousQueue q = new SynchronousQueue(true);
186 <        Thread t = new Thread(new CheckedRunnable() {
184 >    public void testTimedOffer()      { testTimedOffer(false); }
185 >    public void testTimedOffer_fair() { testTimedOffer(true); }
186 >    public void testTimedOffer(boolean fair) {
187 >        final SynchronousQueue q = new SynchronousQueue(fair);
188 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
189 >        Thread t = newStartedThread(new CheckedRunnable() {
190              public void realRun() throws InterruptedException {
191 <                int added = 0;
191 >                long startTime = System.nanoTime();
192 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
193 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
194 >                pleaseInterrupt.countDown();
195                  try {
196 <                    while (true) {
197 <                        q.put(added);
198 <                        ++added;
273 <                    }
274 <                } catch (InterruptedException success) {
275 <                    assertEquals(1, added);
276 <                }
277 <            }});
278 <
279 <        t.start();
280 <        Thread.sleep(SHORT_DELAY_MS);
281 <        assertEquals(0, q.take());
282 <        Thread.sleep(SHORT_DELAY_MS);
283 <        t.interrupt();
284 <        t.join();
285 <    }
286 <
287 <    /**
288 <     * take blocks interruptibly when empty
289 <     */
290 <    public void testFairTakeFromEmpty() throws InterruptedException {
291 <        final SynchronousQueue q = new SynchronousQueue(true);
292 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
293 <            public void realRun() throws InterruptedException {
294 <                q.take();
196 >                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
197 >                    shouldThrow();
198 >                } catch (InterruptedException success) {}
199              }});
200  
201 <        t.start();
202 <        Thread.sleep(SHORT_DELAY_MS);
201 >        await(pleaseInterrupt);
202 >        assertThreadStaysAlive(t);
203          t.interrupt();
204 <        t.join();
204 >        awaitTermination(t);
205      }
206  
207      /**
208       * poll return null if no active putter
209       */
210 <    public void testPoll() {
211 <        SynchronousQueue q = new SynchronousQueue();
210 >    public void testPoll()      { testPoll(false); }
211 >    public void testPoll_fair() { testPoll(true); }
212 >    public void testPoll(boolean fair) {
213 >        final SynchronousQueue q = new SynchronousQueue(fair);
214          assertNull(q.poll());
215      }
216  
217      /**
218       * timed poll with zero timeout times out if no active putter
219       */
220 <    public void testTimedPoll0() throws InterruptedException {
221 <        SynchronousQueue q = new SynchronousQueue();
222 <        assertNull(q.poll(0, MILLISECONDS));
220 >    public void testTimedPoll0()      { testTimedPoll0(false); }
221 >    public void testTimedPoll0_fair() { testTimedPoll0(true); }
222 >    public void testTimedPoll0(boolean fair) {
223 >        final SynchronousQueue q = new SynchronousQueue(fair);
224 >        try { assertNull(q.poll(0, MILLISECONDS)); }
225 >        catch (InterruptedException e) { threadUnexpectedException(e); }
226      }
227  
228      /**
229       * timed poll with nonzero timeout times out if no active putter
230       */
231 <    public void testTimedPoll() throws InterruptedException {
232 <        SynchronousQueue q = new SynchronousQueue();
233 <        long t0 = System.nanoTime();
234 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
235 <        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
236 <    }
237 <
238 <    /**
330 <     * Interrupted timed poll throws InterruptedException instead of
331 <     * returning timeout status
332 <     */
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 <                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 <        threadStarted.await();
349 <        Thread.sleep(SHORT_DELAY_MS);
350 <        t.interrupt();
351 <        awaitTermination(t, MEDIUM_DELAY_MS);
352 <    }
353 <
354 <    /**
355 <     * Interrupted timed poll throws InterruptedException instead of
356 <     * returning timeout status
357 <     */
358 <    public void testInterruptedTimedPoll() throws InterruptedException {
359 <        testInterruptedTimedPoll(new SynchronousQueue());
360 <    }
361 <
362 <    /**
363 <     * Interrupted timed poll throws InterruptedException instead of
364 <     * returning timeout status
365 <     */
366 <    public void testFairInterruptedTimedPoll() throws InterruptedException {
367 <        testInterruptedTimedPoll(new SynchronousQueue(true));
231 >    public void testTimedPoll()      { testTimedPoll(false); }
232 >    public void testTimedPoll_fair() { testTimedPoll(true); }
233 >    public void testTimedPoll(boolean fair) {
234 >        final SynchronousQueue q = new SynchronousQueue(fair);
235 >        long startTime = System.nanoTime();
236 >        try { assertNull(q.poll(timeoutMillis(), MILLISECONDS)); }
237 >        catch (InterruptedException e) { threadUnexpectedException(e); }
238 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
239      }
240  
241      /**
242       * timed poll before a delayed offer times out, returning null;
243       * after offer succeeds; on interruption throws
244       */
245 <    public void testFairTimedPollWithOffer() throws InterruptedException {
246 <        final SynchronousQueue q = new SynchronousQueue(true);
245 >    public void testTimedPollWithOffer()      { testTimedPollWithOffer(false); }
246 >    public void testTimedPollWithOffer_fair() { testTimedPollWithOffer(true); }
247 >    public void testTimedPollWithOffer(boolean fair) {
248 >        final SynchronousQueue q = new SynchronousQueue(fair);
249          final CountDownLatch pleaseOffer = new CountDownLatch(1);
250 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
251          Thread t = newStartedThread(new CheckedRunnable() {
252              public void realRun() throws InterruptedException {
253 <                long t0 = System.nanoTime();
254 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
255 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
253 >                long startTime = System.nanoTime();
254 >                assertNull(q.poll(timeoutMillis(), MILLISECONDS));
255 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
256  
257                  pleaseOffer.countDown();
258 <                t0 = System.nanoTime();
258 >                startTime = System.nanoTime();
259                  assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
386                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
260  
261 <                t0 = System.nanoTime();
261 >                Thread.currentThread().interrupt();
262                  try {
263                      q.poll(LONG_DELAY_MS, MILLISECONDS);
264                      shouldThrow();
265                  } catch (InterruptedException success) {}
266 <                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
266 >                assertFalse(Thread.interrupted());
267 >
268 >                pleaseInterrupt.countDown();
269 >                try {
270 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
271 >                    shouldThrow();
272 >                } catch (InterruptedException success) {}
273 >                assertFalse(Thread.interrupted());
274 >
275 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
276              }});
277  
278 <        assertTrue(pleaseOffer.await(MEDIUM_DELAY_MS, MILLISECONDS));
279 <        long t0 = System.nanoTime();
280 <        assertTrue(q.offer(zero, LONG_DELAY_MS, MILLISECONDS));
281 <        assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
282 <        
278 >        await(pleaseOffer);
279 >        long startTime = System.nanoTime();
280 >        try { assertTrue(q.offer(zero, LONG_DELAY_MS, MILLISECONDS)); }
281 >        catch (InterruptedException e) { threadUnexpectedException(e); }
282 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
283 >
284 >        await(pleaseInterrupt);
285 >        assertThreadStaysAlive(t);
286          t.interrupt();
287 <        awaitTermination(t, MEDIUM_DELAY_MS);
287 >        awaitTermination(t);
288      }
289  
290      /**
291       * peek() returns null if no active putter
292       */
293 <    public void testPeek() {
294 <        SynchronousQueue q = new SynchronousQueue();
293 >    public void testPeek()      { testPeek(false); }
294 >    public void testPeek_fair() { testPeek(true); }
295 >    public void testPeek(boolean fair) {
296 >        final SynchronousQueue q = new SynchronousQueue(fair);
297          assertNull(q.peek());
298      }
299  
300      /**
301 <     * element() throws NSEE if no active putter
301 >     * element() throws NoSuchElementException if no active putter
302       */
303 <    public void testElement() {
304 <        SynchronousQueue q = new SynchronousQueue();
303 >    public void testElement()      { testElement(false); }
304 >    public void testElement_fair() { testElement(true); }
305 >    public void testElement(boolean fair) {
306 >        final SynchronousQueue q = new SynchronousQueue(fair);
307          try {
308              q.element();
309              shouldThrow();
# Line 422 | Line 311 | public class SynchronousQueueTest extend
311      }
312  
313      /**
314 <     * remove() throws NSEE if no active putter
314 >     * remove() throws NoSuchElementException if no active putter
315       */
316 <    public void testRemove() {
317 <        SynchronousQueue q = new SynchronousQueue();
316 >    public void testRemove()      { testRemove(false); }
317 >    public void testRemove_fair() { testRemove(true); }
318 >    public void testRemove(boolean fair) {
319 >        final SynchronousQueue q = new SynchronousQueue(fair);
320          try {
321              q.remove();
322              shouldThrow();
# Line 433 | Line 324 | public class SynchronousQueueTest extend
324      }
325  
326      /**
436     * remove(x) returns false
437     */
438    public void testRemoveElement() {
439        SynchronousQueue q = new SynchronousQueue();
440        assertFalse(q.remove(zero));
441        assertTrue(q.isEmpty());
442    }
443
444    /**
327       * contains returns false
328       */
329 <    public void testContains() {
330 <        SynchronousQueue q = new SynchronousQueue();
329 >    public void testContains()      { testContains(false); }
330 >    public void testContains_fair() { testContains(true); }
331 >    public void testContains(boolean fair) {
332 >        final SynchronousQueue q = new SynchronousQueue(fair);
333          assertFalse(q.contains(zero));
334      }
335  
336      /**
337       * clear ensures isEmpty
338       */
339 <    public void testClear() {
340 <        SynchronousQueue q = new SynchronousQueue();
339 >    public void testClear()      { testClear(false); }
340 >    public void testClear_fair() { testClear(true); }
341 >    public void testClear(boolean fair) {
342 >        final SynchronousQueue q = new SynchronousQueue(fair);
343          q.clear();
344          assertTrue(q.isEmpty());
345      }
# Line 461 | Line 347 | public class SynchronousQueueTest extend
347      /**
348       * containsAll returns false unless empty
349       */
350 <    public void testContainsAll() {
351 <        SynchronousQueue q = new SynchronousQueue();
350 >    public void testContainsAll()      { testContainsAll(false); }
351 >    public void testContainsAll_fair() { testContainsAll(true); }
352 >    public void testContainsAll(boolean fair) {
353 >        final SynchronousQueue q = new SynchronousQueue(fair);
354          Integer[] empty = new Integer[0];
355          assertTrue(q.containsAll(Arrays.asList(empty)));
356          Integer[] ints = new Integer[1]; ints[0] = zero;
# Line 472 | Line 360 | public class SynchronousQueueTest extend
360      /**
361       * retainAll returns false
362       */
363 <    public void testRetainAll() {
364 <        SynchronousQueue q = new SynchronousQueue();
363 >    public void testRetainAll()      { testRetainAll(false); }
364 >    public void testRetainAll_fair() { testRetainAll(true); }
365 >    public void testRetainAll(boolean fair) {
366 >        final SynchronousQueue q = new SynchronousQueue(fair);
367          Integer[] empty = new Integer[0];
368          assertFalse(q.retainAll(Arrays.asList(empty)));
369          Integer[] ints = new Integer[1]; ints[0] = zero;
# Line 483 | Line 373 | public class SynchronousQueueTest extend
373      /**
374       * removeAll returns false
375       */
376 <    public void testRemoveAll() {
377 <        SynchronousQueue q = new SynchronousQueue();
376 >    public void testRemoveAll()      { testRemoveAll(false); }
377 >    public void testRemoveAll_fair() { testRemoveAll(true); }
378 >    public void testRemoveAll(boolean fair) {
379 >        final SynchronousQueue q = new SynchronousQueue(fair);
380          Integer[] empty = new Integer[0];
381          assertFalse(q.removeAll(Arrays.asList(empty)));
382          Integer[] ints = new Integer[1]; ints[0] = zero;
383          assertFalse(q.containsAll(Arrays.asList(ints)));
384      }
385  
494
386      /**
387       * toArray is empty
388       */
389 <    public void testToArray() {
390 <        SynchronousQueue q = new SynchronousQueue();
389 >    public void testToArray()      { testToArray(false); }
390 >    public void testToArray_fair() { testToArray(true); }
391 >    public void testToArray(boolean fair) {
392 >        final SynchronousQueue q = new SynchronousQueue(fair);
393          Object[] o = q.toArray();
394 <        assertEquals(o.length, 0);
394 >        assertEquals(0, o.length);
395      }
396  
397      /**
398 <     * toArray(a) is nulled at position 0
398 >     * toArray(Integer array) returns its argument with the first
399 >     * element (if present) nulled out
400       */
401 <    public void testToArray2() {
402 <        SynchronousQueue q = new SynchronousQueue();
403 <        Integer[] ints = new Integer[1];
404 <        assertNull(ints[0]);
401 >    public void testToArray2()      { testToArray2(false); }
402 >    public void testToArray2_fair() { testToArray2(true); }
403 >    public void testToArray2(boolean fair) {
404 >        final SynchronousQueue<Integer> q
405 >            = new SynchronousQueue<Integer>(fair);
406 >        Integer[] a;
407 >
408 >        a = new Integer[0];
409 >        assertSame(a, q.toArray(a));
410 >
411 >        a = new Integer[3];
412 >        Arrays.fill(a, 42);
413 >        assertSame(a, q.toArray(a));
414 >        assertNull(a[0]);
415 >        for (int i = 1; i < a.length; i++)
416 >            assertEquals(42, (int) a[i]);
417      }
418  
419      /**
420       * toArray(null) throws NPE
421       */
422 <    public void testToArray_BadArg() {
423 <        SynchronousQueue q = new SynchronousQueue();
422 >    public void testToArray_null()      { testToArray_null(false); }
423 >    public void testToArray_null_fair() { testToArray_null(true); }
424 >    public void testToArray_null(boolean fair) {
425 >        final SynchronousQueue q = new SynchronousQueue(fair);
426          try {
427 <            Object o[] = q.toArray(null);
427 >            Object[] o = q.toArray(null);
428              shouldThrow();
429          } catch (NullPointerException success) {}
430      }
431  
524
432      /**
433       * iterator does not traverse any elements
434       */
435 <    public void testIterator() {
436 <        SynchronousQueue q = new SynchronousQueue();
437 <        Iterator it = q.iterator();
438 <        assertFalse(it.hasNext());
532 <        try {
533 <            Object x = it.next();
534 <            shouldThrow();
535 <        } catch (NoSuchElementException success) {}
435 >    public void testIterator()      { testIterator(false); }
436 >    public void testIterator_fair() { testIterator(true); }
437 >    public void testIterator(boolean fair) {
438 >        assertIteratorExhausted(new SynchronousQueue(fair).iterator());
439      }
440  
441      /**
442       * iterator remove throws ISE
443       */
444 <    public void testIteratorRemove() {
445 <        SynchronousQueue q = new SynchronousQueue();
444 >    public void testIteratorRemove()      { testIteratorRemove(false); }
445 >    public void testIteratorRemove_fair() { testIteratorRemove(true); }
446 >    public void testIteratorRemove(boolean fair) {
447 >        final SynchronousQueue q = new SynchronousQueue(fair);
448          Iterator it = q.iterator();
449          try {
450              it.remove();
# Line 550 | Line 455 | public class SynchronousQueueTest extend
455      /**
456       * toString returns a non-null string
457       */
458 <    public void testToString() {
459 <        SynchronousQueue q = new SynchronousQueue();
458 >    public void testToString()      { testToString(false); }
459 >    public void testToString_fair() { testToString(true); }
460 >    public void testToString(boolean fair) {
461 >        final SynchronousQueue q = new SynchronousQueue(fair);
462          String s = q.toString();
463          assertNotNull(s);
464      }
465  
559
466      /**
467       * offer transfers elements across Executor tasks
468       */
469 <    public void testOfferInExecutor() {
470 <        final SynchronousQueue q = new SynchronousQueue();
471 <        ExecutorService executor = Executors.newFixedThreadPool(2);
472 <
473 <        executor.execute(new CheckedRunnable() {
474 <            public void realRun() throws InterruptedException {
475 <                assertFalse(q.offer(one));
476 <                assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS));
477 <                assertEquals(0, q.remainingCapacity());
478 <            }});
479 <
480 <        executor.execute(new CheckedRunnable() {
481 <            public void realRun() throws InterruptedException {
482 <                Thread.sleep(SMALL_DELAY_MS);
483 <                assertSame(one, q.take());
484 <            }});
485 <
486 <        joinPool(executor);
469 >    public void testOfferInExecutor()      { testOfferInExecutor(false); }
470 >    public void testOfferInExecutor_fair() { testOfferInExecutor(true); }
471 >    public void testOfferInExecutor(boolean fair) {
472 >        final SynchronousQueue q = new SynchronousQueue(fair);
473 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
474 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
475 >        try (PoolCleaner cleaner = cleaner(executor)) {
476 >
477 >            executor.execute(new CheckedRunnable() {
478 >                public void realRun() throws InterruptedException {
479 >                    assertFalse(q.offer(one));
480 >                    threadsStarted.await();
481 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
482 >                    assertEquals(0, q.remainingCapacity());
483 >                }});
484 >
485 >            executor.execute(new CheckedRunnable() {
486 >                public void realRun() throws InterruptedException {
487 >                    threadsStarted.await();
488 >                    assertSame(one, q.take());
489 >                }});
490 >        }
491      }
492  
493      /**
494 <     * poll retrieves elements across Executor threads
494 >     * timed poll retrieves elements across Executor threads
495       */
496 <    public void testPollInExecutor() {
497 <        final SynchronousQueue q = new SynchronousQueue();
498 <        ExecutorService executor = Executors.newFixedThreadPool(2);
499 <        executor.execute(new CheckedRunnable() {
500 <            public void realRun() throws InterruptedException {
501 <                assertNull(q.poll());
502 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
503 <                assertTrue(q.isEmpty());
504 <            }});
505 <
506 <        executor.execute(new CheckedRunnable() {
507 <            public void realRun() throws InterruptedException {
508 <                Thread.sleep(SHORT_DELAY_MS);
509 <                q.put(one);
510 <            }});
511 <
512 <        joinPool(executor);
496 >    public void testPollInExecutor()      { testPollInExecutor(false); }
497 >    public void testPollInExecutor_fair() { testPollInExecutor(true); }
498 >    public void testPollInExecutor(boolean fair) {
499 >        final SynchronousQueue q = new SynchronousQueue(fair);
500 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
501 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
502 >        try (PoolCleaner cleaner = cleaner(executor)) {
503 >            executor.execute(new CheckedRunnable() {
504 >                public void realRun() throws InterruptedException {
505 >                    assertNull(q.poll());
506 >                    threadsStarted.await();
507 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
508 >                    assertTrue(q.isEmpty());
509 >                }});
510 >
511 >            executor.execute(new CheckedRunnable() {
512 >                public void realRun() throws InterruptedException {
513 >                    threadsStarted.await();
514 >                    q.put(one);
515 >                }});
516 >        }
517      }
518  
519      /**
520       * a deserialized serialized queue is usable
521       */
522 <    public void testSerialization() throws Exception {
523 <        SynchronousQueue q = new SynchronousQueue();
524 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
525 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
526 <        out.writeObject(q);
527 <        out.close();
528 <
529 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
530 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
531 <        SynchronousQueue r = (SynchronousQueue)in.readObject();
532 <        assertEquals(q.size(), r.size());
533 <        while (!q.isEmpty())
534 <            assertEquals(q.remove(), r.remove());
535 <    }
536 <
537 <    /**
624 <     * drainTo(null) throws NPE
625 <     */
626 <    public void testDrainToNull() {
627 <        SynchronousQueue q = new SynchronousQueue();
628 <        try {
629 <            q.drainTo(null);
630 <            shouldThrow();
631 <        } catch (NullPointerException success) {}
632 <    }
633 <
634 <    /**
635 <     * drainTo(this) throws IAE
636 <     */
637 <    public void testDrainToSelf() {
638 <        SynchronousQueue q = new SynchronousQueue();
639 <        try {
640 <            q.drainTo(q);
641 <            shouldThrow();
642 <        } catch (IllegalArgumentException success) {}
522 >    public void testSerialization() {
523 >        final SynchronousQueue x = new SynchronousQueue();
524 >        final SynchronousQueue y = new SynchronousQueue(false);
525 >        final SynchronousQueue z = new SynchronousQueue(true);
526 >        assertSerialEquals(x, y);
527 >        assertNotSerialEquals(x, z);
528 >        SynchronousQueue[] qs = { x, y, z };
529 >        for (SynchronousQueue q : qs) {
530 >            SynchronousQueue clone = serialClone(q);
531 >            assertNotSame(q, clone);
532 >            assertSerialEquals(q, clone);
533 >            assertTrue(clone.isEmpty());
534 >            assertEquals(0, clone.size());
535 >            assertEquals(0, clone.remainingCapacity());
536 >            assertFalse(clone.offer(zero));
537 >        }
538      }
539  
540      /**
541       * drainTo(c) of empty queue doesn't transfer elements
542       */
543 <    public void testDrainTo() {
544 <        SynchronousQueue q = new SynchronousQueue();
543 >    public void testDrainTo()      { testDrainTo(false); }
544 >    public void testDrainTo_fair() { testDrainTo(true); }
545 >    public void testDrainTo(boolean fair) {
546 >        final SynchronousQueue q = new SynchronousQueue(fair);
547          ArrayList l = new ArrayList();
548          q.drainTo(l);
549 <        assertEquals(q.size(), 0);
550 <        assertEquals(l.size(), 0);
549 >        assertEquals(0, q.size());
550 >        assertEquals(0, l.size());
551      }
552  
553      /**
554       * drainTo empties queue, unblocking a waiting put.
555       */
556 <    public void testDrainToWithActivePut() throws InterruptedException {
557 <        final SynchronousQueue q = new SynchronousQueue();
558 <        Thread t = new Thread(new CheckedRunnable() {
556 >    public void testDrainToWithActivePut()      { testDrainToWithActivePut(false); }
557 >    public void testDrainToWithActivePut_fair() { testDrainToWithActivePut(true); }
558 >    public void testDrainToWithActivePut(boolean fair) {
559 >        final SynchronousQueue q = new SynchronousQueue(fair);
560 >        Thread t = newStartedThread(new CheckedRunnable() {
561              public void realRun() throws InterruptedException {
562 <                q.put(new Integer(1));
562 >                q.put(one);
563              }});
564  
666        t.start();
565          ArrayList l = new ArrayList();
566 <        Thread.sleep(SHORT_DELAY_MS);
567 <        q.drainTo(l);
568 <        assertTrue(l.size() <= 1);
569 <        if (l.size() > 0)
570 <            assertEquals(l.get(0), new Integer(1));
571 <        t.join();
572 <        assertTrue(l.size() <= 1);
573 <    }
574 <
575 <    /**
678 <     * drainTo(null, n) throws NPE
679 <     */
680 <    public void testDrainToNullN() {
681 <        SynchronousQueue q = new SynchronousQueue();
682 <        try {
683 <            q.drainTo(null, 0);
684 <            shouldThrow();
685 <        } catch (NullPointerException success) {}
686 <    }
687 <
688 <    /**
689 <     * drainTo(this, n) throws IAE
690 <     */
691 <    public void testDrainToSelfN() {
692 <        SynchronousQueue q = new SynchronousQueue();
693 <        try {
694 <            q.drainTo(q, 0);
695 <            shouldThrow();
696 <        } catch (IllegalArgumentException success) {}
566 >        long startTime = System.nanoTime();
567 >        while (l.isEmpty()) {
568 >            q.drainTo(l);
569 >            if (millisElapsedSince(startTime) > LONG_DELAY_MS)
570 >                fail("timed out");
571 >            Thread.yield();
572 >        }
573 >        assertTrue(l.size() == 1);
574 >        assertSame(one, l.get(0));
575 >        awaitTermination(t);
576      }
577  
578      /**
# Line 701 | Line 580 | public class SynchronousQueueTest extend
580       */
581      public void testDrainToN() throws InterruptedException {
582          final SynchronousQueue q = new SynchronousQueue();
583 <        Thread t1 = new Thread(new CheckedRunnable() {
583 >        Thread t1 = newStartedThread(new CheckedRunnable() {
584              public void realRun() throws InterruptedException {
585                  q.put(one);
586              }});
587  
588 <        Thread t2 = new Thread(new CheckedRunnable() {
588 >        Thread t2 = newStartedThread(new CheckedRunnable() {
589              public void realRun() throws InterruptedException {
590                  q.put(two);
591              }});
592  
714        t1.start();
715        t2.start();
593          ArrayList l = new ArrayList();
594 <        Thread.sleep(SHORT_DELAY_MS);
595 <        q.drainTo(l, 1);
594 >        int drained;
595 >        while ((drained = q.drainTo(l, 1)) == 0) Thread.yield();
596 >        assertEquals(1, drained);
597          assertEquals(1, l.size());
598 <        q.drainTo(l, 1);
598 >        while ((drained = q.drainTo(l, 1)) == 0) Thread.yield();
599 >        assertEquals(1, drained);
600          assertEquals(2, l.size());
601          assertTrue(l.contains(one));
602          assertTrue(l.contains(two));
603 <        t1.join();
604 <        t2.join();
603 >        awaitTermination(t1);
604 >        awaitTermination(t2);
605 >    }
606 >
607 >    /**
608 >     * remove(null), contains(null) always return false
609 >     */
610 >    public void testNeverContainsNull() {
611 >        Collection<?> q = new SynchronousQueue();
612 >        assertFalse(q.contains(null));
613 >        assertFalse(q.remove(null));
614      }
615  
616   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines