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.33 by dl, Fri May 6 11:22:07 2011 UTC vs.
Revision 1.65 by jsr166, Tue Aug 13 23:06:39 2019 UTC

# Line 6 | Line 6
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
107 <     */
108 <    public void testAddAll1() {
109 <        try {
110 <            SynchronousQueue q = new SynchronousQueue();
111 <            q.addAll(null);
112 <            shouldThrow();
113 <        } catch (NullPointerException success) {}
114 <    }
115 <
116 <    /**
117 <     * addAll(this) throws IAE
86 >     * addAll(this) throws IllegalArgumentException
87       */
88 <    public void testAddAllSelf() {
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 {
121            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
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 <    /**
140 <     * 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();
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 <        delay(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 <        delay(SHORT_DELAY_MS);
200 <        assertEquals(0, q.take());
201 <        delay(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  
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 >                Thread.currentThread().interrupt();
162 >                try {
163 >                    q.put(99);
164 >                    shouldThrow();
165 >                } catch (InterruptedException success) {}
166 >                assertFalse(Thread.interrupted());
167 >
168                  pleaseInterrupt.countDown();
218                t0 = System.nanoTime();
169                  try {
170 <                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
170 >                    q.put(99);
171                      shouldThrow();
172                  } catch (InterruptedException success) {}
173 <                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
173 >                assertFalse(Thread.interrupted());
174              }});
175  
176 <        assertTrue(pleaseInterrupt.await(MEDIUM_DELAY_MS, MILLISECONDS));
177 <        t.interrupt();
178 <        awaitTermination(t, MEDIUM_DELAY_MS);
179 <    }
176 >        await(pleaseTake);
177 >        assertEquals(0, q.remainingCapacity());
178 >        try { assertSame(one, q.take()); }
179 >        catch (InterruptedException e) { threadUnexpectedException(e); }
180  
181 <    /**
182 <     * timed offer times out if elements not taken
183 <     */
184 <    public void testTimedOffer() throws InterruptedException {
185 <        testTimedOffer(new SynchronousQueue());
181 >        await(pleaseInterrupt);
182 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.WAITING);
183 >        t.interrupt();
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 <        testTimedOffer(new SynchronousQueue(true));
193 <    }
194 <
195 <    /**
246 <     * put blocks interruptibly if no active taker
247 <     */
248 <    public void testFairBlockingPut() throws InterruptedException {
249 <        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 <                SynchronousQueue q = new SynchronousQueue(true);
252 <                q.put(zero);
253 <            }});
197 >                long startTime = System.nanoTime();
198  
199 <        t.start();
200 <        delay(SHORT_DELAY_MS);
257 <        t.interrupt();
258 <        t.join();
259 <    }
199 >                assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
200 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
201  
202 <    /**
262 <     * put blocks waiting for take
263 <     */
264 <    public void testFairPutWithTake() throws InterruptedException {
265 <        final SynchronousQueue q = new SynchronousQueue(true);
266 <        Thread t = new Thread(new CheckedRunnable() {
267 <            public void realRun() throws InterruptedException {
268 <                int added = 0;
202 >                Thread.currentThread().interrupt();
203                  try {
204 <                    while (true) {
205 <                        q.put(added);
206 <                        ++added;
207 <                    }
274 <                } catch (InterruptedException success) {
275 <                    assertEquals(1, added);
276 <                }
277 <            }});
204 >                    q.offer(new Object(), randomTimeout(), randomTimeUnit());
205 >                    shouldThrow();
206 >                } catch (InterruptedException success) {}
207 >                assertFalse(Thread.interrupted());
208  
209 <        t.start();
210 <        delay(SHORT_DELAY_MS);
211 <        assertEquals(0, q.take());
212 <        delay(SHORT_DELAY_MS);
213 <        t.interrupt();
214 <        t.join();
285 <    }
209 >                pleaseInterrupt.countDown();
210 >                try {
211 >                    q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
212 >                    shouldThrow();
213 >                } catch (InterruptedException success) {}
214 >                assertFalse(Thread.interrupted());
215  
216 <    /**
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();
216 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
217              }});
218  
219 <        t.start();
220 <        delay(SHORT_DELAY_MS);
219 >        await(pleaseInterrupt);
220 >        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
221          t.interrupt();
222 <        t.join();
222 >        awaitTermination(t);
223      }
224  
225      /**
226       * poll return null if no active putter
227       */
228 <    public void testPoll() {
229 <        SynchronousQueue q = new SynchronousQueue();
228 >    public void testPoll()      { testPoll(false); }
229 >    public void testPoll_fair() { testPoll(true); }
230 >    public void testPoll(boolean fair) {
231 >        final SynchronousQueue q = new SynchronousQueue(fair);
232          assertNull(q.poll());
233      }
234  
235      /**
236       * timed poll with zero timeout times out if no active putter
237       */
238 <    public void testTimedPoll0() throws InterruptedException {
239 <        SynchronousQueue q = new SynchronousQueue();
240 <        assertNull(q.poll(0, MILLISECONDS));
238 >    public void testTimedPoll0()      { testTimedPoll0(false); }
239 >    public void testTimedPoll0_fair() { testTimedPoll0(true); }
240 >    public void testTimedPoll0(boolean fair) {
241 >        final SynchronousQueue q = new SynchronousQueue(fair);
242 >        try { assertNull(q.poll(0, MILLISECONDS)); }
243 >        catch (InterruptedException e) { threadUnexpectedException(e); }
244      }
245  
246      /**
247       * timed poll with nonzero timeout times out if no active putter
248       */
249 <    public void testTimedPoll() throws InterruptedException {
250 <        SynchronousQueue q = new SynchronousQueue();
251 <        long t0 = System.nanoTime();
252 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
253 <        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
254 <    }
255 <
329 <    /**
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 <        delay(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));
249 >    public void testTimedPoll() {
250 >        final boolean fair = randomBoolean();
251 >        final SynchronousQueue q = new SynchronousQueue(fair);
252 >        final long startTime = System.nanoTime();
253 >        try { assertNull(q.poll(timeoutMillis(), MILLISECONDS)); }
254 >        catch (InterruptedException e) { threadUnexpectedException(e); }
255 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
256      }
257  
258      /**
259       * timed poll before a delayed offer times out, returning null;
260       * after offer succeeds; on interruption throws
261       */
262 <    public void testFairTimedPollWithOffer() throws InterruptedException {
263 <        final SynchronousQueue q = new SynchronousQueue(true);
262 >    public void testTimedPollWithOffer() {
263 >        final boolean fair = randomBoolean();
264 >        final SynchronousQueue q = new SynchronousQueue(fair);
265          final CountDownLatch pleaseOffer = new CountDownLatch(1);
266 +        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
267          Thread t = newStartedThread(new CheckedRunnable() {
268              public void realRun() throws InterruptedException {
269 <                long t0 = System.nanoTime();
270 <                assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
271 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
269 >                long startTime = System.nanoTime();
270 >                assertNull(q.poll(timeoutMillis(), MILLISECONDS));
271 >                assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
272  
273                  pleaseOffer.countDown();
274 <                t0 = System.nanoTime();
274 >                startTime = System.nanoTime();
275                  assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
386                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
276  
277 <                t0 = System.nanoTime();
277 >                Thread.currentThread().interrupt();
278 >                try {
279 >                    q.poll(randomTimeout(), randomTimeUnit());
280 >                    shouldThrow();
281 >                } catch (InterruptedException success) {}
282 >                assertFalse(Thread.interrupted());
283 >
284 >                pleaseInterrupt.countDown();
285                  try {
286                      q.poll(LONG_DELAY_MS, MILLISECONDS);
287                      shouldThrow();
288                  } catch (InterruptedException success) {}
289 <                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
289 >                assertFalse(Thread.interrupted());
290 >
291 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
292              }});
293  
294 <        assertTrue(pleaseOffer.await(MEDIUM_DELAY_MS, MILLISECONDS));
295 <        long t0 = System.nanoTime();
296 <        assertTrue(q.offer(zero, LONG_DELAY_MS, MILLISECONDS));
297 <        assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
294 >        await(pleaseOffer);
295 >        long startTime = System.nanoTime();
296 >        try { assertTrue(q.offer(zero, LONG_DELAY_MS, MILLISECONDS)); }
297 >        catch (InterruptedException e) { threadUnexpectedException(e); }
298 >        assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
299  
300 +        await(pleaseInterrupt);
301 +        if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING);
302          t.interrupt();
303 <        awaitTermination(t, MEDIUM_DELAY_MS);
303 >        awaitTermination(t);
304      }
305  
306      /**
307       * peek() returns null if no active putter
308       */
309 <    public void testPeek() {
310 <        SynchronousQueue q = new SynchronousQueue();
309 >    public void testPeek()      { testPeek(false); }
310 >    public void testPeek_fair() { testPeek(true); }
311 >    public void testPeek(boolean fair) {
312 >        final SynchronousQueue q = new SynchronousQueue(fair);
313          assertNull(q.peek());
314      }
315  
316      /**
317 <     * element() throws NSEE if no active putter
317 >     * element() throws NoSuchElementException if no active putter
318       */
319 <    public void testElement() {
320 <        SynchronousQueue q = new SynchronousQueue();
319 >    public void testElement()      { testElement(false); }
320 >    public void testElement_fair() { testElement(true); }
321 >    public void testElement(boolean fair) {
322 >        final SynchronousQueue q = new SynchronousQueue(fair);
323          try {
324              q.element();
325              shouldThrow();
# Line 422 | Line 327 | public class SynchronousQueueTest extend
327      }
328  
329      /**
330 <     * remove() throws NSEE if no active putter
330 >     * remove() throws NoSuchElementException if no active putter
331       */
332 <    public void testRemove() {
333 <        SynchronousQueue q = new SynchronousQueue();
332 >    public void testRemove()      { testRemove(false); }
333 >    public void testRemove_fair() { testRemove(true); }
334 >    public void testRemove(boolean fair) {
335 >        final SynchronousQueue q = new SynchronousQueue(fair);
336          try {
337              q.remove();
338              shouldThrow();
# Line 433 | Line 340 | public class SynchronousQueueTest extend
340      }
341  
342      /**
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    /**
343       * contains returns false
344       */
345 <    public void testContains() {
346 <        SynchronousQueue q = new SynchronousQueue();
345 >    public void testContains()      { testContains(false); }
346 >    public void testContains_fair() { testContains(true); }
347 >    public void testContains(boolean fair) {
348 >        final SynchronousQueue q = new SynchronousQueue(fair);
349          assertFalse(q.contains(zero));
350      }
351  
352      /**
353       * clear ensures isEmpty
354       */
355 <    public void testClear() {
356 <        SynchronousQueue q = new SynchronousQueue();
355 >    public void testClear()      { testClear(false); }
356 >    public void testClear_fair() { testClear(true); }
357 >    public void testClear(boolean fair) {
358 >        final SynchronousQueue q = new SynchronousQueue(fair);
359          q.clear();
360          assertTrue(q.isEmpty());
361      }
# Line 461 | Line 363 | public class SynchronousQueueTest extend
363      /**
364       * containsAll returns false unless empty
365       */
366 <    public void testContainsAll() {
367 <        SynchronousQueue q = new SynchronousQueue();
366 >    public void testContainsAll()      { testContainsAll(false); }
367 >    public void testContainsAll_fair() { testContainsAll(true); }
368 >    public void testContainsAll(boolean fair) {
369 >        final SynchronousQueue q = new SynchronousQueue(fair);
370          Integer[] empty = new Integer[0];
371          assertTrue(q.containsAll(Arrays.asList(empty)));
372          Integer[] ints = new Integer[1]; ints[0] = zero;
# Line 472 | Line 376 | public class SynchronousQueueTest extend
376      /**
377       * retainAll returns false
378       */
379 <    public void testRetainAll() {
380 <        SynchronousQueue q = new SynchronousQueue();
379 >    public void testRetainAll()      { testRetainAll(false); }
380 >    public void testRetainAll_fair() { testRetainAll(true); }
381 >    public void testRetainAll(boolean fair) {
382 >        final SynchronousQueue q = new SynchronousQueue(fair);
383          Integer[] empty = new Integer[0];
384          assertFalse(q.retainAll(Arrays.asList(empty)));
385          Integer[] ints = new Integer[1]; ints[0] = zero;
# Line 483 | Line 389 | public class SynchronousQueueTest extend
389      /**
390       * removeAll returns false
391       */
392 <    public void testRemoveAll() {
393 <        SynchronousQueue q = new SynchronousQueue();
392 >    public void testRemoveAll()      { testRemoveAll(false); }
393 >    public void testRemoveAll_fair() { testRemoveAll(true); }
394 >    public void testRemoveAll(boolean fair) {
395 >        final SynchronousQueue q = new SynchronousQueue(fair);
396          Integer[] empty = new Integer[0];
397          assertFalse(q.removeAll(Arrays.asList(empty)));
398          Integer[] ints = new Integer[1]; ints[0] = zero;
399          assertFalse(q.containsAll(Arrays.asList(ints)));
400      }
401  
494
402      /**
403       * toArray is empty
404       */
405 <    public void testToArray() {
406 <        SynchronousQueue q = new SynchronousQueue();
405 >    public void testToArray()      { testToArray(false); }
406 >    public void testToArray_fair() { testToArray(true); }
407 >    public void testToArray(boolean fair) {
408 >        final SynchronousQueue q = new SynchronousQueue(fair);
409          Object[] o = q.toArray();
410 <        assertEquals(o.length, 0);
410 >        assertEquals(0, o.length);
411      }
412  
413      /**
414 <     * toArray(a) is nulled at position 0
414 >     * toArray(Integer array) returns its argument with the first
415 >     * element (if present) nulled out
416       */
417 <    public void testToArray2() {
418 <        SynchronousQueue q = new SynchronousQueue();
419 <        Integer[] ints = new Integer[1];
420 <        assertNull(ints[0]);
417 >    public void testToArray2()      { testToArray2(false); }
418 >    public void testToArray2_fair() { testToArray2(true); }
419 >    public void testToArray2(boolean fair) {
420 >        final SynchronousQueue<Integer> q = new SynchronousQueue<>(fair);
421 >        Integer[] a;
422 >
423 >        a = new Integer[0];
424 >        assertSame(a, q.toArray(a));
425 >
426 >        a = new Integer[3];
427 >        Arrays.fill(a, 42);
428 >        assertSame(a, q.toArray(a));
429 >        assertNull(a[0]);
430 >        for (int i = 1; i < a.length; i++)
431 >            assertEquals(42, (int) a[i]);
432      }
433  
434      /**
435       * toArray(null) throws NPE
436       */
437 <    public void testToArray_BadArg() {
438 <        SynchronousQueue q = new SynchronousQueue();
437 >    public void testToArray_null()      { testToArray_null(false); }
438 >    public void testToArray_null_fair() { testToArray_null(true); }
439 >    public void testToArray_null(boolean fair) {
440 >        final SynchronousQueue q = new SynchronousQueue(fair);
441          try {
442 <            Object o[] = q.toArray(null);
442 >            Object[] o = q.toArray((Object[])null);
443              shouldThrow();
444          } catch (NullPointerException success) {}
445      }
446  
524
447      /**
448       * iterator does not traverse any elements
449       */
450 <    public void testIterator() {
451 <        SynchronousQueue q = new SynchronousQueue();
452 <        Iterator it = q.iterator();
453 <        assertFalse(it.hasNext());
532 <        try {
533 <            Object x = it.next();
534 <            shouldThrow();
535 <        } catch (NoSuchElementException success) {}
450 >    public void testIterator()      { testIterator(false); }
451 >    public void testIterator_fair() { testIterator(true); }
452 >    public void testIterator(boolean fair) {
453 >        assertIteratorExhausted(new SynchronousQueue(fair).iterator());
454      }
455  
456      /**
457 <     * iterator remove throws ISE
457 >     * iterator remove throws IllegalStateException
458       */
459 <    public void testIteratorRemove() {
460 <        SynchronousQueue q = new SynchronousQueue();
459 >    public void testIteratorRemove()      { testIteratorRemove(false); }
460 >    public void testIteratorRemove_fair() { testIteratorRemove(true); }
461 >    public void testIteratorRemove(boolean fair) {
462 >        final SynchronousQueue q = new SynchronousQueue(fair);
463          Iterator it = q.iterator();
464          try {
465              it.remove();
# Line 550 | Line 470 | public class SynchronousQueueTest extend
470      /**
471       * toString returns a non-null string
472       */
473 <    public void testToString() {
474 <        SynchronousQueue q = new SynchronousQueue();
473 >    public void testToString()      { testToString(false); }
474 >    public void testToString_fair() { testToString(true); }
475 >    public void testToString(boolean fair) {
476 >        final SynchronousQueue q = new SynchronousQueue(fair);
477          String s = q.toString();
478          assertNotNull(s);
479      }
480  
559
481      /**
482       * offer transfers elements across Executor tasks
483       */
484 <    public void testOfferInExecutor() {
485 <        final SynchronousQueue q = new SynchronousQueue();
486 <        ExecutorService executor = Executors.newFixedThreadPool(2);
487 <
488 <        executor.execute(new CheckedRunnable() {
489 <            public void realRun() throws InterruptedException {
490 <                assertFalse(q.offer(one));
491 <                assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS));
492 <                assertEquals(0, q.remainingCapacity());
493 <            }});
494 <
495 <        executor.execute(new CheckedRunnable() {
496 <            public void realRun() throws InterruptedException {
497 <                delay(SMALL_DELAY_MS);
498 <                assertSame(one, q.take());
499 <            }});
500 <
501 <        joinPool(executor);
502 <    }
503 <
504 <    /**
505 <     * poll retrieves elements across Executor threads
585 <     */
586 <    public void testPollInExecutor() {
587 <        final SynchronousQueue q = new SynchronousQueue();
588 <        ExecutorService executor = Executors.newFixedThreadPool(2);
589 <        executor.execute(new CheckedRunnable() {
590 <            public void realRun() throws InterruptedException {
591 <                assertNull(q.poll());
592 <                assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
593 <                assertTrue(q.isEmpty());
594 <            }});
595 <
596 <        executor.execute(new CheckedRunnable() {
597 <            public void realRun() throws InterruptedException {
598 <                delay(SHORT_DELAY_MS);
599 <                q.put(one);
600 <            }});
601 <
602 <        joinPool(executor);
603 <    }
604 <
605 <    /**
606 <     * a deserialized serialized queue is usable
607 <     */
608 <    public void testSerialization() throws Exception {
609 <        SynchronousQueue q = new SynchronousQueue();
610 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
611 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
612 <        out.writeObject(q);
613 <        out.close();
614 <
615 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
616 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
617 <        SynchronousQueue r = (SynchronousQueue)in.readObject();
618 <        assertEquals(q.size(), r.size());
619 <        while (!q.isEmpty())
620 <            assertEquals(q.remove(), r.remove());
484 >    public void testOfferInExecutor()      { testOfferInExecutor(false); }
485 >    public void testOfferInExecutor_fair() { testOfferInExecutor(true); }
486 >    public void testOfferInExecutor(boolean fair) {
487 >        final SynchronousQueue q = new SynchronousQueue(fair);
488 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
489 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
490 >        try (PoolCleaner cleaner = cleaner(executor)) {
491 >
492 >            executor.execute(new CheckedRunnable() {
493 >                public void realRun() throws InterruptedException {
494 >                    assertFalse(q.offer(one));
495 >                    threadsStarted.await();
496 >                    assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
497 >                    assertEquals(0, q.remainingCapacity());
498 >                }});
499 >
500 >            executor.execute(new CheckedRunnable() {
501 >                public void realRun() throws InterruptedException {
502 >                    threadsStarted.await();
503 >                    assertSame(one, q.take());
504 >                }});
505 >        }
506      }
507  
508      /**
509 <     * drainTo(null) throws NPE
509 >     * timed poll retrieves elements across Executor threads
510       */
511 <    public void testDrainToNull() {
512 <        SynchronousQueue q = new SynchronousQueue();
513 <        try {
514 <            q.drainTo(null);
515 <            shouldThrow();
516 <        } catch (NullPointerException success) {}
511 >    public void testPollInExecutor()      { testPollInExecutor(false); }
512 >    public void testPollInExecutor_fair() { testPollInExecutor(true); }
513 >    public void testPollInExecutor(boolean fair) {
514 >        final SynchronousQueue q = new SynchronousQueue(fair);
515 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
516 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
517 >        try (PoolCleaner cleaner = cleaner(executor)) {
518 >            executor.execute(new CheckedRunnable() {
519 >                public void realRun() throws InterruptedException {
520 >                    assertNull(q.poll());
521 >                    threadsStarted.await();
522 >                    assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
523 >                    assertTrue(q.isEmpty());
524 >                }});
525 >
526 >            executor.execute(new CheckedRunnable() {
527 >                public void realRun() throws InterruptedException {
528 >                    threadsStarted.await();
529 >                    q.put(one);
530 >                }});
531 >        }
532      }
533  
534      /**
535 <     * drainTo(this) throws IAE
535 >     * a deserialized/reserialized queue is usable
536       */
537 <    public void testDrainToSelf() {
538 <        SynchronousQueue q = new SynchronousQueue();
539 <        try {
540 <            q.drainTo(q);
541 <            shouldThrow();
542 <        } catch (IllegalArgumentException success) {}
537 >    public void testSerialization() {
538 >        final SynchronousQueue x = new SynchronousQueue();
539 >        final SynchronousQueue y = new SynchronousQueue(false);
540 >        final SynchronousQueue z = new SynchronousQueue(true);
541 >        assertSerialEquals(x, y);
542 >        assertNotSerialEquals(x, z);
543 >        SynchronousQueue[] qs = { x, y, z };
544 >        for (SynchronousQueue q : qs) {
545 >            SynchronousQueue clone = serialClone(q);
546 >            assertNotSame(q, clone);
547 >            assertSerialEquals(q, clone);
548 >            assertTrue(clone.isEmpty());
549 >            assertEquals(0, clone.size());
550 >            assertEquals(0, clone.remainingCapacity());
551 >            assertFalse(clone.offer(zero));
552 >        }
553      }
554  
555      /**
556       * drainTo(c) of empty queue doesn't transfer elements
557       */
558 <    public void testDrainTo() {
559 <        SynchronousQueue q = new SynchronousQueue();
558 >    public void testDrainTo()      { testDrainTo(false); }
559 >    public void testDrainTo_fair() { testDrainTo(true); }
560 >    public void testDrainTo(boolean fair) {
561 >        final SynchronousQueue q = new SynchronousQueue(fair);
562          ArrayList l = new ArrayList();
563          q.drainTo(l);
564 <        assertEquals(q.size(), 0);
565 <        assertEquals(l.size(), 0);
564 >        assertEquals(0, q.size());
565 >        assertEquals(0, l.size());
566      }
567  
568      /**
569       * drainTo empties queue, unblocking a waiting put.
570       */
571 <    public void testDrainToWithActivePut() throws InterruptedException {
572 <        final SynchronousQueue q = new SynchronousQueue();
573 <        Thread t = new Thread(new CheckedRunnable() {
571 >    public void testDrainToWithActivePut()      { testDrainToWithActivePut(false); }
572 >    public void testDrainToWithActivePut_fair() { testDrainToWithActivePut(true); }
573 >    public void testDrainToWithActivePut(boolean fair) {
574 >        final SynchronousQueue q = new SynchronousQueue(fair);
575 >        Thread t = newStartedThread(new CheckedRunnable() {
576              public void realRun() throws InterruptedException {
577 <                q.put(new Integer(1));
577 >                q.put(one);
578              }});
579  
666        t.start();
580          ArrayList l = new ArrayList();
581 <        delay(SHORT_DELAY_MS);
582 <        q.drainTo(l);
583 <        assertTrue(l.size() <= 1);
584 <        if (l.size() > 0)
585 <            assertEquals(l.get(0), new Integer(1));
586 <        t.join();
587 <        assertTrue(l.size() <= 1);
588 <    }
589 <
590 <    /**
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) {}
581 >        long startTime = System.nanoTime();
582 >        while (l.isEmpty()) {
583 >            q.drainTo(l);
584 >            if (millisElapsedSince(startTime) > LONG_DELAY_MS)
585 >                fail("timed out");
586 >            Thread.yield();
587 >        }
588 >        assertEquals(1, l.size());
589 >        assertSame(one, l.get(0));
590 >        awaitTermination(t);
591      }
592  
593      /**
# Line 701 | Line 595 | public class SynchronousQueueTest extend
595       */
596      public void testDrainToN() throws InterruptedException {
597          final SynchronousQueue q = new SynchronousQueue();
598 <        Thread t1 = new Thread(new CheckedRunnable() {
598 >        Thread t1 = newStartedThread(new CheckedRunnable() {
599              public void realRun() throws InterruptedException {
600                  q.put(one);
601              }});
602  
603 <        Thread t2 = new Thread(new CheckedRunnable() {
603 >        Thread t2 = newStartedThread(new CheckedRunnable() {
604              public void realRun() throws InterruptedException {
605                  q.put(two);
606              }});
607  
714        t1.start();
715        t2.start();
608          ArrayList l = new ArrayList();
609 <        delay(SHORT_DELAY_MS);
610 <        q.drainTo(l, 1);
609 >        int drained;
610 >        while ((drained = q.drainTo(l, 1)) == 0) Thread.yield();
611 >        assertEquals(1, drained);
612          assertEquals(1, l.size());
613 <        q.drainTo(l, 1);
613 >        while ((drained = q.drainTo(l, 1)) == 0) Thread.yield();
614 >        assertEquals(1, drained);
615          assertEquals(2, l.size());
616          assertTrue(l.contains(one));
617          assertTrue(l.contains(two));
618 <        t1.join();
619 <        t2.join();
618 >        awaitTermination(t1);
619 >        awaitTermination(t2);
620 >    }
621 >
622 >    /**
623 >     * remove(null), contains(null) always return false
624 >     */
625 >    public void testNeverContainsNull() {
626 >        Collection<?> q = new SynchronousQueue();
627 >        assertFalse(q.contains(null));
628 >        assertFalse(q.remove(null));
629      }
630  
631   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines