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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines