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.15 by jsr166, Sat Nov 21 02:07:26 2009 UTC vs.
Revision 1.22 by jsr166, Sat Nov 21 19:48:24 2009 UTC

#	Line 10 | Line 10
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 {
#	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 159 | Line 152 | public class ArrayBlockingQueueTest exte
152		ArrayBlockingQueue q = new ArrayBlockingQueue(1);
153		q.offer(null);
154		shouldThrow();
155	<	} catch (NullPointerException success) { }
155	>	} catch (NullPointerException success) {}
156		}
157
158		/**
#	Line 170 | Line 163 | public class ArrayBlockingQueueTest exte
163		ArrayBlockingQueue q = new ArrayBlockingQueue(1);
164		q.add(null);
165		shouldThrow();
166	<	} catch (NullPointerException success) { }
166	>	} catch (NullPointerException success) {}
167		}
168
169		/**
#	Line 193 | Line 186 | public class ArrayBlockingQueueTest exte
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() {
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;
330	<	}
331	<	q.put(new Integer(SIZE));
332	<	threadShouldThrow();
333	<	} catch (InterruptedException ie) {
334	<	threadAssertEquals(added, SIZE);
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	<	}});
307	<	try {
308	<	t.start();
309	<	Thread.sleep(MEDIUM_DELAY_MS);
310	<	t.interrupt();
311	<	t.join();
312	<	}
313	<	catch (InterruptedException ie) {
314	<	unexpectedException();
315	<	}
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) {
416	<	assertEquals(i, ((Integer)q.take()).intValue());
417	<	}
418	<	} catch (InterruptedException e) {
419	<	unexpectedException();
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) {
460	<	}
461	<	}});
462	<	try {
463	<	t.start();
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 485 | Line 424 | public class ArrayBlockingQueueTest exte
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) {
492	<	assertEquals(i, ((Integer)q.poll(0, TimeUnit.MILLISECONDS)).intValue());
493	<	}
494	<	assertNull(q.poll(0, TimeUnit.MILLISECONDS));
495	<	} catch (InterruptedException e) {
496	<	unexpectedException();
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) {
507	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS)).intValue());
508	<	}
509	<	assertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
510	<	} catch (InterruptedException e) {
511	<	unexpectedException();
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();
464	<	Thread.sleep(SHORT_DELAY_MS);
465	<	t.interrupt();
466	<	t.join();
536	<	}
537	<	catch (InterruptedException ie) {
538	<	unexpectedException();
539	<	}
450	>	public void testInterruptedTimedPoll() throws InterruptedException {
451	>	Thread t = new Thread(new CheckedRunnable() {
452	>	public void realRun() throws InterruptedException {
453	>	ArrayBlockingQueue q = populatedQueue(SIZE);
454	>	for (int i = 0; i < SIZE; ++i) {
455	>	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
456	>	}
457	>	try {
458	>	q.poll(SMALL_DELAY_MS, MILLISECONDS);
459	>	shouldThrow();
460	>	} catch (InterruptedException success) {}
461	>	}});
462	>
463	>	t.start();
464	>	Thread.sleep(SHORT_DELAY_MS);
465	>	t.interrupt();
466	>	t.join();
467		}
468
469		/**
470		*  timed poll before a delayed offer fails; after offer succeeds;
471		*  on interruption throws
472		*/
473	<	public void testTimedPollWithOffer() {
473	>	public void testTimedPollWithOffer() throws InterruptedException {
474		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
475	<	Thread t = new Thread(new Runnable() {
476	<	public void run() {
477	<	try {
478	<	threadAssertNull(q.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
479	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
480	<	q.poll(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
481	<	threadShouldThrow();
482	<	} catch (InterruptedException success) { }
483	<	}
484	<	});
485	<	try {
486	<	t.start();
560	<	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	<	}
475	>	Thread t = new ThreadShouldThrow(InterruptedException.class) {
476	>	public void realRun() throws InterruptedException {
477	>	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
478	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
479	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
480	>	}};
481	>
482	>	t.start();
483	>	Thread.sleep(SMALL_DELAY_MS);
484	>	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
485	>	t.interrupt();
486	>	t.join();
487		}
488
489
#	Line 593 | Line 513 | public class ArrayBlockingQueueTest exte
513		try {
514		q.element();
515		shouldThrow();
516	<	}
597	<	catch (NoSuchElementException success) {}
516	>	} catch (NoSuchElementException success) {}
517		}
518
519		/**
#	Line 608 | Line 527 | public class ArrayBlockingQueueTest exte
527		try {
528		q.remove();
529		shouldThrow();
530	<	} catch (NoSuchElementException success) {
612	<	}
530	>	} catch (NoSuchElementException success) {}
531		}
532
533		/**
#	Line 707 | Line 625 | public class ArrayBlockingQueueTest exte
625		/**
626		*  toArray contains all elements
627		*/
628	<	public void testToArray() {
628	>	public void testToArray() throws InterruptedException {
629		ArrayBlockingQueue q = populatedQueue(SIZE);
630		Object[] o = q.toArray();
713	–	try {
631		for (int i = 0; i < o.length; i++)
632		assertEquals(o[i], q.take());
716	–	} catch (InterruptedException e) {
717	–	unexpectedException();
718	–	}
633		}
634
635		/**
636		* toArray(a) contains all elements
637		*/
638	<	public void testToArray2() {
638	>	public void testToArray2() throws InterruptedException {
639		ArrayBlockingQueue q = populatedQueue(SIZE);
640		Integer[] ints = new Integer[SIZE];
641		ints = (Integer[])q.toArray(ints);
642	<	try {
643	<	for (int i = 0; i < ints.length; i++)
730	<	assertEquals(ints[i], q.take());
731	<	} catch (InterruptedException e) {
732	<	unexpectedException();
733	<	}
642	>	for (int i = 0; i < ints.length; i++)
643	>	assertEquals(ints[i], q.take());
644		}
645
646		/**
#	Line 752 | Line 662 | public class ArrayBlockingQueueTest exte
662		ArrayBlockingQueue q = populatedQueue(SIZE);
663		Object o[] = q.toArray(new String[10] );
664		shouldThrow();
665	<	} catch (ArrayStoreException  success) {}
665	>	} catch (ArrayStoreException success) {}
666		}
667
668
669		/**
670		* iterator iterates through all elements
671		*/
672	<	public void testIterator() {
672	>	public void testIterator() throws InterruptedException {
673		ArrayBlockingQueue q = populatedQueue(SIZE);
674		Iterator it = q.iterator();
675	<	try {
676	<	while (it.hasNext()) {
767	<	assertEquals(it.next(), q.take());
768	<	}
769	<	} catch (InterruptedException e) {
770	<	unexpectedException();
675	>	while (it.hasNext()) {
676	>	assertEquals(it.next(), q.take());
677		}
678		}
679
#	Line 817 | Line 723 | public class ArrayBlockingQueueTest exte
723		q.add(one);
724		q.add(two);
725		q.add(three);
726	<	try {
727	<	for (Iterator it = q.iterator(); it.hasNext();) {
728	<	q.remove();
823	<	it.next();
824	<	}
825	<	}
826	<	catch (ConcurrentModificationException e) {
827	<	unexpectedException();
726	>	for (Iterator it = q.iterator(); it.hasNext();) {
727	>	q.remove();
728	>	it.next();
729		}
730		assertEquals(0, q.size());
731		}
#	Line 850 | Line 751 | public class ArrayBlockingQueueTest exte
751		q.add(one);
752		q.add(two);
753		ExecutorService executor = Executors.newFixedThreadPool(2);
754	<	executor.execute(new Runnable() {
755	<	public void run() {
754	>	executor.execute(new CheckedRunnable() {
755	>	public void realRun() throws InterruptedException {
756		threadAssertFalse(q.offer(three));
757	<	try {
758	<	threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
759	<	threadAssertEquals(0, q.remainingCapacity());
760	<	}
761	<	catch (InterruptedException e) {
762	<	threadUnexpectedException();
763	<	}
764	<	}
765	<	});
865	<
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	<	});
757	>	threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
758	>	threadAssertEquals(0, q.remainingCapacity());
759	>	}});
760	>
761	>	executor.execute(new CheckedRunnable() {
762	>	public void realRun() throws InterruptedException {
763	>	Thread.sleep(SMALL_DELAY_MS);
764	>	threadAssertEquals(one, q.take());
765	>	}});
766
767		joinPool(executor);
768
#	Line 885 | Line 774 | public class ArrayBlockingQueueTest exte
774		public void testPollInExecutor() {
775		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
776		ExecutorService executor = Executors.newFixedThreadPool(2);
777	<	executor.execute(new Runnable() {
778	<	public void run() {
777	>	executor.execute(new CheckedRunnable() {
778	>	public void realRun() throws InterruptedException {
779		threadAssertNull(q.poll());
780	<	try {
781	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS));
782	<	threadAssertTrue(q.isEmpty());
783	<	}
784	<	catch (InterruptedException e) {
785	<	threadUnexpectedException();
786	<	}
787	<	}
788	<	});
900	<
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	<	});
780	>	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
781	>	threadAssertTrue(q.isEmpty());
782	>	}});
783	>
784	>	executor.execute(new CheckedRunnable() {
785	>	public void realRun() throws InterruptedException {
786	>	Thread.sleep(SMALL_DELAY_MS);
787	>	q.put(one);
788	>	}});
789
790		joinPool(executor);
791		}
#	Line 916 | Line 793 | public class ArrayBlockingQueueTest exte
793		/**
794		* A deserialized serialized queue has same elements in same order
795		*/
796	<	public void testSerialization() {
796	>	public void testSerialization() throws Exception {
797		ArrayBlockingQueue q = populatedQueue(SIZE);
798
799	<	try {
800	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
801	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
802	<	out.writeObject(q);
803	<	out.close();
804	<
805	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
806	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
807	<	ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
808	<	assertEquals(q.size(), r.size());
809	<	while (!q.isEmpty())
933	<	assertEquals(q.remove(), r.remove());
934	<	} catch (Exception e) {
935	<	unexpectedException();
936	<	}
799	>	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
800	>	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
801	>	out.writeObject(q);
802	>	out.close();
803	>
804	>	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
805	>	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
806	>	ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
807	>	assertEquals(q.size(), r.size());
808	>	while (!q.isEmpty())
809	>	assertEquals(q.remove(), r.remove());
810		}
811
812		/**
#	Line 944 | Line 817 | public class ArrayBlockingQueueTest exte
817		try {
818		q.drainTo(null);
819		shouldThrow();
820	<	} catch (NullPointerException success) {
948	<	}
820	>	} catch (NullPointerException success) {}
821		}
822
823		/**
#	Line 956 | Line 828 | public class ArrayBlockingQueueTest exte
828		try {
829		q.drainTo(q);
830		shouldThrow();
831	<	} catch (IllegalArgumentException success) {
960	<	}
831	>	} catch (IllegalArgumentException success) {}
832		}
833
834		/**
#	Line 987 | Line 858 | public class ArrayBlockingQueueTest exte
858		/**
859		* drainTo empties full queue, unblocking a waiting put.
860		*/
861	<	public void testDrainToWithActivePut() {
861	>	public void testDrainToWithActivePut() throws InterruptedException {
862		final ArrayBlockingQueue q = populatedQueue(SIZE);
863	<	Thread t = new Thread(new Runnable() {
864	<	public void run() {
865	<	try {
866	<	q.put(new Integer(SIZE+1));
867	<	} catch (InterruptedException ie) {
868	<	threadUnexpectedException();
869	<	}
870	<	}
871	<	});
872	<	try {
873	<	t.start();
874	<	ArrayList l = new ArrayList();
875	<	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	<	}
863	>	Thread t = new Thread(new CheckedRunnable() {
864	>	public void realRun() throws InterruptedException {
865	>	q.put(new Integer(SIZE+1));
866	>	}});
867	>
868	>	t.start();
869	>	ArrayList l = new ArrayList();
870	>	q.drainTo(l);
871	>	assertTrue(l.size() >= SIZE);
872	>	for (int i = 0; i < SIZE; ++i)
873	>	assertEquals(l.get(i), new Integer(i));
874	>	t.join();
875	>	assertTrue(q.size() + l.size() >= SIZE);
876		}
877
878		/**
#	Line 1020 | Line 883 | public class ArrayBlockingQueueTest exte
883		try {
884		q.drainTo(null, 0);
885		shouldThrow();
886	<	} catch (NullPointerException success) {
1024	<	}
886	>	} catch (NullPointerException success) {}
887		}
888
889		/**
#	Line 1032 | Line 894 | public class ArrayBlockingQueueTest exte
894		try {
895		q.drainTo(q, 0);
896		shouldThrow();
897	<	} catch (IllegalArgumentException success) {
1036	<	}
897	>	} catch (IllegalArgumentException success) {}
898		}
899
900		/**
#	Line 1055 | Line 916 | public class ArrayBlockingQueueTest exte
916		}
917		}
918
1058	–
919		}

Diff Legend

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