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.24 by jsr166, Sat Nov 21 22:00:46 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	<
365	<	try {
366	<	t.start();
367	<	Thread.sleep(SHORT_DELAY_MS);
403	<	t.interrupt();
404	<	t.join();
405	<	} catch (Exception e) {
406	<	unexpectedException();
407	<	}
353	>	Thread t = new Thread(new CheckedRunnable() {
354	>	public void realRun() throws InterruptedException {
355	>	q.put(new Object());
356	>	q.put(new Object());
357	>	assertFalse(q.offer(new Object(), SHORT_DELAY_MS/2, MILLISECONDS));
358	>	try {
359	>	q.offer(new Object(), LONG_DELAY_MS, MILLISECONDS);
360	>	shouldThrow();
361	>	} catch (InterruptedException success) {}
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();
467	<	Thread.sleep(SHORT_DELAY_MS);
468	<	t.interrupt();
469	<	t.join();
537	<	}
538	<	catch (InterruptedException ie) {
539	<	unexpectedException();
540	<	}
453	>	public void testInterruptedTimedPoll() throws InterruptedException {
454	>	Thread t = new Thread(new CheckedRunnable() {
455	>	public void realRun() throws InterruptedException {
456	>	ArrayBlockingQueue q = populatedQueue(SIZE);
457	>	for (int i = 0; i < SIZE; ++i) {
458	>	assertEquals(i, ((Integer)q.poll(SHORT_DELAY_MS, MILLISECONDS)).intValue());
459	>	}
460	>	try {
461	>	q.poll(SMALL_DELAY_MS, MILLISECONDS);
462	>	shouldThrow();
463	>	} catch (InterruptedException success) {}
464	>	}});
465	>
466	>	t.start();
467	>	Thread.sleep(SHORT_DELAY_MS);
468	>	t.interrupt();
469	>	t.join();
470		}
471
472		/**
473		*  timed poll before a delayed offer fails; after offer succeeds;
474		*  on interruption throws
475		*/
476	<	public void testTimedPollWithOffer() {
476	>	public void testTimedPollWithOffer() throws InterruptedException {
477		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
478	<	Thread t = new Thread(new Runnable() {
479	<	public void run() {
480	<	try {
481	<	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
482	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
483	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
484	<	threadShouldThrow();
485	<	} catch (InterruptedException success) { }
486	<	}
487	<	});
488	<	try {
489	<	t.start();
490	<	Thread.sleep(SMALL_DELAY_MS);
491	<	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
492	<	t.interrupt();
564	<	t.join();
565	<	} catch (Exception e) {
566	<	unexpectedException();
567	<	}
478	>	Thread t = new Thread(new CheckedRunnable() {
479	>	public void realRun() throws InterruptedException {
480	>	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
481	>	assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
482	>	try {
483	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
484	>	shouldThrow();
485	>	} catch (InterruptedException success) {}
486	>	}});
487	>
488	>	t.start();
489	>	Thread.sleep(SMALL_DELAY_MS);
490	>	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
491	>	t.interrupt();
492	>	t.join();
493		}
494
495
#	Line 594 | Line 519 | public class ArrayBlockingQueueTest exte
519		try {
520		q.element();
521		shouldThrow();
522	<	}
598	<	catch (NoSuchElementException success) {}
522	>	} catch (NoSuchElementException success) {}
523		}
524
525		/**
#	Line 609 | Line 533 | public class ArrayBlockingQueueTest exte
533		try {
534		q.remove();
535		shouldThrow();
536	<	} catch (NoSuchElementException success) {
613	<	}
536	>	} catch (NoSuchElementException success) {}
537		}
538
539		/**
#	Line 708 | Line 631 | public class ArrayBlockingQueueTest exte
631		/**
632		*  toArray contains all elements
633		*/
634	<	public void testToArray() {
634	>	public void testToArray() throws InterruptedException {
635		ArrayBlockingQueue q = populatedQueue(SIZE);
636		Object[] o = q.toArray();
714	–	try {
637		for (int i = 0; i < o.length; i++)
638		assertEquals(o[i], q.take());
717	–	} catch (InterruptedException e) {
718	–	unexpectedException();
719	–	}
639		}
640
641		/**
642		* toArray(a) contains all elements
643		*/
644	<	public void testToArray2() {
644	>	public void testToArray2() throws InterruptedException {
645		ArrayBlockingQueue q = populatedQueue(SIZE);
646		Integer[] ints = new Integer[SIZE];
647		ints = (Integer[])q.toArray(ints);
648	<	try {
649	<	for (int i = 0; i < ints.length; i++)
731	<	assertEquals(ints[i], q.take());
732	<	} catch (InterruptedException e) {
733	<	unexpectedException();
734	<	}
648	>	for (int i = 0; i < ints.length; i++)
649	>	assertEquals(ints[i], q.take());
650		}
651
652		/**
#	Line 753 | Line 668 | public class ArrayBlockingQueueTest exte
668		ArrayBlockingQueue q = populatedQueue(SIZE);
669		Object o[] = q.toArray(new String[10] );
670		shouldThrow();
671	<	} catch (ArrayStoreException  success) {}
671	>	} catch (ArrayStoreException success) {}
672		}
673
674
675		/**
676		* iterator iterates through all elements
677		*/
678	<	public void testIterator() {
678	>	public void testIterator() throws InterruptedException {
679		ArrayBlockingQueue q = populatedQueue(SIZE);
680		Iterator it = q.iterator();
681	<	try {
682	<	while (it.hasNext()) {
768	<	assertEquals(it.next(), q.take());
769	<	}
770	<	} catch (InterruptedException e) {
771	<	unexpectedException();
681	>	while (it.hasNext()) {
682	>	assertEquals(it.next(), q.take());
683		}
684		}
685
#	Line 818 | Line 729 | public class ArrayBlockingQueueTest exte
729		q.add(one);
730		q.add(two);
731		q.add(three);
732	<	try {
733	<	for (Iterator it = q.iterator(); it.hasNext();) {
734	<	q.remove();
824	<	it.next();
825	<	}
826	<	}
827	<	catch (ConcurrentModificationException e) {
828	<	unexpectedException();
732	>	for (Iterator it = q.iterator(); it.hasNext();) {
733	>	q.remove();
734	>	it.next();
735		}
736		assertEquals(0, q.size());
737		}
#	Line 851 | Line 757 | public class ArrayBlockingQueueTest exte
757		q.add(one);
758		q.add(two);
759		ExecutorService executor = Executors.newFixedThreadPool(2);
760	<	executor.execute(new Runnable() {
761	<	public void run() {
760	>	executor.execute(new CheckedRunnable() {
761	>	public void realRun() throws InterruptedException {
762		threadAssertFalse(q.offer(three));
763	<	try {
764	<	threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
765	<	threadAssertEquals(0, q.remainingCapacity());
766	<	}
767	<	catch (InterruptedException e) {
768	<	threadUnexpectedException();
769	<	}
770	<	}
771	<	});
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	<	});
763	>	threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS, MILLISECONDS));
764	>	threadAssertEquals(0, q.remainingCapacity());
765	>	}});
766	>
767	>	executor.execute(new CheckedRunnable() {
768	>	public void realRun() throws InterruptedException {
769	>	Thread.sleep(SMALL_DELAY_MS);
770	>	threadAssertEquals(one, q.take());
771	>	}});
772
773		joinPool(executor);
774
#	Line 886 | Line 780 | public class ArrayBlockingQueueTest exte
780		public void testPollInExecutor() {
781		final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
782		ExecutorService executor = Executors.newFixedThreadPool(2);
783	<	executor.execute(new Runnable() {
784	<	public void run() {
783	>	executor.execute(new CheckedRunnable() {
784	>	public void realRun() throws InterruptedException {
785		threadAssertNull(q.poll());
786	<	try {
787	<	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
788	<	threadAssertTrue(q.isEmpty());
789	<	}
790	<	catch (InterruptedException e) {
791	<	threadUnexpectedException();
792	<	}
793	<	}
794	<	});
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	<	});
786	>	threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
787	>	threadAssertTrue(q.isEmpty());
788	>	}});
789	>
790	>	executor.execute(new CheckedRunnable() {
791	>	public void realRun() throws InterruptedException {
792	>	Thread.sleep(SMALL_DELAY_MS);
793	>	q.put(one);
794	>	}});
795
796		joinPool(executor);
797		}
#	Line 917 | Line 799 | public class ArrayBlockingQueueTest exte
799		/**
800		* A deserialized serialized queue has same elements in same order
801		*/
802	<	public void testSerialization() {
802	>	public void testSerialization() throws Exception {
803		ArrayBlockingQueue q = populatedQueue(SIZE);
804
805	<	try {
806	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
807	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
808	<	out.writeObject(q);
809	<	out.close();
810	<
811	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
812	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
813	<	ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
814	<	assertEquals(q.size(), r.size());
815	<	while (!q.isEmpty())
934	<	assertEquals(q.remove(), r.remove());
935	<	} catch (Exception e) {
936	<	unexpectedException();
937	<	}
805	>	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
806	>	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
807	>	out.writeObject(q);
808	>	out.close();
809	>
810	>	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
811	>	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
812	>	ArrayBlockingQueue r = (ArrayBlockingQueue)in.readObject();
813	>	assertEquals(q.size(), r.size());
814	>	while (!q.isEmpty())
815	>	assertEquals(q.remove(), r.remove());
816		}
817
818		/**
#	Line 945 | Line 823 | public class ArrayBlockingQueueTest exte
823		try {
824		q.drainTo(null);
825		shouldThrow();
826	<	} catch (NullPointerException success) {
949	<	}
826	>	} catch (NullPointerException success) {}
827		}
828
829		/**
#	Line 957 | Line 834 | public class ArrayBlockingQueueTest exte
834		try {
835		q.drainTo(q);
836		shouldThrow();
837	<	} catch (IllegalArgumentException success) {
961	<	}
837	>	} catch (IllegalArgumentException success) {}
838		}
839
840		/**
#	Line 988 | Line 864 | public class ArrayBlockingQueueTest exte
864		/**
865		* drainTo empties full queue, unblocking a waiting put.
866		*/
867	<	public void testDrainToWithActivePut() {
867	>	public void testDrainToWithActivePut() throws InterruptedException {
868		final ArrayBlockingQueue q = populatedQueue(SIZE);
869	<	Thread t = new Thread(new Runnable() {
870	<	public void run() {
871	<	try {
872	<	q.put(new Integer(SIZE+1));
873	<	} catch (InterruptedException ie) {
874	<	threadUnexpectedException();
875	<	}
876	<	}
877	<	});
878	<	try {
879	<	t.start();
880	<	ArrayList l = new ArrayList();
881	<	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	<	}
869	>	Thread t = new Thread(new CheckedRunnable() {
870	>	public void realRun() throws InterruptedException {
871	>	q.put(new Integer(SIZE+1));
872	>	}});
873	>
874	>	t.start();
875	>	ArrayList l = new ArrayList();
876	>	q.drainTo(l);
877	>	assertTrue(l.size() >= SIZE);
878	>	for (int i = 0; i < SIZE; ++i)
879	>	assertEquals(l.get(i), new Integer(i));
880	>	t.join();
881	>	assertTrue(q.size() + l.size() >= SIZE);
882		}
883
884		/**
#	Line 1021 | Line 889 | public class ArrayBlockingQueueTest exte
889		try {
890		q.drainTo(null, 0);
891		shouldThrow();
892	<	} catch (NullPointerException success) {
1025	<	}
892	>	} catch (NullPointerException success) {}
893		}
894
895		/**
#	Line 1033 | Line 900 | public class ArrayBlockingQueueTest exte
900		try {
901		q.drainTo(q, 0);
902		shouldThrow();
903	<	} catch (IllegalArgumentException success) {
1037	<	}
903	>	} catch (IllegalArgumentException success) {}
904		}
905
906		/**
#	Line 1056 | Line 922 | public class ArrayBlockingQueueTest exte
922		}
923		}
924
1059	–
925		}

Diff Legend

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