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.11 by dl, Sun Oct 31 14:55:14 2004 UTC vs.
Revision 1.20 by jsr166, Sat Nov 21 17:38:05 2009 UTC

#	Line 2 | Line 2
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
5	<	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	<	* Pat Fisher, Mike Judd.
5	>	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	>	* Pat Fisher, Mike Judd.
7		*/
8
9
10		import junit.framework.*;
11		import java.util.*;
12		import java.util.concurrent.*;
13	+	import static java.util.concurrent.TimeUnit.MILLISECONDS;
14		import java.io.*;
15
16		public class ArrayBlockingQueueTest extends JSR166TestCase {
17		public static void main(String[] args) {
18	<	junit.textui.TestRunner.run (suite());
18	>	junit.textui.TestRunner.run (suite());
19		}
20		public static Test suite() {
21	<	return new TestSuite(ArrayBlockingQueueTest.class);
21	>	return new TestSuite(ArrayBlockingQueueTest.class);
22		}
23
24		/**
#	Line 27 | Line 28 | public class ArrayBlockingQueueTest exte
28		private ArrayBlockingQueue populatedQueue(int n) {
29		ArrayBlockingQueue q = new ArrayBlockingQueue(n);
30		assertTrue(q.isEmpty());
31	<	for(int i = 0; i < n; i++)
32	<	assertTrue(q.offer(new Integer(i)));
31	>	for (int i = 0; i < n; i++)
32	>	assertTrue(q.offer(new Integer(i)));
33		assertFalse(q.isEmpty());
34		assertEquals(0, q.remainingCapacity());
35	<	assertEquals(n, q.size());
35	>	assertEquals(n, q.size());
36		return q;
37		}
38	<
38	>
39		/**
40		* A new queue has the indicated capacity
41		*/
#	Line 43 | Line 44 | public class ArrayBlockingQueueTest exte
44		}
45
46		/**
47	<	* Constructor throws IAE if  capacity argument nonpositive
47	>	* Constructor throws IAE if capacity argument nonpositive
48		*/
49		public void testConstructor2() {
50		try {
51		ArrayBlockingQueue q = new ArrayBlockingQueue(0);
52		shouldThrow();
53	<	}
53	<	catch (IllegalArgumentException success) {}
53	>	} catch (IllegalArgumentException success) {}
54		}
55
56		/**
#	Line 60 | Line 60 | public class ArrayBlockingQueueTest exte
60		try {
61		ArrayBlockingQueue q = new ArrayBlockingQueue(1, true, null);
62		shouldThrow();
63	<	}
64	<	catch (NullPointerException success) {}
63	>	} catch (NullPointerException success) {}
64		}
65
66		/**
#	Line 72 | Line 71 | public class ArrayBlockingQueueTest exte
71		Integer[] ints = new Integer[SIZE];
72		ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
73		shouldThrow();
74	<	}
76	<	catch (NullPointerException success) {}
74	>	} catch (NullPointerException success) {}
75		}
76
77		/**
#	Line 86 | Line 84 | public class ArrayBlockingQueueTest exte
84		ints[i] = new Integer(i);
85		ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
86		shouldThrow();
87	<	}
90	<	catch (NullPointerException success) {}
87	>	} catch (NullPointerException success) {}
88		}
89
90		/**
#	Line 100 | Line 97 | public class ArrayBlockingQueueTest exte
97		ints[i] = new Integer(i);
98		ArrayBlockingQueue q = new ArrayBlockingQueue(1, false, Arrays.asList(ints));
99		shouldThrow();
100	<	}
104	<	catch (IllegalArgumentException success) {}
100	>	} catch (IllegalArgumentException success) {}
101		}
102
103		/**
104		* Queue contains all elements of collection used to initialize
105		*/
106		public void testConstructor7() {
107	<	try {
108	<	Integer[] ints = new Integer[SIZE];
109	<	for (int i = 0; i < SIZE; ++i)
110	<	ints[i] = new Integer(i);
111	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, Arrays.asList(ints));
112	<	for (int i = 0; i < SIZE; ++i)
117	<	assertEquals(ints[i], q.poll());
118	<	}
119	<	finally {}
107	>	Integer[] ints = new Integer[SIZE];
108	>	for (int i = 0; i < SIZE; ++i)
109	>	ints[i] = new Integer(i);
110	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE, true, Arrays.asList(ints));
111	>	for (int i = 0; i < SIZE; ++i)
112	>	assertEquals(ints[i], q.poll());
113		}
114
115		/**
#	Line 155 | Line 148 | public class ArrayBlockingQueueTest exte
148		*  offer(null) throws NPE
149		*/
150		public void testOfferNull() {
151	<	try {
151	>	try {
152		ArrayBlockingQueue q = new ArrayBlockingQueue(1);
153		q.offer(null);
154		shouldThrow();
155	<	} catch (NullPointerException success) { }
155	>	} catch (NullPointerException success) {}
156		}
157
158		/**
159		*  add(null) throws NPE
160		*/
161		public void testAddNull() {
162	<	try {
162	>	try {
163		ArrayBlockingQueue q = new ArrayBlockingQueue(1);
164		q.add(null);
165		shouldThrow();
166	<	} catch (NullPointerException success) { }
166	>	} catch (NullPointerException success) {}
167		}
168
169		/**
#	Line 186 | Line 179 | public class ArrayBlockingQueueTest exte
179		* add succeeds if not full; throws ISE if full
180		*/
181		public void testAdd() {
182	<	try {
182	>	try {
183		ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
184		for (int i = 0; i < SIZE; ++i) {
185		assertTrue(q.add(new Integer(i)));
186		}
187		assertEquals(0, q.remainingCapacity());
188		q.add(new Integer(SIZE));
189	<	} catch (IllegalStateException success){
190	<	}
189	>	shouldThrow();
190	>	} catch (IllegalStateException success) {}
191		}
192
193		/**
#	Line 205 | Line 198 | public class ArrayBlockingQueueTest exte
198		ArrayBlockingQueue q = new ArrayBlockingQueue(1);
199		q.addAll(null);
200		shouldThrow();
201	<	}
209	<	catch (NullPointerException success) {}
201	>	} catch (NullPointerException success) {}
202		}
203
204		/**
#	Line 217 | Line 209 | public class ArrayBlockingQueueTest exte
209		ArrayBlockingQueue q = populatedQueue(SIZE);
210		q.addAll(q);
211		shouldThrow();
212	<	}
221	<	catch (IllegalArgumentException success) {}
212	>	} catch (IllegalArgumentException success) {}
213		}
214
215
#	Line 231 | Line 222 | public class ArrayBlockingQueueTest exte
222		Integer[] ints = new Integer[SIZE];
223		q.addAll(Arrays.asList(ints));
224		shouldThrow();
225	<	}
235	<	catch (NullPointerException success) {}
225	>	} catch (NullPointerException success) {}
226		}
227		/**
228		* addAll of a collection with any null elements throws NPE after
#	Line 246 | Line 236 | public class ArrayBlockingQueueTest exte
236		ints[i] = new Integer(i);
237		q.addAll(Arrays.asList(ints));
238		shouldThrow();
239	<	}
250	<	catch (NullPointerException success) {}
239	>	} catch (NullPointerException success) {}
240		}
241		/**
242		* addAll throws ISE if not enough room
#	Line 260 | Line 249 | public class ArrayBlockingQueueTest exte
249		ints[i] = new Integer(i);
250		q.addAll(Arrays.asList(ints));
251		shouldThrow();
252	<	}
264	<	catch (IllegalStateException success) {}
252	>	} catch (IllegalStateException success) {}
253		}
254		/**
255		* Queue contains all elements, in traversal order, of successful addAll
256		*/
257		public void testAddAll5() {
258	<	try {
259	<	Integer[] empty = new Integer[0];
260	<	Integer[] ints = new Integer[SIZE];
261	<	for (int i = 0; i < SIZE; ++i)
262	<	ints[i] = new Integer(i);
263	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
264	<	assertFalse(q.addAll(Arrays.asList(empty)));
265	<	assertTrue(q.addAll(Arrays.asList(ints)));
266	<	for (int i = 0; i < SIZE; ++i)
279	<	assertEquals(ints[i], q.poll());
280	<	}
281	<	finally {}
258	>	Integer[] empty = new Integer[0];
259	>	Integer[] ints = new Integer[SIZE];
260	>	for (int i = 0; i < SIZE; ++i)
261	>	ints[i] = new Integer(i);
262	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
263	>	assertFalse(q.addAll(Arrays.asList(empty)));
264	>	assertTrue(q.addAll(Arrays.asList(ints)));
265	>	for (int i = 0; i < SIZE; ++i)
266	>	assertEquals(ints[i], q.poll());
267		}
268
269		/**
270		*  put(null) throws NPE
271		*/
272	<	public void testPutNull() {
273	<	try {
272	>	public void testPutNull() throws InterruptedException {
273	>	try {
274		ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
275		q.put(null);
276		shouldThrow();
277	<	}
293	<	catch (NullPointerException success){
294	<	}
295	<	catch (InterruptedException ie) {
296	<	unexpectedException();
297	<	}
277	>	} catch (NullPointerException success) {}
278		}
279
280		/**
281		* all elements successfully put are contained
282		*/
283	<	public void testPut() {
284	<	try {
285	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
286	<	for (int i = 0; i < SIZE; ++i) {
287	<	Integer I = new Integer(i);
288	<	q.put(I);
309	<	assertTrue(q.contains(I));
310	<	}
311	<	assertEquals(0, q.remainingCapacity());
312	<	}
313	<	catch (InterruptedException ie) {
314	<	unexpectedException();
283	>	public void testPut() throws InterruptedException {
284	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
285	>	for (int i = 0; i < SIZE; ++i) {
286	>	Integer I = new Integer(i);
287	>	q.put(I);
288	>	assertTrue(q.contains(I));
289		}
290	+	assertEquals(0, q.remainingCapacity());
291		}
292
293		/**
294		* put blocks interruptibly if full
295		*/
296	<	public void testBlockingPut() {
296	>	public void testBlockingPut() throws InterruptedException {
297		final ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
298	<	Thread t = new Thread(new Runnable() {
299	<	public void run() {
300	<	int added = 0;
301	<	try {
302	<	for (int i = 0; i < SIZE; ++i) {
303	<	q.put(new Integer(i));
304	<	++added;
305	<	}
306	<	q.put(new Integer(SIZE));
307	<	threadShouldThrow();
308	<	} catch (InterruptedException ie){
309	<	threadAssertEquals(added, SIZE);
310	<	}
311	<	}});
312	<	try {
313	<	t.start();
314	<	Thread.sleep(MEDIUM_DELAY_MS);
315	<	t.interrupt();
341	<	t.join();
342	<	}
343	<	catch (InterruptedException ie) {
344	<	unexpectedException();
345	<	}
298	>	Thread t = new Thread(new CheckedRunnable() {
299	>	public void realRun() {
300	>	int added = 0;
301	>	try {
302	>	for (int i = 0; i < SIZE; ++i) {
303	>	q.put(new Integer(i));
304	>	++added;
305	>	}
306	>	q.put(new Integer(SIZE));
307	>	threadShouldThrow();
308	>	} catch (InterruptedException success) {
309	>	threadAssertEquals(added, SIZE);
310	>	}}});
311	>
312	>	t.start();
313	>	Thread.sleep(MEDIUM_DELAY_MS);
314	>	t.interrupt();
315	>	t.join();
316		}
317
318		/**
319		* put blocks waiting for take when full
320		*/
321	<	public void testPutWithTake() {
321	>	public void testPutWithTake() throws InterruptedException {
322		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
323	<	Thread t = new Thread(new Runnable() {
324	<	public void run() {
325	<	int added = 0;
326	<	try {
327	<	q.put(new Object());
328	<	++added;
329	<	q.put(new Object());
330	<	++added;
331	<	q.put(new Object());
332	<	++added;
333	<	q.put(new Object());
334	<	++added;
335	<	threadShouldThrow();
336	<	} catch (InterruptedException e){
337	<	threadAssertTrue(added >= 2);
338	<	}
339	<	}
340	<	});
341	<	try {
342	<	t.start();
343	<	Thread.sleep(SHORT_DELAY_MS);
344	<	q.take();
345	<	t.interrupt();
376	<	t.join();
377	<	} catch (Exception e){
378	<	unexpectedException();
379	<	}
323	>	Thread t = new Thread(new CheckedRunnable() {
324	>	public void realRun() {
325	>	int added = 0;
326	>	try {
327	>	q.put(new Object());
328	>	++added;
329	>	q.put(new Object());
330	>	++added;
331	>	q.put(new Object());
332	>	++added;
333	>	q.put(new Object());
334	>	++added;
335	>	threadShouldThrow();
336	>	} catch (InterruptedException success) {
337	>	threadAssertTrue(added >= 2);
338	>	}
339	>	}});
340	>
341	>	t.start();
342	>	Thread.sleep(SHORT_DELAY_MS);
343	>	q.take();
344	>	t.interrupt();
345	>	t.join();
346		}
347
348		/**
349		* timed offer times out if full and elements not taken
350		*/
351	<	public void testTimedOffer() {
351	>	public void testTimedOffer() throws InterruptedException {
352		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
353	<	Thread t = new Thread(new Runnable() {
354	<	public void run() {
355	<	try {
356	<	q.put(new Object());
357	<	q.put(new Object());
358	<	threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, TimeUnit.MILLISECONDS));
359	<	q.offer(new Object(), LONG_DELAY_MS, TimeUnit.MILLISECONDS);
360	<	threadShouldThrow();
361	<	} catch (InterruptedException success){}
362	<	}
363	<	});
364	<
399	<	try {
400	<	t.start();
401	<	Thread.sleep(SHORT_DELAY_MS);
402	<	t.interrupt();
403	<	t.join();
404	<	} catch (Exception e){
405	<	unexpectedException();
406	<	}
353	>	Thread t = new ThreadShouldThrow(InterruptedException.class) {
354	>	public void realRun() throws InterruptedException {
355	>	q.put(new Object());
356	>	q.put(new Object());
357	>	threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, MILLISECONDS));
358	>	q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
359	>	}};
360	>
361	>	t.start();
362	>	Thread.sleep(SHORT_DELAY_MS);
363	>	t.interrupt();
364	>	t.join();
365		}
366
367		/**
368		* take retrieves elements in FIFO order
369		*/
370	<	public void testTake() {
371	<	try {
372	<	ArrayBlockingQueue q = populatedQueue(SIZE);
373	<	for (int i = 0; i < SIZE; ++i) {
374	<	assertEquals(i, ((Integer)q.take()).intValue());
417	<	}
418	<	} catch (InterruptedException e){
419	<	unexpectedException();
420	<	}
370	>	public void testTake() throws InterruptedException {
371	>	ArrayBlockingQueue q = populatedQueue(SIZE);
372	>	for (int i = 0; i < SIZE; ++i) {
373	>	assertEquals(i, ((Integer)q.take()).intValue());
374	>	}
375		}
376
377		/**
378		* take blocks interruptibly when empty
379		*/
380	<	public void testTakeFromEmpty() {
380	>	public void testTakeFromEmpty() throws InterruptedException {
381		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
382	<	Thread t = new Thread(new Runnable() {
383	<	public void run() {
384	<	try {
385	<	q.take();
386	<	threadShouldThrow();
387	<	} catch (InterruptedException success){ }
388	<	}
389	<	});
390	<	try {
437	<	t.start();
438	<	Thread.sleep(SHORT_DELAY_MS);
439	<	t.interrupt();
440	<	t.join();
441	<	} catch (Exception e){
442	<	unexpectedException();
443	<	}
382	>	Thread t = new ThreadShouldThrow(InterruptedException.class) {
383	>	public void realRun() throws InterruptedException {
384	>	q.take();
385	>	}};
386	>
387	>	t.start();
388	>	Thread.sleep(SHORT_DELAY_MS);
389	>	t.interrupt();
390	>	t.join();
391		}
392
393		/**
394		* Take removes existing elements until empty, then blocks interruptibly
395		*/
396	<	public void testBlockingTake() {
397	<	Thread t = new Thread(new Runnable() {
398	<	public void run() {
399	<	try {
400	<	ArrayBlockingQueue q = populatedQueue(SIZE);
401	<	for (int i = 0; i < SIZE; ++i) {
402	<	threadAssertEquals(i, ((Integer)q.take()).intValue());
403	<	}
404	<	q.take();
405	<	threadShouldThrow();
406	<	} catch (InterruptedException success){
407	<	}
461	<	}});
462	<	try {
463	<	t.start();
464	<	Thread.sleep(SHORT_DELAY_MS);
396	>	public void testBlockingTake() throws InterruptedException {
397	>	Thread t = new ThreadShouldThrow(InterruptedException.class) {
398	>	public void realRun() throws InterruptedException {
399	>	ArrayBlockingQueue q = populatedQueue(SIZE);
400	>	for (int i = 0; i < SIZE; ++i) {
401	>	threadAssertEquals(i, ((Integer)q.take()).intValue());
402	>	}
403	>	q.take();
404	>	}};
405	>
406	>	t.start();
407	>	Thread.sleep(SHORT_DELAY_MS);
408		t.interrupt();
409		t.join();
467	–	}
468	–	catch (InterruptedException ie) {
469	–	unexpectedException();
470	–	}
410		}
411
412
#	Line 479 | Line 418 | public class ArrayBlockingQueueTest exte
418		for (int i = 0; i < SIZE; ++i) {
419		assertEquals(i, ((Integer)q.poll()).intValue());
420		}
421	<	assertNull(q.poll());
421	>	assertNull(q.poll());
422		}
423
424		/**
425		* timed pool with zero timeout succeeds when non-empty, else times out
426		*/
427	<	public void testTimedPoll0() {
428	<	try {
429	<	ArrayBlockingQueue q = populatedQueue(SIZE);
430	<	for (int i = 0; i < SIZE; ++i) {
431	<	assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
432	<	}
494	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
495	<	} catch (InterruptedException e){
496	<	unexpectedException();
497	<	}
427	>	public void testTimedPoll0() throws InterruptedException {
428	>	ArrayBlockingQueue q = populatedQueue(SIZE);
429	>	for (int i = 0; i < SIZE; ++i) {
430	>	assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
431	>	}
432	>	assertNull(q.poll(0, MILLISECONDS));
433		}
434
435		/**
436		* timed pool with nonzero timeout succeeds when non-empty, else times out
437		*/
438	<	public void testTimedPoll() {
439	<	try {
440	<	ArrayBlockingQueue q = populatedQueue(SIZE);
441	<	for (int i = 0; i < SIZE; ++i) {
442	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
443	<	}
509	<	assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
510	<	} catch (InterruptedException e){
511	<	unexpectedException();
512	<	}
438	>	public void testTimedPoll() throws InterruptedException {
439	>	ArrayBlockingQueue q = populatedQueue(SIZE);
440	>	for (int i = 0; i < SIZE; ++i) {
441	>	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
442	>	}
443	>	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
444		}
445
446		/**
447		* Interrupted timed poll throws InterruptedException instead of
448		* returning timeout status
449		*/
450	<	public void testInterruptedTimedPoll() {
451	<	Thread t = new Thread(new Runnable() {
452	<	public void run() {
453	<	try {
454	<	ArrayBlockingQueue q = populatedQueue(SIZE);
455	<	for (int i = 0; i < SIZE; ++i) {
456	<	threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
457	<	}
458	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
459	<	} catch (InterruptedException success){
460	<	}
461	<	}});
462	<	try {
463	<	t.start();
533	<	Thread.sleep(SHORT_DELAY_MS);
534	<	t.interrupt();
535	<	t.join();
536	<	}
537	<	catch (InterruptedException ie) {
538	<	unexpectedException();
539	<	}
450	>	public void testInterruptedTimedPoll() throws InterruptedException {
451	>	Thread t = new ThreadShouldThrow(InterruptedException.class) {
452	>	public void realRun() throws InterruptedException {
453	>	ArrayBlockingQueue q = populatedQueue(SIZE);
454	>	for (int i = 0; i < SIZE; ++i) {
455	>	threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
456	>	}
457	>	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
458	>	}};
459	>
460	>	t.start();
461	>	Thread.sleep(SMALL_DELAY_MS);
462	>	t.interrupt();
463	>	t.join();
464		}
465
466		/**
467		*  timed poll before a delayed offer fails; after offer succeeds;
468		*  on interruption throws
469		*/
470	<	public void testTimedPollWithOffer() {
470	>	public void testTimedPollWithOffer() throws InterruptedException {
471		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
472	<	Thread t = new Thread(new Runnable() {
473	<	public void run() {
474	<	try {
475	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
476	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
477	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
478	<	threadShouldThrow();
479	<	} catch (InterruptedException success) { }
480	<	}
481	<	});
482	<	try {
483	<	t.start();
484	<	Thread.sleep(SMALL_DELAY_MS);
561	<	assertTrue(q.offer(zero, SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
562	<	t.interrupt();
563	<	t.join();
564	<	} catch (Exception e){
565	<	unexpectedException();
566	<	}
567	<	}
472	>	Thread t = new ThreadShouldThrow(InterruptedException.class) {
473	>	public void realRun() throws InterruptedException {
474	>	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
475	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
476	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
477	>	}};
478	>
479	>	t.start();
480	>	Thread.sleep(SMALL_DELAY_MS);
481	>	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
482	>	t.interrupt();
483	>	t.join();
484	>	}
485
486
487		/**
#	Line 578 | Line 495 | public class ArrayBlockingQueueTest exte
495		assertTrue(q.peek() == null ||
496		i != ((Integer)q.peek()).intValue());
497		}
498	<	assertNull(q.peek());
498	>	assertNull(q.peek());
499		}
500
501		/**
#	Line 593 | Line 510 | public class ArrayBlockingQueueTest exte
510		try {
511		q.element();
512		shouldThrow();
513	<	}
597	<	catch (NoSuchElementException success) {}
513	>	} catch (NoSuchElementException success) {}
514		}
515
516		/**
#	Line 608 | Line 524 | public class ArrayBlockingQueueTest exte
524		try {
525		q.remove();
526		shouldThrow();
527	<	} catch (NoSuchElementException success){
612	<	}
527	>	} catch (NoSuchElementException success) {}
528		}
529
530		/**
#	Line 626 | Line 541 | public class ArrayBlockingQueueTest exte
541		}
542		assertTrue(q.isEmpty());
543		}
544	<
544	>
545		/**
546		* contains(x) reports true when elements added but not yet removed
547		*/
#	Line 707 | Line 622 | public class ArrayBlockingQueueTest exte
622		/**
623		*  toArray contains all elements
624		*/
625	<	public void testToArray() {
625	>	public void testToArray() throws InterruptedException {
626		ArrayBlockingQueue q = populatedQueue(SIZE);
627	<	Object[] o = q.toArray();
628	<	try {
629	<	for(int i = 0; i < o.length; i++)
715	<	assertEquals(o[i], q.take());
716	<	} catch (InterruptedException e){
717	<	unexpectedException();
718	<	}
627	>	Object[] o = q.toArray();
628	>	for (int i = 0; i < o.length; i++)
629	>	assertEquals(o[i], q.take());
630		}
631
632		/**
633		* toArray(a) contains all elements
634		*/
635	<	public void testToArray2() {
635	>	public void testToArray2() throws InterruptedException {
636		ArrayBlockingQueue q = populatedQueue(SIZE);
637	<	Integer[] ints = new Integer[SIZE];
638	<	ints = (Integer[])q.toArray(ints);
639	<	try {
640	<	for(int i = 0; i < ints.length; i++)
730	<	assertEquals(ints[i], q.take());
731	<	} catch (InterruptedException e){
732	<	unexpectedException();
733	<	}
637	>	Integer[] ints = new Integer[SIZE];
638	>	ints = (Integer[])q.toArray(ints);
639	>	for (int i = 0; i < ints.length; i++)
640	>	assertEquals(ints[i], q.take());
641		}
642
643		/**
644		* toArray(null) throws NPE
645		*/
646		public void testToArray_BadArg() {
647	<	try {
647	>	try {
648		ArrayBlockingQueue q = populatedQueue(SIZE);
649	<	Object o[] = q.toArray(null);
650	<	shouldThrow();
651	<	} catch(NullPointerException success){}
649	>	Object o[] = q.toArray(null);
650	>	shouldThrow();
651	>	} catch (NullPointerException success) {}
652		}
653
654		/**
655		* toArray with incompatible array type throws CCE
656		*/
657		public void testToArray1_BadArg() {
658	<	try {
658	>	try {
659		ArrayBlockingQueue q = populatedQueue(SIZE);
660	<	Object o[] = q.toArray(new String[10] );
661	<	shouldThrow();
662	<	} catch(ArrayStoreException  success){}
660	>	Object o[] = q.toArray(new String[10] );
661	>	shouldThrow();
662	>	} catch (ArrayStoreException success) {}
663		}
664
665	<
665	>
666		/**
667		* iterator iterates through all elements
668		*/
669	<	public void testIterator() {
669	>	public void testIterator() throws InterruptedException {
670		ArrayBlockingQueue q = populatedQueue(SIZE);
671	<	Iterator it = q.iterator();
672	<	try {
673	<	while(it.hasNext()){
674	<	assertEquals(it.next(), q.take());
768	<	}
769	<	} catch (InterruptedException e){
770	<	unexpectedException();
771	<	}
671	>	Iterator it = q.iterator();
672	>	while (it.hasNext()) {
673	>	assertEquals(it.next(), q.take());
674	>	}
675		}
676
677		/**
#	Line 783 | Line 686 | public class ArrayBlockingQueueTest exte
686		Iterator it = q.iterator();
687		it.next();
688		it.remove();
689	<
689	>
690		it = q.iterator();
691		assertEquals(it.next(), one);
692		assertEquals(it.next(), three);
#	Line 817 | Line 720 | public class ArrayBlockingQueueTest exte
720		q.add(one);
721		q.add(two);
722		q.add(three);
723	<	try {
724	<	for (Iterator it = q.iterator(); it.hasNext();) {
725	<	q.remove();
823	<	it.next();
824	<	}
825	<	}
826	<	catch (ConcurrentModificationException e) {
827	<	unexpectedException();
723	>	for (Iterator it = q.iterator(); it.hasNext();) {
724	>	q.remove();
725	>	it.next();
726		}
727		assertEquals(0, q.size());
728		}
#	Line 839 | Line 737 | public class ArrayBlockingQueueTest exte
737		for (int i = 0; i < SIZE; ++i) {
738		assertTrue(s.indexOf(String.valueOf(i)) >= 0);
739		}
740	<	}
740	>	}
741
742
743		/**
#	Line 850 | Line 748 | public class ArrayBlockingQueueTest exte
748		q.add(one);
749		q.add(two);
750		ExecutorService executor = Executors.newFixedThreadPool(2);
751	<	executor.execute(new Runnable() {
752	<	public void run() {
751	>	executor.execute(new CheckedRunnable() {
752	>	public void realRun() throws InterruptedException {
753		threadAssertFalse(q.offer(three));
754	<	try {
755	<	threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
756	<	threadAssertEquals(0, q.remainingCapacity());
757	<	}
758	<	catch (InterruptedException e) {
759	<	threadUnexpectedException();
760	<	}
761	<	}
762	<	});
754	>	threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
755	>	threadAssertEquals(0, q.remainingCapacity());
756	>	}});
757	>
758	>	executor.execute(new CheckedRunnable() {
759	>	public void realRun() throws InterruptedException {
760	>	Thread.sleep(SMALL_DELAY_MS);
761	>	threadAssertEquals(one, q.take());
762	>	}});
763
866	–	executor.execute(new Runnable() {
867	–	public void run() {
868	–	try {
869	–	Thread.sleep(SMALL_DELAY_MS);
870	–	threadAssertEquals(one, q.take());
871	–	}
872	–	catch (InterruptedException e) {
873	–	threadUnexpectedException();
874	–	}
875	–	}
876	–	});
877	–
764		joinPool(executor);
765
766		}
#	Line 885 | Line 771 | public class ArrayBlockingQueueTest exte
771		public void testPollInExecutor() {
772		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
773		ExecutorService executor = Executors.newFixedThreadPool(2);
774	<	executor.execute(new Runnable() {
775	<	public void run() {
774	>	executor.execute(new CheckedRunnable() {
775	>	public void realRun() throws InterruptedException {
776		threadAssertNull(q.poll());
777	<	try {
778	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
779	<	threadAssertTrue(q.isEmpty());
780	<	}
781	<	catch (InterruptedException e) {
782	<	threadUnexpectedException();
783	<	}
784	<	}
785	<	});
777	>	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
778	>	threadAssertTrue(q.isEmpty());
779	>	}});
780	>
781	>	executor.execute(new CheckedRunnable() {
782	>	public void realRun() throws InterruptedException {
783	>	Thread.sleep(SMALL_DELAY_MS);
784	>	q.put(one);
785	>	}});
786
901	–	executor.execute(new Runnable() {
902	–	public void run() {
903	–	try {
904	–	Thread.sleep(SMALL_DELAY_MS);
905	–	q.put(one);
906	–	}
907	–	catch (InterruptedException e) {
908	–	threadUnexpectedException();
909	–	}
910	–	}
911	–	});
912	–
787		joinPool(executor);
788		}
789
790		/**
791		* A deserialized serialized queue has same elements in same order
792		*/
793	<	public void testSerialization() {
793	>	public void testSerialization() throws Exception {
794		ArrayBlockingQueue q = populatedQueue(SIZE);
795
796	<	try {
797	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
798	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
799	<	out.writeObject(q);
800	<	out.close();
801	<
802	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
803	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
804	<	ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
805	<	assertEquals(q.size(), r.size());
806	<	while (!q.isEmpty())
933	<	assertEquals(q.remove(), r.remove());
934	<	} catch(Exception e){
935	<	unexpectedException();
936	<	}
796	>	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
797	>	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
798	>	out.writeObject(q);
799	>	out.close();
800	>
801	>	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
802	>	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
803	>	ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
804	>	assertEquals(q.size(), r.size());
805	>	while (!q.isEmpty())
806	>	assertEquals(q.remove(), r.remove());
807		}
808
809		/**
810		* drainTo(null) throws NPE
811	<	*/
811	>	*/
812		public void testDrainToNull() {
813		ArrayBlockingQueue q = populatedQueue(SIZE);
814		try {
815		q.drainTo(null);
816		shouldThrow();
817	<	} catch(NullPointerException success) {
948	<	}
817	>	} catch (NullPointerException success) {}
818		}
819
820		/**
821		* drainTo(this) throws IAE
822	<	*/
822	>	*/
823		public void testDrainToSelf() {
824		ArrayBlockingQueue q = populatedQueue(SIZE);
825		try {
826		q.drainTo(q);
827		shouldThrow();
828	<	} catch(IllegalArgumentException success) {
960	<	}
828	>	} catch (IllegalArgumentException success) {}
829		}
830
831		/**
832		* drainTo(c) empties queue into another collection c
833	<	*/
833	>	*/
834		public void testDrainTo() {
835		ArrayBlockingQueue q = populatedQueue(SIZE);
836		ArrayList l = new ArrayList();
837		q.drainTo(l);
838		assertEquals(q.size(), 0);
839		assertEquals(l.size(), SIZE);
840	<	for (int i = 0; i < SIZE; ++i)
840	>	for (int i = 0; i < SIZE; ++i)
841		assertEquals(l.get(i), new Integer(i));
842		q.add(zero);
843		q.add(one);
#	Line 980 | Line 848 | public class ArrayBlockingQueueTest exte
848		q.drainTo(l);
849		assertEquals(q.size(), 0);
850		assertEquals(l.size(), 2);
851	<	for (int i = 0; i < 2; ++i)
851	>	for (int i = 0; i < 2; ++i)
852		assertEquals(l.get(i), new Integer(i));
853		}
854
855		/**
856		* drainTo empties full queue, unblocking a waiting put.
857	<	*/
858	<	public void testDrainToWithActivePut() {
857	>	*/
858	>	public void testDrainToWithActivePut() throws InterruptedException {
859		final ArrayBlockingQueue q = populatedQueue(SIZE);
860	<	Thread t = new Thread(new Runnable() {
861	<	public void run() {
862	<	try {
863	<	q.put(new Integer(SIZE+1));
864	<	} catch (InterruptedException ie){
865	<	threadUnexpectedException();
866	<	}
867	<	}
868	<	});
869	<	try {
870	<	t.start();
871	<	ArrayList l = new ArrayList();
872	<	q.drainTo(l);
1005	<	assertTrue(l.size() >= SIZE);
1006	<	for (int i = 0; i < SIZE; ++i)
1007	<	assertEquals(l.get(i), new Integer(i));
1008	<	t.join();
1009	<	assertTrue(q.size() + l.size() >= SIZE);
1010	<	} catch(Exception e){
1011	<	unexpectedException();
1012	<	}
860	>	Thread t = new Thread(new CheckedRunnable() {
861	>	public void realRun() throws InterruptedException {
862	>	q.put(new Integer(SIZE+1));
863	>	}});
864	>
865	>	t.start();
866	>	ArrayList l = new ArrayList();
867	>	q.drainTo(l);
868	>	assertTrue(l.size() >= SIZE);
869	>	for (int i = 0; i < SIZE; ++i)
870	>	assertEquals(l.get(i), new Integer(i));
871	>	t.join();
872	>	assertTrue(q.size() + l.size() >= SIZE);
873		}
874
875		/**
876		* drainTo(null, n) throws NPE
877	<	*/
877	>	*/
878		public void testDrainToNullN() {
879		ArrayBlockingQueue q = populatedQueue(SIZE);
880		try {
881		q.drainTo(null, 0);
882		shouldThrow();
883	<	} catch(NullPointerException success) {
1024	<	}
883	>	} catch (NullPointerException success) {}
884		}
885
886		/**
887		* drainTo(this, n) throws IAE
888	<	*/
888	>	*/
889		public void testDrainToSelfN() {
890		ArrayBlockingQueue q = populatedQueue(SIZE);
891		try {
892		q.drainTo(q, 0);
893		shouldThrow();
894	<	} catch(IllegalArgumentException success) {
1036	<	}
894	>	} catch (IllegalArgumentException success) {}
895		}
896
897		/**
898		* drainTo(c, n) empties first max {n, size} elements of queue into c
899	<	*/
899	>	*/
900		public void testDrainToN() {
901		ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
902		for (int i = 0; i < SIZE + 2; ++i) {
903	<	for(int j = 0; j < SIZE; j++)
903	>	for (int j = 0; j < SIZE; j++)
904		assertTrue(q.offer(new Integer(j)));
905		ArrayList l = new ArrayList();
906		q.drainTo(l, i);
907		int k = (i < SIZE)? i : SIZE;
908		assertEquals(l.size(), k);
909		assertEquals(q.size(), SIZE-k);
910	<	for (int j = 0; j < k; ++j)
910	>	for (int j = 0; j < k; ++j)
911		assertEquals(l.get(j), new Integer(j));
912		while (q.poll() != null) ;
913		}
914		}
915
1058	–
916		}

Diff Legend

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