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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines