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.16 by jsr166, Sat Nov 21 02:33:20 2009 UTC vs.
Revision 1.17 by jsr166, Sat Nov 21 07:10:56 2009 UTC

#	Line 50 | Line 50 | public class ArrayBlockingQueueTest exte
50		try {
51		ArrayBlockingQueue q = new ArrayBlockingQueue(0);
52		shouldThrow();
53	<	}
54	<	catch (IllegalArgumentException success) {}
53	>	} catch (IllegalArgumentException success) {}
54		}
55
56		/**
#	Line 61 | Line 60 | public class ArrayBlockingQueueTest exte
60		try {
61		ArrayBlockingQueue q = new ArrayBlockingQueue(1, true, null);
62		shouldThrow();
63	<	}
65	<	catch (NullPointerException success) {}
63	>	} catch (NullPointerException success) {}
64		}
65
66		/**
#	Line 73 | 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	<	}
77	<	catch (NullPointerException success) {}
74	>	} catch (NullPointerException success) {}
75		}
76
77		/**
#	Line 87 | 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	<	}
91	<	catch (NullPointerException success) {}
87	>	} catch (NullPointerException success) {}
88		}
89
90		/**
#	Line 101 | 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	<	}
105	<	catch (IllegalArgumentException success) {}
100	>	} catch (IllegalArgumentException success) {}
101		}
102
103		/**
#	Line 160 | Line 155 | public class ArrayBlockingQueueTest exte
155		ArrayBlockingQueue q = new ArrayBlockingQueue(1);
156		q.offer(null);
157		shouldThrow();
158	<	} catch (NullPointerException success) { }
158	>	} catch (NullPointerException success) {}
159		}
160
161		/**
#	Line 171 | Line 166 | public class ArrayBlockingQueueTest exte
166		ArrayBlockingQueue q = new ArrayBlockingQueue(1);
167		q.add(null);
168		shouldThrow();
169	<	} catch (NullPointerException success) { }
169	>	} catch (NullPointerException success) {}
170		}
171
172		/**
#	Line 194 | Line 189 | public class ArrayBlockingQueueTest exte
189		}
190		assertEquals(0, q.remainingCapacity());
191		q.add(new Integer(SIZE));
192	<	} catch (IllegalStateException success) {
193	<	}
192	>	shouldThrow();
193	>	} catch (IllegalStateException success) {}
194		}
195
196		/**
#	Line 206 | Line 201 | public class ArrayBlockingQueueTest exte
201		ArrayBlockingQueue q = new ArrayBlockingQueue(1);
202		q.addAll(null);
203		shouldThrow();
204	<	}
210	<	catch (NullPointerException success) {}
204	>	} catch (NullPointerException success) {}
205		}
206
207		/**
#	Line 218 | Line 212 | public class ArrayBlockingQueueTest exte
212		ArrayBlockingQueue q = populatedQueue(SIZE);
213		q.addAll(q);
214		shouldThrow();
215	<	}
222	<	catch (IllegalArgumentException success) {}
215	>	} catch (IllegalArgumentException success) {}
216		}
217
218
#	Line 232 | Line 225 | public class ArrayBlockingQueueTest exte
225		Integer[] ints = new Integer[SIZE];
226		q.addAll(Arrays.asList(ints));
227		shouldThrow();
228	<	}
236	<	catch (NullPointerException success) {}
228	>	} catch (NullPointerException success) {}
229		}
230		/**
231		* addAll of a collection with any null elements throws NPE after
#	Line 247 | Line 239 | public class ArrayBlockingQueueTest exte
239		ints[i] = new Integer(i);
240		q.addAll(Arrays.asList(ints));
241		shouldThrow();
242	<	}
251	<	catch (NullPointerException success) {}
242	>	} catch (NullPointerException success) {}
243		}
244		/**
245		* addAll throws ISE if not enough room
#	Line 261 | Line 252 | public class ArrayBlockingQueueTest exte
252		ints[i] = new Integer(i);
253		q.addAll(Arrays.asList(ints));
254		shouldThrow();
255	<	}
265	<	catch (IllegalStateException success) {}
255	>	} catch (IllegalStateException success) {}
256		}
257		/**
258		* Queue contains all elements, in traversal order, of successful addAll
259		*/
260		public void testAddAll5() {
261	<	try {
262	<	Integer[] empty = new Integer[0];
263	<	Integer[] ints = new Integer[SIZE];
264	<	for (int i = 0; i < SIZE; ++i)
265	<	ints[i] = new Integer(i);
266	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
267	<	assertFalse(q.addAll(Arrays.asList(empty)));
268	<	assertTrue(q.addAll(Arrays.asList(ints)));
269	<	for (int i = 0; i < SIZE; ++i)
280	<	assertEquals(ints[i], q.poll());
281	<	}
282	<	finally {}
261	>	Integer[] empty = new Integer[0];
262	>	Integer[] ints = new Integer[SIZE];
263	>	for (int i = 0; i < SIZE; ++i)
264	>	ints[i] = new Integer(i);
265	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
266	>	assertFalse(q.addAll(Arrays.asList(empty)));
267	>	assertTrue(q.addAll(Arrays.asList(ints)));
268	>	for (int i = 0; i < SIZE; ++i)
269	>	assertEquals(ints[i], q.poll());
270		}
271
272		/**
273		*  put(null) throws NPE
274		*/
275	<	public void testPutNull() {
275	>	public void testPutNull() throws InterruptedException {
276		try {
277		ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
278		q.put(null);
279		shouldThrow();
280	<	}
294	<	catch (NullPointerException success) {
295	<	}
296	<	catch (InterruptedException ie) {
297	<	unexpectedException();
298	<	}
280	>	} catch (NullPointerException success) {}
281		}
282
283		/**
284		* all elements successfully put are contained
285		*/
286	<	public void testPut() {
287	<	try {
288	<	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
289	<	for (int i = 0; i < SIZE; ++i) {
290	<	Integer I = new Integer(i);
291	<	q.put(I);
310	<	assertTrue(q.contains(I));
311	<	}
312	<	assertEquals(0, q.remainingCapacity());
313	<	}
314	<	catch (InterruptedException ie) {
315	<	unexpectedException();
286	>	public void testPut() throws InterruptedException {
287	>	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
288	>	for (int i = 0; i < SIZE; ++i) {
289	>	Integer I = new Integer(i);
290	>	q.put(I);
291	>	assertTrue(q.contains(I));
292		}
293	+	assertEquals(0, q.remainingCapacity());
294		}
295
296		/**
297		* put blocks interruptibly if full
298		*/
299	<	public void testBlockingPut() {
299	>	public void testBlockingPut() throws InterruptedException {
300		final ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
301	<	Thread t = new Thread(new Runnable() {
302	<	public void run() {
303	<	int added = 0;
304	<	try {
305	<	for (int i = 0; i < SIZE; ++i) {
306	<	q.put(new Integer(i));
307	<	++added;
331	<	}
332	<	q.put(new Integer(SIZE));
333	<	threadShouldThrow();
334	<	} catch (InterruptedException ie) {
335	<	threadAssertEquals(added, SIZE);
301	>	Thread t = new Thread(new CheckedRunnable() {
302	>	public void realRun() {
303	>	int added = 0;
304	>	try {
305	>	for (int i = 0; i < SIZE; ++i) {
306	>	q.put(new Integer(i));
307	>	++added;
308		}
309	<	}});
310	<	try {
311	<	t.start();
312	<	Thread.sleep(MEDIUM_DELAY_MS);
313	<	t.interrupt();
314	<	t.join();
315	<	}
316	<	catch (InterruptedException ie) {
317	<	unexpectedException();
318	<	}
309	>	q.put(new Integer(SIZE));
310	>	threadShouldThrow();
311	>	} catch (InterruptedException ie) {
312	>	threadAssertEquals(added, SIZE);
313	>	}}});
314	>
315	>	t.start();
316	>	Thread.sleep(MEDIUM_DELAY_MS);
317	>	t.interrupt();
318	>	t.join();
319		}
320
321		/**
322		* put blocks waiting for take when full
323		*/
324	<	public void testPutWithTake() {
324	>	public void testPutWithTake() throws InterruptedException {
325		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
326	<	Thread t = new Thread(new Runnable() {
327	<	public void run() {
328	<	int added = 0;
329	<	try {
330	<	q.put(new Object());
331	<	++added;
332	<	q.put(new Object());
333	<	++added;
334	<	q.put(new Object());
335	<	++added;
336	<	q.put(new Object());
337	<	++added;
338	<	threadShouldThrow();
339	<	} catch (InterruptedException e) {
340	<	threadAssertTrue(added >= 2);
341	<	}
342	<	}
343	<	});
344	<	try {
345	<	t.start();
346	<	Thread.sleep(SHORT_DELAY_MS);
347	<	q.take();
348	<	t.interrupt();
377	<	t.join();
378	<	} catch (Exception e) {
379	<	unexpectedException();
380	<	}
326	>	Thread t = new Thread(new CheckedRunnable() {
327	>	public void realRun() {
328	>	int added = 0;
329	>	try {
330	>	q.put(new Object());
331	>	++added;
332	>	q.put(new Object());
333	>	++added;
334	>	q.put(new Object());
335	>	++added;
336	>	q.put(new Object());
337	>	++added;
338	>	threadShouldThrow();
339	>	} catch (InterruptedException e) {
340	>	threadAssertTrue(added >= 2);
341	>	}
342	>	}});
343	>
344	>	t.start();
345	>	Thread.sleep(SHORT_DELAY_MS);
346	>	q.take();
347	>	t.interrupt();
348	>	t.join();
349		}
350
351		/**
352		* timed offer times out if full and elements not taken
353		*/
354	<	public void testTimedOffer() {
354	>	public void testTimedOffer() throws InterruptedException {
355		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
356	<	Thread t = new Thread(new Runnable() {
357	<	public void run() {
358	<	try {
359	<	q.put(new Object());
360	<	q.put(new Object());
361	<	threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, MILLISECONDS));
362	<	q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
363	<	threadShouldThrow();
364	<	} catch (InterruptedException success) {}
365	<	}
366	<	});
367	<
400	<	try {
401	<	t.start();
402	<	Thread.sleep(SHORT_DELAY_MS);
403	<	t.interrupt();
404	<	t.join();
405	<	} catch (Exception e) {
406	<	unexpectedException();
407	<	}
356	>	Thread t = new ThreadShouldThrow(InterruptedException.class) {
357	>	public void realRun() throws InterruptedException {
358	>	q.put(new Object());
359	>	q.put(new Object());
360	>	threadAssertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, MILLISECONDS));
361	>	q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
362	>	}};
363	>
364	>	t.start();
365	>	Thread.sleep(SHORT_DELAY_MS);
366	>	t.interrupt();
367	>	t.join();
368		}
369
370		/**
371		* take retrieves elements in FIFO order
372		*/
373	<	public void testTake() {
374	<	try {
375	<	ArrayBlockingQueue q = populatedQueue(SIZE);
376	<	for (int i = 0; i < SIZE; ++i) {
417	<	assertEquals(i, ((Integer)q.take()).intValue());
418	<	}
419	<	} catch (InterruptedException e) {
420	<	unexpectedException();
373	>	public void testTake() throws InterruptedException {
374	>	ArrayBlockingQueue q = populatedQueue(SIZE);
375	>	for (int i = 0; i < SIZE; ++i) {
376	>	assertEquals(i, ((Integer)q.take()).intValue());
377		}
378		}
379
380		/**
381		* take blocks interruptibly when empty
382		*/
383	<	public void testTakeFromEmpty() {
383	>	public void testTakeFromEmpty() throws InterruptedException {
384		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
385	<	Thread t = new Thread(new Runnable() {
386	<	public void run() {
387	<	try {
388	<	q.take();
389	<	threadShouldThrow();
390	<	} catch (InterruptedException success) { }
391	<	}
392	<	});
393	<	try {
438	<	t.start();
439	<	Thread.sleep(SHORT_DELAY_MS);
440	<	t.interrupt();
441	<	t.join();
442	<	} catch (Exception e) {
443	<	unexpectedException();
444	<	}
385	>	Thread t = new ThreadShouldThrow(InterruptedException.class) {
386	>	public void realRun() throws InterruptedException {
387	>	q.take();
388	>	}};
389	>
390	>	t.start();
391	>	Thread.sleep(SHORT_DELAY_MS);
392	>	t.interrupt();
393	>	t.join();
394		}
395
396		/**
397		* Take removes existing elements until empty, then blocks interruptibly
398		*/
399	<	public void testBlockingTake() {
400	<	Thread t = new Thread(new Runnable() {
401	<	public void run() {
402	<	try {
403	<	ArrayBlockingQueue q = populatedQueue(SIZE);
404	<	for (int i = 0; i < SIZE; ++i) {
405	<	threadAssertEquals(i, ((Integer)q.take()).intValue());
406	<	}
407	<	q.take();
408	<	threadShouldThrow();
409	<	} catch (InterruptedException success) {
461	<	}
462	<	}});
463	<	try {
464	<	t.start();
399	>	public void testBlockingTake() throws InterruptedException {
400	>	Thread t = new ThreadShouldThrow(InterruptedException.class) {
401	>	public void realRun() throws InterruptedException {
402	>	ArrayBlockingQueue q = populatedQueue(SIZE);
403	>	for (int i = 0; i < SIZE; ++i) {
404	>	threadAssertEquals(i, ((Integer)q.take()).intValue());
405	>	}
406	>	q.take();
407	>	}};
408	>
409	>	t.start();
410		Thread.sleep(SHORT_DELAY_MS);
411		t.interrupt();
412		t.join();
468	–	}
469	–	catch (InterruptedException ie) {
470	–	unexpectedException();
471	–	}
413		}
414
415
#	Line 486 | Line 427 | public class ArrayBlockingQueueTest exte
427		/**
428		* timed pool with zero timeout succeeds when non-empty, else times out
429		*/
430	<	public void testTimedPoll0() {
431	<	try {
432	<	ArrayBlockingQueue q = populatedQueue(SIZE);
433	<	for (int i = 0; i < SIZE; ++i) {
493	<	assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
494	<	}
495	<	assertNull(q.poll(0, MILLISECONDS));
496	<	} catch (InterruptedException e) {
497	<	unexpectedException();
430	>	public void testTimedPoll0() throws InterruptedException {
431	>	ArrayBlockingQueue q = populatedQueue(SIZE);
432	>	for (int i = 0; i < SIZE; ++i) {
433	>	assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
434		}
435	+	assertNull(q.poll(0, MILLISECONDS));
436		}
437
438		/**
439		* timed pool with nonzero timeout succeeds when non-empty, else times out
440		*/
441	<	public void testTimedPoll() {
442	<	try {
443	<	ArrayBlockingQueue q = populatedQueue(SIZE);
444	<	for (int i = 0; i < SIZE; ++i) {
508	<	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
509	<	}
510	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
511	<	} catch (InterruptedException e) {
512	<	unexpectedException();
441	>	public void testTimedPoll() throws InterruptedException {
442	>	ArrayBlockingQueue q = populatedQueue(SIZE);
443	>	for (int i = 0; i < SIZE; ++i) {
444	>	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
445		}
446	+	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
447		}
448
449		/**
450		* Interrupted timed poll throws InterruptedException instead of
451		* returning timeout status
452		*/
453	<	public void testInterruptedTimedPoll() {
454	<	Thread t = new Thread(new Runnable() {
455	<	public void run() {
456	<	try {
457	<	ArrayBlockingQueue q = populatedQueue(SIZE);
458	<	for (int i = 0; i < SIZE; ++i) {
459	<	threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
460	<	}
461	<	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
462	<	} catch (InterruptedException success) {
463	<	}
464	<	}});
465	<	try {
466	<	t.start();
534	<	Thread.sleep(SHORT_DELAY_MS);
535	<	t.interrupt();
536	<	t.join();
537	<	}
538	<	catch (InterruptedException ie) {
539	<	unexpectedException();
540	<	}
453	>	public void testInterruptedTimedPoll() throws InterruptedException {
454	>	Thread t = new ThreadShouldThrow(InterruptedException.class) {
455	>	public void realRun() throws InterruptedException {
456	>	ArrayBlockingQueue q = populatedQueue(SIZE);
457	>	for (int i = 0; i < SIZE; ++i) {
458	>	threadAssertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
459	>	}
460	>	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
461	>	}};
462	>
463	>	t.start();
464	>	Thread.sleep(SMALL_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, MILLISECONDS));
479	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
480	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
481	<	threadShouldThrow();
482	<	} catch (InterruptedException success) { }
483	<	}
484	<	});
485	<	try {
486	<	t.start();
561	<	Thread.sleep(SMALL_DELAY_MS);
562	<	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
563	<	t.interrupt();
564	<	t.join();
565	<	} catch (Exception e) {
566	<	unexpectedException();
567	<	}
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 594 | Line 513 | public class ArrayBlockingQueueTest exte
513		try {
514		q.element();
515		shouldThrow();
516	<	}
598	<	catch (NoSuchElementException success) {}
516	>	} catch (NoSuchElementException success) {}
517		}
518
519		/**
#	Line 609 | Line 527 | public class ArrayBlockingQueueTest exte
527		try {
528		q.remove();
529		shouldThrow();
530	<	} catch (NoSuchElementException success) {
613	<	}
530	>	} catch (NoSuchElementException success) {}
531		}
532
533		/**
#	Line 708 | 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();
714	–	try {
631		for (int i = 0; i < o.length; i++)
632		assertEquals(o[i], q.take());
717	–	} catch (InterruptedException e) {
718	–	unexpectedException();
719	–	}
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++)
731	<	assertEquals(ints[i], q.take());
732	<	} catch (InterruptedException e) {
733	<	unexpectedException();
734	<	}
642	>	for (int i = 0; i < ints.length; i++)
643	>	assertEquals(ints[i], q.take());
644		}
645
646		/**
#	Line 760 | Line 669 | public class ArrayBlockingQueueTest exte
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()) {
768	<	assertEquals(it.next(), q.take());
769	<	}
770	<	} catch (InterruptedException e) {
771	<	unexpectedException();
675	>	while (it.hasNext()) {
676	>	assertEquals(it.next(), q.take());
677		}
678		}
679
#	Line 818 | 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();
824	<	it.next();
825	<	}
826	<	}
827	<	catch (ConcurrentModificationException e) {
828	<	unexpectedException();
726	>	for (Iterator it = q.iterator(); it.hasNext();) {
727	>	q.remove();
728	>	it.next();
729		}
730		assertEquals(0, q.size());
731		}
#	Line 851 | 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, MILLISECONDS));
759	<	threadAssertEquals(0, q.remainingCapacity());
760	<	}
761	<	catch (InterruptedException e) {
762	<	threadUnexpectedException();
763	<	}
764	<	}
765	<	});
866	<
867	<	executor.execute(new Runnable() {
868	<	public void run() {
869	<	try {
870	<	Thread.sleep(SMALL_DELAY_MS);
871	<	threadAssertEquals(one, q.take());
872	<	}
873	<	catch (InterruptedException e) {
874	<	threadUnexpectedException();
875	<	}
876	<	}
877	<	});
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 886 | 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, MILLISECONDS));
782	<	threadAssertTrue(q.isEmpty());
783	<	}
784	<	catch (InterruptedException e) {
785	<	threadUnexpectedException();
786	<	}
787	<	}
788	<	});
901	<
902	<	executor.execute(new Runnable() {
903	<	public void run() {
904	<	try {
905	<	Thread.sleep(SMALL_DELAY_MS);
906	<	q.put(one);
907	<	}
908	<	catch (InterruptedException e) {
909	<	threadUnexpectedException();
910	<	}
911	<	}
912	<	});
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 917 | 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())
934	<	assertEquals(q.remove(), r.remove());
935	<	} catch (Exception e) {
936	<	unexpectedException();
937	<	}
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 945 | Line 817 | public class ArrayBlockingQueueTest exte
817		try {
818		q.drainTo(null);
819		shouldThrow();
820	<	} catch (NullPointerException success) {
949	<	}
820	>	} catch (NullPointerException success) {}
821		}
822
823		/**
#	Line 957 | Line 828 | public class ArrayBlockingQueueTest exte
828		try {
829		q.drainTo(q);
830		shouldThrow();
831	<	} catch (IllegalArgumentException success) {
961	<	}
831	>	} catch (IllegalArgumentException success) {}
832		}
833
834		/**
#	Line 988 | 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);
1006	<	assertTrue(l.size() >= SIZE);
1007	<	for (int i = 0; i < SIZE; ++i)
1008	<	assertEquals(l.get(i), new Integer(i));
1009	<	t.join();
1010	<	assertTrue(q.size() + l.size() >= SIZE);
1011	<	} catch (Exception e) {
1012	<	unexpectedException();
1013	<	}
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 1021 | Line 883 | public class ArrayBlockingQueueTest exte
883		try {
884		q.drainTo(null, 0);
885		shouldThrow();
886	<	} catch (NullPointerException success) {
1025	<	}
886	>	} catch (NullPointerException success) {}
887		}
888
889		/**
#	Line 1033 | Line 894 | public class ArrayBlockingQueueTest exte
894		try {
895		q.drainTo(q, 0);
896		shouldThrow();
897	<	} catch (IllegalArgumentException success) {
1037	<	}
897	>	} catch (IllegalArgumentException success) {}
898		}
899
900		/**
#	Line 1056 | Line 916 | public class ArrayBlockingQueueTest exte
916		}
917		}
918
1059	–
919		}

Diff Legend

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