ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ArrayBlockingQueueTest.java

Comparing jsr166/src/test/tck/ArrayBlockingQueueTest.java (file contents):
Revision 1.29 by jsr166, Wed Aug 25 00:07:02 2010 UTC vs.
Revision 1.52 by jsr166, Sat Nov 26 05:42:14 2011 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–
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.Queue;
16	>	import java.util.concurrent.ArrayBlockingQueue;
17	>	import java.util.concurrent.BlockingQueue;
18	>	import java.util.concurrent.CountDownLatch;
19	>	import java.util.concurrent.Executors;
20	>	import java.util.concurrent.ExecutorService;
21		import static java.util.concurrent.TimeUnit.MILLISECONDS;
14	–	import java.io.*;
22
23		public class ArrayBlockingQueueTest extends JSR166TestCase {
24	+
25	+	public static class Fair extends BlockingQueueTest {
26	+	protected BlockingQueue emptyCollection() {
27	+	return new ArrayBlockingQueue(SIZE, true);
28	+	}
29	+	}
30	+
31	+	public static class NonFair extends BlockingQueueTest {
32	+	protected BlockingQueue emptyCollection() {
33	+	return new ArrayBlockingQueue(SIZE, false);
34	+	}
35	+	}
36	+
37		public static void main(String[] args) {
38		junit.textui.TestRunner.run(suite());
39		}
40	+
41		public static Test suite() {
42	<	return new TestSuite(ArrayBlockingQueueTest.class);
42	>	return newTestSuite(ArrayBlockingQueueTest.class,
43	>	new Fair().testSuite(),
44	>	new NonFair().testSuite());
45		}
46
47		/**
48		* Create a queue of given size containing consecutive
49		* Integers 0 ... n.
50		*/
51	<	private ArrayBlockingQueue populatedQueue(int n) {
52	<	ArrayBlockingQueue q = new ArrayBlockingQueue(n);
51	>	private ArrayBlockingQueue<Integer> populatedQueue(int n) {
52	>	ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<Integer>(n);
53		assertTrue(q.isEmpty());
54		for (int i = 0; i < n; i++)
55		assertTrue(q.offer(new Integer(i)));
#	Line 48 | Line 71 | public class ArrayBlockingQueueTest exte
71		*/
72		public void testConstructor2() {
73		try {
74	<	ArrayBlockingQueue q = new ArrayBlockingQueue(0);
74	>	new ArrayBlockingQueue(0);
75		shouldThrow();
76		} catch (IllegalArgumentException success) {}
77		}
#	Line 58 | Line 81 | public class ArrayBlockingQueueTest exte
81		*/
82		public void testConstructor3() {
83		try {
84	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1, true, null);
84	>	new ArrayBlockingQueue(1, true, null);
85		shouldThrow();
86		} catch (NullPointerException success) {}
87		}
#	Line 67 | Line 90 | public class ArrayBlockingQueueTest exte
90		* Initializing from Collection of null elements throws NPE
91		*/
92		public void testConstructor4() {
93	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
94		try {
95	<	Integer[] ints = new Integer[SIZE];
72	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
95	>	new ArrayBlockingQueue(SIZE, false, elements);
96		shouldThrow();
97		} catch (NullPointerException success) {}
98		}
#	Line 78 | Line 101 | public class ArrayBlockingQueueTest exte
101		* Initializing from Collection with some null elements throws NPE
102		*/
103		public void testConstructor5() {
104	+	Integer[] ints = new Integer[SIZE];
105	+	for (int i = 0; i < SIZE-1; ++i)
106	+	ints[i] = i;
107	+	Collection<Integer> elements = Arrays.asList(ints);
108		try {
109	<	Integer[] ints = new Integer[SIZE];
83	<	for (int i = 0; i < SIZE-1; ++i)
84	<	ints[i] = new Integer(i);
85	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
109	>	new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
110		shouldThrow();
111		} catch (NullPointerException success) {}
112		}
#	Line 91 | Line 115 | public class ArrayBlockingQueueTest exte
115		* Initializing from too large collection throws IAE
116		*/
117		public void testConstructor6() {
118	+	Integer[] ints = new Integer[SIZE];
119	+	for (int i = 0; i < SIZE; ++i)
120	+	ints[i] = i;
121	+	Collection<Integer> elements = Arrays.asList(ints);
122		try {
123	<	Integer[] ints = new Integer[SIZE];
96	<	for (int i = 0; i < SIZE; ++i)
97	<	ints[i] = new Integer(i);
98	<	ArrayBlockingQueue q = new ArrayBlockingQueue(1, false, Arrays.asList(ints));
123	>	new ArrayBlockingQueue(SIZE - 1, false, elements);
124		shouldThrow();
125		} catch (IllegalArgumentException success) {}
126		}
#	Line 106 | Line 131 | public class ArrayBlockingQueueTest exte
131		public void testConstructor7() {
132		Integer[] ints = new Integer[SIZE];
133		for (int i = 0; i < SIZE; ++i)
134	<	ints[i] = new Integer(i);
135	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, Arrays.asList(ints));
134	>	ints[i] = i;
135	>	Collection<Integer> elements = Arrays.asList(ints);
136	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, elements);
137		for (int i = 0; i < SIZE; ++i)
138		assertEquals(ints[i], q.poll());
139		}
#	Line 145 | Line 171 | public class ArrayBlockingQueueTest exte
171		}
172
173		/**
148	–	*  offer(null) throws NPE
149	–	*/
150	–	public void testOfferNull() {
151	–	try {
152	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
153	–	q.offer(null);
154	–	shouldThrow();
155	–	} catch (NullPointerException success) {}
156	–	}
157	–
158	–	/**
159	–	*  add(null) throws NPE
160	–	*/
161	–	public void testAddNull() {
162	–	try {
163	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
164	–	q.add(null);
165	–	shouldThrow();
166	–	} catch (NullPointerException success) {}
167	–	}
168	–
169	–	/**
174		* Offer succeeds if not full; fails if full
175		*/
176		public void testOffer() {
#	Line 191 | Line 195 | public class ArrayBlockingQueueTest exte
195		}
196
197		/**
194	–	*  addAll(null) throws NPE
195	–	*/
196	–	public void testAddAll1() {
197	–	try {
198	–	ArrayBlockingQueue q = new ArrayBlockingQueue(1);
199	–	q.addAll(null);
200	–	shouldThrow();
201	–	} catch (NullPointerException success) {}
202	–	}
203	–
204	–	/**
198		* addAll(this) throws IAE
199		*/
200		public void testAddAllSelf() {
#	Line 212 | Line 205 | public class ArrayBlockingQueueTest exte
205		} catch (IllegalArgumentException success) {}
206		}
207
215	–
216	–	/**
217	–	*  addAll of a collection with null elements throws NPE
218	–	*/
219	–	public void testAddAll2() {
220	–	try {
221	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
222	–	Integer[] ints = new Integer[SIZE];
223	–	q.addAll(Arrays.asList(ints));
224	–	shouldThrow();
225	–	} catch (NullPointerException success) {}
226	–	}
208		/**
209		* addAll of a collection with any null elements throws NPE after
210		* possibly adding some elements
#	Line 238 | Line 219 | public class ArrayBlockingQueueTest exte
219		shouldThrow();
220		} catch (NullPointerException success) {}
221		}
222	+
223		/**
224		* addAll throws ISE if not enough room
225		*/
#	Line 251 | Line 233 | public class ArrayBlockingQueueTest exte
233		shouldThrow();
234		} catch (IllegalStateException success) {}
235		}
236	+
237		/**
238		* Queue contains all elements, in traversal order, of successful addAll
239		*/
#	Line 267 | Line 250 | public class ArrayBlockingQueueTest exte
250		}
251
252		/**
270	–	*  put(null) throws NPE
271	–	*/
272	–	public void testPutNull() throws InterruptedException {
273	–	try {
274	–	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
275	–	q.put(null);
276	–	shouldThrow();
277	–	} catch (NullPointerException success) {}
278	–	}
279	–
280	–	/**
253		* all elements successfully put are contained
254		*/
255		public void testPut() throws InterruptedException {
#	Line 295 | Line 267 | public class ArrayBlockingQueueTest exte
267		*/
268		public void testBlockingPut() throws InterruptedException {
269		final ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
270	<	Thread t = new Thread(new CheckedRunnable() {
270	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
271	>	Thread t = newStartedThread(new CheckedRunnable() {
272		public void realRun() throws InterruptedException {
273		for (int i = 0; i < SIZE; ++i)
274		q.put(i);
275		assertEquals(SIZE, q.size());
276		assertEquals(0, q.remainingCapacity());
277	+
278	+	Thread.currentThread().interrupt();
279		try {
280		q.put(99);
281		shouldThrow();
282		} catch (InterruptedException success) {}
283	+	assertFalse(Thread.interrupted());
284	+
285	+	pleaseInterrupt.countDown();
286	+	try {
287	+	q.put(99);
288	+	shouldThrow();
289	+	} catch (InterruptedException success) {}
290	+	assertFalse(Thread.interrupted());
291		}});
292
293	<	t.start();
294	<	Thread.sleep(SHORT_DELAY_MS);
293	>	await(pleaseInterrupt);
294	>	assertThreadStaysAlive(t);
295		t.interrupt();
296	<	t.join();
296	>	awaitTermination(t);
297		assertEquals(SIZE, q.size());
298		assertEquals(0, q.remainingCapacity());
299		}
300
301		/**
302	<	* put blocks waiting for take when full
302	>	* put blocks interruptibly waiting for take when full
303		*/
304		public void testPutWithTake() throws InterruptedException {
305		final int capacity = 2;
306		final ArrayBlockingQueue q = new ArrayBlockingQueue(capacity);
307	<	Thread t = new Thread(new CheckedRunnable() {
307	>	final CountDownLatch pleaseTake = new CountDownLatch(1);
308	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
309	>	Thread t = newStartedThread(new CheckedRunnable() {
310		public void realRun() throws InterruptedException {
311	<	for (int i = 0; i < capacity + 1; i++)
311	>	for (int i = 0; i < capacity; i++)
312		q.put(i);
313	+	pleaseTake.countDown();
314	+	q.put(86);
315	+
316	+	pleaseInterrupt.countDown();
317		try {
318		q.put(99);
319		shouldThrow();
320		} catch (InterruptedException success) {}
321	+	assertFalse(Thread.interrupted());
322		}});
323
324	<	t.start();
325	<	Thread.sleep(SHORT_DELAY_MS);
336	<	assertEquals(q.remainingCapacity(), 0);
324	>	await(pleaseTake);
325	>	assertEquals(0, q.remainingCapacity());
326		assertEquals(0, q.take());
327	<	Thread.sleep(SHORT_DELAY_MS);
327	>
328	>	await(pleaseInterrupt);
329	>	assertThreadStaysAlive(t);
330		t.interrupt();
331	<	t.join();
332	<	assertEquals(q.remainingCapacity(), 0);
331	>	awaitTermination(t);
332	>	assertEquals(0, q.remainingCapacity());
333		}
334
335		/**
#	Line 346 | Line 337 | public class ArrayBlockingQueueTest exte
337		*/
338		public void testTimedOffer() throws InterruptedException {
339		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
340	<	Thread t = new Thread(new CheckedRunnable() {
340	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
341	>	Thread t = newStartedThread(new CheckedRunnable() {
342		public void realRun() throws InterruptedException {
343		q.put(new Object());
344		q.put(new Object());
345	<	assertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, MILLISECONDS));
345	>	long startTime = System.nanoTime();
346	>	assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
347	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
348	>	pleaseInterrupt.countDown();
349		try {
350	<	q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
350	>	q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
351		shouldThrow();
352		} catch (InterruptedException success) {}
353		}});
354
355	<	t.start();
356	<	Thread.sleep(SHORT_DELAY_MS);
355	>	await(pleaseInterrupt);
356	>	assertThreadStaysAlive(t);
357		t.interrupt();
358	<	t.join();
358	>	awaitTermination(t);
359		}
360
361		/**
#	Line 374 | Line 369 | public class ArrayBlockingQueueTest exte
369		}
370
371		/**
377	–	* take blocks interruptibly when empty
378	–	*/
379	–	public void testTakeFromEmpty() throws InterruptedException {
380	–	final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
381	–	Thread t = new ThreadShouldThrow(InterruptedException.class) {
382	–	public void realRun() throws InterruptedException {
383	–	q.take();
384	–	}};
385	–
386	–	t.start();
387	–	Thread.sleep(SHORT_DELAY_MS);
388	–	t.interrupt();
389	–	t.join();
390	–	}
391	–
392	–	/**
372		* Take removes existing elements until empty, then blocks interruptibly
373		*/
374		public void testBlockingTake() throws InterruptedException {
375		final ArrayBlockingQueue q = populatedQueue(SIZE);
376	<	Thread t = new Thread(new CheckedRunnable() {
376	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
377	>	Thread t = newStartedThread(new CheckedRunnable() {
378		public void realRun() throws InterruptedException {
379		for (int i = 0; i < SIZE; ++i) {
380		assertEquals(i, q.take());
381		}
382	+
383	+	Thread.currentThread().interrupt();
384	+	try {
385	+	q.take();
386	+	shouldThrow();
387	+	} catch (InterruptedException success) {}
388	+	assertFalse(Thread.interrupted());
389	+
390	+	pleaseInterrupt.countDown();
391		try {
392		q.take();
393		shouldThrow();
394		} catch (InterruptedException success) {}
395	+	assertFalse(Thread.interrupted());
396		}});
397
398	<	t.start();
399	<	Thread.sleep(SHORT_DELAY_MS);
398	>	await(pleaseInterrupt);
399	>	assertThreadStaysAlive(t);
400		t.interrupt();
401	<	t.join();
401	>	awaitTermination(t);
402		}
403
414	–
404		/**
405		* poll succeeds unless empty
406		*/
#	Line 424 | Line 413 | public class ArrayBlockingQueueTest exte
413		}
414
415		/**
416	<	* timed pool with zero timeout succeeds when non-empty, else times out
416	>	* timed poll with zero timeout succeeds when non-empty, else times out
417		*/
418		public void testTimedPoll0() throws InterruptedException {
419		ArrayBlockingQueue q = populatedQueue(SIZE);
#	Line 432 | Line 421 | public class ArrayBlockingQueueTest exte
421		assertEquals(i, q.poll(0, MILLISECONDS));
422		}
423		assertNull(q.poll(0, MILLISECONDS));
424	+	checkEmpty(q);
425		}
426
427		/**
428	<	* timed pool with nonzero timeout succeeds when non-empty, else times out
428	>	* timed poll with nonzero timeout succeeds when non-empty, else times out
429		*/
430		public void testTimedPoll() throws InterruptedException {
431		ArrayBlockingQueue q = populatedQueue(SIZE);
432		for (int i = 0; i < SIZE; ++i) {
433	<	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
434	<	}
435	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
433	>	long startTime = System.nanoTime();
434	>	assertEquals(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
435	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
436	>	}
437	>	long startTime = System.nanoTime();
438	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
439	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
440	>	checkEmpty(q);
441		}
442
443		/**
#	Line 450 | Line 445 | public class ArrayBlockingQueueTest exte
445		* returning timeout status
446		*/
447		public void testInterruptedTimedPoll() throws InterruptedException {
448	<	Thread t = new Thread(new CheckedRunnable() {
448	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
449	>	final CountDownLatch aboutToWait = new CountDownLatch(1);
450	>	Thread t = newStartedThread(new CheckedRunnable() {
451		public void realRun() throws InterruptedException {
455	–	ArrayBlockingQueue q = populatedQueue(SIZE);
452		for (int i = 0; i < SIZE; ++i) {
453	<	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));;
453	>	long t0 = System.nanoTime();
454	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
455	>	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
456		}
457	+	long t0 = System.nanoTime();
458	+	aboutToWait.countDown();
459		try {
460	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
461	<	shouldThrow();
462	<	} catch (InterruptedException success) {}
463	<	}});
464	<
465	<	t.start();
466	<	Thread.sleep(SHORT_DELAY_MS);
467	<	t.interrupt();
468	<	t.join();
469	<	}
470	<
471	<	/**
472	<	*  timed poll before a delayed offer fails; after offer succeeds;
473	<	*  on interruption throws
474	<	*/
475	<	public void testTimedPollWithOffer() throws InterruptedException {
476	<	final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
477	<	Thread t = new Thread(new CheckedRunnable() {
478	<	public void realRun() throws InterruptedException {
479	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
480	<	assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
481	<	try {
482	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
460	>	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
461		shouldThrow();
462	<	} catch (InterruptedException success) {}
462	>	} catch (InterruptedException success) {
463	>	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
464	>	}
465		}});
466
467	<	t.start();
468	<	Thread.sleep(SMALL_DELAY_MS);
489	<	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
467	>	aboutToWait.await();
468	>	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
469		t.interrupt();
470	<	t.join();
470	>	awaitTermination(t, MEDIUM_DELAY_MS);
471	>	checkEmpty(q);
472		}
473
494	–
474		/**
475		* peek returns next element, or null if empty
476		*/
#	Line 536 | Line 515 | public class ArrayBlockingQueueTest exte
515		}
516
517		/**
539	–	* remove(x) removes x and returns true if present
540	–	*/
541	–	public void testRemoveElement() {
542	–	ArrayBlockingQueue q = populatedQueue(SIZE);
543	–	for (int i = 1; i < SIZE; i+=2) {
544	–	assertTrue(q.remove(new Integer(i)));
545	–	}
546	–	for (int i = 0; i < SIZE; i+=2) {
547	–	assertTrue(q.remove(new Integer(i)));
548	–	assertFalse(q.remove(new Integer(i+1)));
549	–	}
550	–	assertTrue(q.isEmpty());
551	–	}
552	–
553	–	/**
518		* contains(x) reports true when elements added but not yet removed
519		*/
520		public void testContains() {
#	Line 628 | Line 592 | public class ArrayBlockingQueueTest exte
592		}
593
594		/**
595	<	*  toArray contains all elements
595	>	* toArray contains all elements in FIFO order
596		*/
597	<	public void testToArray() throws InterruptedException {
597	>	public void testToArray() {
598		ArrayBlockingQueue q = populatedQueue(SIZE);
599		Object[] o = q.toArray();
600		for (int i = 0; i < o.length; i++)
601	<	assertEquals(o[i], q.take());
601	>	assertSame(o[i], q.poll());
602		}
603
604		/**
605	<	* toArray(a) contains all elements
605	>	* toArray(a) contains all elements in FIFO order
606		*/
607	<	public void testToArray2() throws InterruptedException {
608	<	ArrayBlockingQueue q = populatedQueue(SIZE);
607	>	public void testToArray2() {
608	>	ArrayBlockingQueue<Integer> q = populatedQueue(SIZE);
609		Integer[] ints = new Integer[SIZE];
610	<	ints = (Integer[])q.toArray(ints);
610	>	Integer[] array = q.toArray(ints);
611	>	assertSame(ints, array);
612		for (int i = 0; i < ints.length; i++)
613	<	assertEquals(ints[i], q.take());
613	>	assertSame(ints[i], q.poll());
614		}
615
616		/**
617	<	* toArray(null) throws NPE
653	<	*/
654	<	public void testToArray_BadArg() {
655	<	ArrayBlockingQueue q = populatedQueue(SIZE);
656	<	try {
657	<	Object o[] = q.toArray(null);
658	<	shouldThrow();
659	<	} catch (NullPointerException success) {}
660	<	}
661	<
662	<	/**
663	<	* toArray with incompatible array type throws CCE
617	>	* toArray(incompatible array type) throws ArrayStoreException
618		*/
619		public void testToArray1_BadArg() {
620		ArrayBlockingQueue q = populatedQueue(SIZE);
621		try {
622	<	Object o[] = q.toArray(new String[10]);
622	>	q.toArray(new String[10]);
623		shouldThrow();
624		} catch (ArrayStoreException success) {}
625		}
626
673	–
627		/**
628		* iterator iterates through all elements
629		*/
#	Line 734 | Line 687 | public class ArrayBlockingQueueTest exte
687		assertEquals(0, q.size());
688		}
689
737	–
690		/**
691		* toString contains toStrings of elements
692		*/
#	Line 742 | Line 694 | public class ArrayBlockingQueueTest exte
694		ArrayBlockingQueue q = populatedQueue(SIZE);
695		String s = q.toString();
696		for (int i = 0; i < SIZE; ++i) {
697	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
697	>	assertTrue(s.contains(String.valueOf(i)));
698		}
699		}
700
749	–
701		/**
702		* offer transfers elements across Executor tasks
703		*/
#	Line 755 | Line 706 | public class ArrayBlockingQueueTest exte
706		q.add(one);
707		q.add(two);
708		ExecutorService executor = Executors.newFixedThreadPool(2);
709	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
710		executor.execute(new CheckedRunnable() {
711		public void realRun() throws InterruptedException {
712		assertFalse(q.offer(three));
713	<	assertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
713	>	threadsStarted.await();
714	>	assertTrue(q.offer(three, LONG_DELAY_MS, MILLISECONDS));
715		assertEquals(0, q.remainingCapacity());
716		}});
717
718		executor.execute(new CheckedRunnable() {
719		public void realRun() throws InterruptedException {
720	<	Thread.sleep(SMALL_DELAY_MS);
720	>	threadsStarted.await();
721	>	assertEquals(0, q.remainingCapacity());
722		assertSame(one, q.take());
723		}});
724
#	Line 772 | Line 726 | public class ArrayBlockingQueueTest exte
726		}
727
728		/**
729	<	* poll retrieves elements across Executor threads
729	>	* timed poll retrieves elements across Executor threads
730		*/
731		public void testPollInExecutor() {
732		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
733	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
734		ExecutorService executor = Executors.newFixedThreadPool(2);
735		executor.execute(new CheckedRunnable() {
736		public void realRun() throws InterruptedException {
737		assertNull(q.poll());
738	<	assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
739	<	assertTrue(q.isEmpty());
738	>	threadsStarted.await();
739	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
740	>	checkEmpty(q);
741		}});
742
743		executor.execute(new CheckedRunnable() {
744		public void realRun() throws InterruptedException {
745	<	Thread.sleep(SMALL_DELAY_MS);
745	>	threadsStarted.await();
746		q.put(one);
747		}});
748
#	Line 797 | Line 753 | public class ArrayBlockingQueueTest exte
753		* A deserialized serialized queue has same elements in same order
754		*/
755		public void testSerialization() throws Exception {
756	<	ArrayBlockingQueue q = populatedQueue(SIZE);
757	<
802	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
803	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
804	<	out.writeObject(q);
805	<	out.close();
806	<
807	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
808	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
809	<	ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
810	<	assertEquals(q.size(), r.size());
811	<	while (!q.isEmpty())
812	<	assertEquals(q.remove(), r.remove());
813	<	}
756	>	Queue x = populatedQueue(SIZE);
757	>	Queue y = serialClone(x);
758
759	<	/**
760	<	* drainTo(null) throws NPE
761	<	*/
762	<	public void testDrainToNull() {
763	<	ArrayBlockingQueue q = populatedQueue(SIZE);
764	<	try {
765	<	q.drainTo(null);
766	<	shouldThrow();
767	<	} catch (NullPointerException success) {}
824	<	}
825	<
826	<	/**
827	<	* drainTo(this) throws IAE
828	<	*/
829	<	public void testDrainToSelf() {
830	<	ArrayBlockingQueue q = populatedQueue(SIZE);
831	<	try {
832	<	q.drainTo(q);
833	<	shouldThrow();
834	<	} catch (IllegalArgumentException success) {}
759	>	assertTrue(x != y);
760	>	assertEquals(x.size(), y.size());
761	>	assertEquals(x.toString(), y.toString());
762	>	assertTrue(Arrays.equals(x.toArray(), y.toArray()));
763	>	while (!x.isEmpty()) {
764	>	assertFalse(y.isEmpty());
765	>	assertEquals(x.remove(), y.remove());
766	>	}
767	>	assertTrue(y.isEmpty());
768		}
769
770		/**
#	Line 841 | Line 774 | public class ArrayBlockingQueueTest exte
774		ArrayBlockingQueue q = populatedQueue(SIZE);
775		ArrayList l = new ArrayList();
776		q.drainTo(l);
777	<	assertEquals(q.size(), 0);
778	<	assertEquals(l.size(), SIZE);
777	>	assertEquals(0, q.size());
778	>	assertEquals(SIZE, l.size());
779		for (int i = 0; i < SIZE; ++i)
780		assertEquals(l.get(i), new Integer(i));
781		q.add(zero);
#	Line 852 | Line 785 | public class ArrayBlockingQueueTest exte
785		assertTrue(q.contains(one));
786		l.clear();
787		q.drainTo(l);
788	<	assertEquals(q.size(), 0);
789	<	assertEquals(l.size(), 2);
788	>	assertEquals(0, q.size());
789	>	assertEquals(2, l.size());
790		for (int i = 0; i < 2; ++i)
791		assertEquals(l.get(i), new Integer(i));
792		}
#	Line 879 | Line 812 | public class ArrayBlockingQueueTest exte
812		}
813
814		/**
815	<	* drainTo(null, n) throws NPE
883	<	*/
884	<	public void testDrainToNullN() {
885	<	ArrayBlockingQueue q = populatedQueue(SIZE);
886	<	try {
887	<	q.drainTo(null, 0);
888	<	shouldThrow();
889	<	} catch (NullPointerException success) {}
890	<	}
891	<
892	<	/**
893	<	* drainTo(this, n) throws IAE
894	<	*/
895	<	public void testDrainToSelfN() {
896	<	ArrayBlockingQueue q = populatedQueue(SIZE);
897	<	try {
898	<	q.drainTo(q, 0);
899	<	shouldThrow();
900	<	} catch (IllegalArgumentException success) {}
901	<	}
902	<
903	<	/**
904	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
815	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
816		*/
817		public void testDrainToN() {
818		ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
#	Line 910 | Line 821 | public class ArrayBlockingQueueTest exte
821		assertTrue(q.offer(new Integer(j)));
822		ArrayList l = new ArrayList();
823		q.drainTo(l, i);
824	<	int k = (i < SIZE)? i : SIZE;
825	<	assertEquals(l.size(), k);
826	<	assertEquals(q.size(), SIZE-k);
824	>	int k = (i < SIZE) ? i : SIZE;
825	>	assertEquals(k, l.size());
826	>	assertEquals(SIZE-k, q.size());
827		for (int j = 0; j < k; ++j)
828		assertEquals(l.get(j), new Integer(j));
829		while (q.poll() != null) ;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines