ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/LinkedBlockingQueueTest.java

Comparing jsr166/src/test/tck/LinkedBlockingQueueTest.java (file contents):
Revision 1.26 by jsr166, Wed Aug 25 00:07:03 2010 UTC vs.
Revision 1.31 by jsr166, Tue Oct 19 00:43:49 2010 UTC

#	Line 14 | Line 14 | import java.io.*;
14
15		public class LinkedBlockingQueueTest extends JSR166TestCase {
16
17	+	public static class Unbounded extends BlockingQueueTest {
18	+	protected BlockingQueue emptyCollection() {
19	+	return new LinkedBlockingQueue();
20	+	}
21	+	}
22	+
23	+	public static class Bounded extends BlockingQueueTest {
24	+	protected BlockingQueue emptyCollection() {
25	+	return new LinkedBlockingQueue(20);
26	+	}
27	+	}
28	+
29		public static void main(String[] args) {
30		junit.textui.TestRunner.run(suite());
31		}
32
33		public static Test suite() {
34	<	return new TestSuite(LinkedBlockingQueueTest.class);
34	>	return newTestSuite(LinkedBlockingQueueTest.class,
35	>	new Unbounded().testSuite(),
36	>	new Bounded().testSuite());
37		}
38
39
#	Line 214 | Line 228 | public class LinkedBlockingQueueTest ext
228		shouldThrow();
229		} catch (NullPointerException success) {}
230		}
231	+
232		/**
233		* addAll of a collection with any null elements throws NPE after
234		* possibly adding some elements
#	Line 228 | Line 243 | public class LinkedBlockingQueueTest ext
243		shouldThrow();
244		} catch (NullPointerException success) {}
245		}
246	+
247		/**
248		* addAll throws ISE if not enough room
249		*/
#	Line 241 | Line 257 | public class LinkedBlockingQueueTest ext
257		shouldThrow();
258		} catch (IllegalStateException success) {}
259		}
260	+
261		/**
262		* Queue contains all elements, in traversal order, of successful addAll
263		*/
#	Line 458 | Line 475 | public class LinkedBlockingQueueTest ext
475		}
476
477		/**
461	–	*  timed poll before a delayed offer fails; after offer succeeds;
462	–	*  on interruption throws
463	–	*/
464	–	public void testTimedPollWithOffer() throws InterruptedException {
465	–	final LinkedBlockingQueue q = new LinkedBlockingQueue(2);
466	–	Thread t = new Thread(new CheckedRunnable() {
467	–	public void realRun() throws InterruptedException {
468	–	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
469	–	assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
470	–	try {
471	–	q.poll(LONG_DELAY_MS, MILLISECONDS);
472	–	shouldThrow();
473	–	} catch (InterruptedException success) {}
474	–	}});
475	–
476	–	t.start();
477	–	Thread.sleep(SMALL_DELAY_MS);
478	–	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
479	–	t.interrupt();
480	–	t.join();
481	–	}
482	–
483	–	/**
478		* peek returns next element, or null if empty
479		*/
480		public void testPeek() {
#	Line 901 | Line 895 | public class LinkedBlockingQueueTest ext
895		}
896
897		/**
898	<	* drainTo(c, n) empties first max {n, size} elements of queue into c
898	>	* drainTo(c, n) empties first min(n, size) elements of queue into c
899		*/
900		public void testDrainToN() {
901		LinkedBlockingQueue q = new LinkedBlockingQueue();
#	Line 910 | Line 904 | public class LinkedBlockingQueueTest ext
904		assertTrue(q.offer(new Integer(j)));
905		ArrayList l = new ArrayList();
906		q.drainTo(l, i);
907	<	int k = (i < SIZE)? i : SIZE;
907	>	int k = (i < SIZE) ? i : SIZE;
908		assertEquals(l.size(), k);
909		assertEquals(q.size(), SIZE-k);
910		for (int j = 0; j < k; ++j)

Diff Legend

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