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.23 by jsr166, Sat Nov 21 21:00:34 2009 UTC

#	Line 44 | 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	<	}
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		/**
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)
118	<	assertEquals(ints[i], q.poll());
119	<	}
120	<	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 160 | 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 171 | 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 194 | 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 206 | Line 198 | public class ArrayBlockingQueueTest exte
198		ArrayBlockingQueue q = new ArrayBlockingQueue(1);
199		q.addAll(null);
200		shouldThrow();
201	<	}
210	<	catch (NullPointerException success) {}
201	>	} catch (NullPointerException success) {}
202		}
203
204		/**
#	Line 218 | Line 209 | public class ArrayBlockingQueueTest exte
209		ArrayBlockingQueue q = populatedQueue(SIZE);
210		q.addAll(q);
211		shouldThrow();
212	<	}
222	<	catch (IllegalArgumentException success) {}
212	>	} catch (IllegalArgumentException success) {}
213		}
214
215
#	Line 232 | Line 222 | public class ArrayBlockingQueueTest exte
222		Integer[] ints = new Integer[SIZE];
223		q.addAll(Arrays.asList(ints));
224		shouldThrow();
225	<	}
236	<	catch (NullPointerException success) {}
225	>	} catch (NullPointerException success) {}
226		}
227		/**
228		* addAll of a collection with any null elements throws NPE after
#	Line 247 | Line 236 | public class ArrayBlockingQueueTest exte
236		ints[i] = new Integer(i);
237		q.addAll(Arrays.asList(ints));
238		shouldThrow();
239	<	}
251	<	catch (NullPointerException success) {}
239	>	} catch (NullPointerException success) {}
240		}
241		/**
242		* addAll throws ISE if not enough room
#	Line 261 | Line 249 | public class ArrayBlockingQueueTest exte
249		ints[i] = new Integer(i);
250		q.addAll(Arrays.asList(ints));
251		shouldThrow();
252	<	}
265	<	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)
280	<	assertEquals(ints[i], q.poll());
281	<	}
282	<	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	<	}
294	<	catch (NullPointerException success) {
295	<	}
296	<	catch (InterruptedException ie) {
297	<	unexpectedException();
298	<	}
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);
310	<	assertTrue(q.contains(I));
311	<	}
312	<	assertEquals(0, q.remainingCapacity());
313	<	}
314	<	catch (InterruptedException ie) {
315	<	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;
331	<	}
332	<	q.put(new Integer(SIZE));
333	<	threadShouldThrow();
334	<	} catch (InterruptedException ie) {
335	<	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();
377	<	t.join();
378	<	} catch (Exception e) {
379	<	unexpectedException();
380	<	}
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, MILLISECONDS));
359	<	q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
360	<	threadShouldThrow();
361	<	} catch (InterruptedException success) {}
362	<	}
363	<	});
364	<
400	<	try {
401	<	t.start();
402	<	Thread.sleep(SHORT_DELAY_MS);
403	<	t.interrupt();
404	<	t.join();
405	<	} catch (Exception e) {
406	<	unexpectedException();
407	<	}
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) {
417	<	assertEquals(i, ((Integer)q.take()).intValue());
418	<	}
419	<	} catch (InterruptedException e) {
420	<	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 {
438	<	t.start();
439	<	Thread.sleep(SHORT_DELAY_MS);
440	<	t.interrupt();
441	<	t.join();
442	<	} catch (Exception e) {
443	<	unexpectedException();
444	<	}
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) {
461	<	}
462	<	}});
463	<	try {
464	<	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();
468	–	}
469	–	catch (InterruptedException ie) {
470	–	unexpectedException();
471	–	}
410		}
411
412
#	Line 486 | 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) {
493	<	assertEquals(i, ((Integer)q.poll(0, MILLISECONDS)).intValue());
494	<	}
495	<	assertNull(q.poll(0, MILLISECONDS));
496	<	} catch (InterruptedException e) {
497	<	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) {
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();
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, MILLISECONDS)).intValue());
457	<	}
458	<	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
459	<	} catch (InterruptedException success) {
460	<	}
461	<	}});
462	<	try {
463	<	t.start();
464	<	Thread.sleep(SHORT_DELAY_MS);
465	<	t.interrupt();
466	<	t.join();
537	<	}
538	<	catch (InterruptedException ie) {
539	<	unexpectedException();
540	<	}
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, 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();
487	<	Thread.sleep(SMALL_DELAY_MS);
488	<	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
489	<	t.interrupt();
564	<	t.join();
565	<	} catch (Exception e) {
566	<	unexpectedException();
567	<	}
475	>	Thread t = new Thread(new CheckedRunnable() {
476	>	public void realRun() throws InterruptedException {
477	>	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
478	>	assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
479	>	try {
480	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
481	>	shouldThrow();
482	>	} catch (InterruptedException success) {}
483	>	}});
484	>
485	>	t.start();
486	>	Thread.sleep(SMALL_DELAY_MS);
487	>	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
488	>	t.interrupt();
489	>	t.join();
490		}
491
492
#	Line 594 | Line 516 | public class ArrayBlockingQueueTest exte
516		try {
517		q.element();
518		shouldThrow();
519	<	}
598	<	catch (NoSuchElementException success) {}
519	>	} catch (NoSuchElementException success) {}
520		}
521
522		/**
#	Line 609 | Line 530 | public class ArrayBlockingQueueTest exte
530		try {
531		q.remove();
532		shouldThrow();
533	<	} catch (NoSuchElementException success) {
613	<	}
533	>	} catch (NoSuchElementException success) {}
534		}
535
536		/**
#	Line 708 | Line 628 | public class ArrayBlockingQueueTest exte
628		/**
629		*  toArray contains all elements
630		*/
631	<	public void testToArray() {
631	>	public void testToArray() throws InterruptedException {
632		ArrayBlockingQueue q = populatedQueue(SIZE);
633		Object[] o = q.toArray();
714	–	try {
634		for (int i = 0; i < o.length; i++)
635		assertEquals(o[i], q.take());
717	–	} catch (InterruptedException e) {
718	–	unexpectedException();
719	–	}
636		}
637
638		/**
639		* toArray(a) contains all elements
640		*/
641	<	public void testToArray2() {
641	>	public void testToArray2() throws InterruptedException {
642		ArrayBlockingQueue q = populatedQueue(SIZE);
643		Integer[] ints = new Integer[SIZE];
644		ints = (Integer[])q.toArray(ints);
645	<	try {
646	<	for (int i = 0; i < ints.length; i++)
731	<	assertEquals(ints[i], q.take());
732	<	} catch (InterruptedException e) {
733	<	unexpectedException();
734	<	}
645	>	for (int i = 0; i < ints.length; i++)
646	>	assertEquals(ints[i], q.take());
647		}
648
649		/**
#	Line 753 | Line 665 | public class ArrayBlockingQueueTest exte
665		ArrayBlockingQueue q = populatedQueue(SIZE);
666		Object o[] = q.toArray(new String[10] );
667		shouldThrow();
668	<	} catch (ArrayStoreException  success) {}
668	>	} catch (ArrayStoreException success) {}
669		}
670
671
672		/**
673		* iterator iterates through all elements
674		*/
675	<	public void testIterator() {
675	>	public void testIterator() throws InterruptedException {
676		ArrayBlockingQueue q = populatedQueue(SIZE);
677		Iterator it = q.iterator();
678	<	try {
679	<	while (it.hasNext()) {
768	<	assertEquals(it.next(), q.take());
769	<	}
770	<	} catch (InterruptedException e) {
771	<	unexpectedException();
678	>	while (it.hasNext()) {
679	>	assertEquals(it.next(), q.take());
680		}
681		}
682
#	Line 818 | Line 726 | public class ArrayBlockingQueueTest exte
726		q.add(one);
727		q.add(two);
728		q.add(three);
729	<	try {
730	<	for (Iterator it = q.iterator(); it.hasNext();) {
731	<	q.remove();
824	<	it.next();
825	<	}
826	<	}
827	<	catch (ConcurrentModificationException e) {
828	<	unexpectedException();
729	>	for (Iterator it = q.iterator(); it.hasNext();) {
730	>	q.remove();
731	>	it.next();
732		}
733		assertEquals(0, q.size());
734		}
#	Line 851 | Line 754 | public class ArrayBlockingQueueTest exte
754		q.add(one);
755		q.add(two);
756		ExecutorService executor = Executors.newFixedThreadPool(2);
757	<	executor.execute(new Runnable() {
758	<	public void run() {
757	>	executor.execute(new CheckedRunnable() {
758	>	public void realRun() throws InterruptedException {
759		threadAssertFalse(q.offer(three));
760	<	try {
761	<	threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
762	<	threadAssertEquals(0, q.remainingCapacity());
763	<	}
764	<	catch (InterruptedException e) {
765	<	threadUnexpectedException();
766	<	}
767	<	}
768	<	});
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	<	});
760	>	threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
761	>	threadAssertEquals(0, q.remainingCapacity());
762	>	}});
763	>
764	>	executor.execute(new CheckedRunnable() {
765	>	public void realRun() throws InterruptedException {
766	>	Thread.sleep(SMALL_DELAY_MS);
767	>	threadAssertEquals(one, q.take());
768	>	}});
769
770		joinPool(executor);
771
#	Line 886 | Line 777 | public class ArrayBlockingQueueTest exte
777		public void testPollInExecutor() {
778		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
779		ExecutorService executor = Executors.newFixedThreadPool(2);
780	<	executor.execute(new Runnable() {
781	<	public void run() {
780	>	executor.execute(new CheckedRunnable() {
781	>	public void realRun() throws InterruptedException {
782		threadAssertNull(q.poll());
783	<	try {
784	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
785	<	threadAssertTrue(q.isEmpty());
786	<	}
787	<	catch (InterruptedException e) {
788	<	threadUnexpectedException();
789	<	}
790	<	}
791	<	});
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	<	});
783	>	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
784	>	threadAssertTrue(q.isEmpty());
785	>	}});
786	>
787	>	executor.execute(new CheckedRunnable() {
788	>	public void realRun() throws InterruptedException {
789	>	Thread.sleep(SMALL_DELAY_MS);
790	>	q.put(one);
791	>	}});
792
793		joinPool(executor);
794		}
#	Line 917 | Line 796 | public class ArrayBlockingQueueTest exte
796		/**
797		* A deserialized serialized queue has same elements in same order
798		*/
799	<	public void testSerialization() {
799	>	public void testSerialization() throws Exception {
800		ArrayBlockingQueue q = populatedQueue(SIZE);
801
802	<	try {
803	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
804	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
805	<	out.writeObject(q);
806	<	out.close();
807	<
808	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
809	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
810	<	ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
811	<	assertEquals(q.size(), r.size());
812	<	while (!q.isEmpty())
934	<	assertEquals(q.remove(), r.remove());
935	<	} catch (Exception e) {
936	<	unexpectedException();
937	<	}
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		}
814
815		/**
#	Line 945 | Line 820 | public class ArrayBlockingQueueTest exte
820		try {
821		q.drainTo(null);
822		shouldThrow();
823	<	} catch (NullPointerException success) {
949	<	}
823	>	} catch (NullPointerException success) {}
824		}
825
826		/**
#	Line 957 | Line 831 | public class ArrayBlockingQueueTest exte
831		try {
832		q.drainTo(q);
833		shouldThrow();
834	<	} catch (IllegalArgumentException success) {
961	<	}
834	>	} catch (IllegalArgumentException success) {}
835		}
836
837		/**
#	Line 988 | Line 861 | public class ArrayBlockingQueueTest exte
861		/**
862		* drainTo empties full queue, unblocking a waiting put.
863		*/
864	<	public void testDrainToWithActivePut() {
864	>	public void testDrainToWithActivePut() throws InterruptedException {
865		final ArrayBlockingQueue q = populatedQueue(SIZE);
866	<	Thread t = new Thread(new Runnable() {
867	<	public void run() {
868	<	try {
869	<	q.put(new Integer(SIZE+1));
870	<	} catch (InterruptedException ie) {
871	<	threadUnexpectedException();
872	<	}
873	<	}
874	<	});
875	<	try {
876	<	t.start();
877	<	ArrayList l = new ArrayList();
878	<	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	<	}
866	>	Thread t = new Thread(new CheckedRunnable() {
867	>	public void realRun() throws InterruptedException {
868	>	q.put(new Integer(SIZE+1));
869	>	}});
870	>
871	>	t.start();
872	>	ArrayList l = new ArrayList();
873	>	q.drainTo(l);
874	>	assertTrue(l.size() >= SIZE);
875	>	for (int i = 0; i < SIZE; ++i)
876	>	assertEquals(l.get(i), new Integer(i));
877	>	t.join();
878	>	assertTrue(q.size() + l.size() >= SIZE);
879		}
880
881		/**
#	Line 1021 | Line 886 | public class ArrayBlockingQueueTest exte
886		try {
887		q.drainTo(null, 0);
888		shouldThrow();
889	<	} catch (NullPointerException success) {
1025	<	}
889	>	} catch (NullPointerException success) {}
890		}
891
892		/**
#	Line 1033 | Line 897 | public class ArrayBlockingQueueTest exte
897		try {
898		q.drainTo(q, 0);
899		shouldThrow();
900	<	} catch (IllegalArgumentException success) {
1037	<	}
900	>	} catch (IllegalArgumentException success) {}
901		}
902
903		/**
#	Line 1056 | Line 919 | public class ArrayBlockingQueueTest exte
919		}
920		}
921
1059	–
922		}

Diff Legend

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