ViewVC Help

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

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

Comparing jsr166/src/test/tck/LinkedBlockingDequeTest.java (file contents):
Revision 1.20 by jsr166, Tue Dec 1 09:56:28 2009 UTC vs.
Revision 1.24 by jsr166, Wed Oct 6 07:49:22 2010 UTC

#	Line 11 | Line 11 | import static java.util.concurrent.TimeU
11		import java.io.*;
12
13		public class LinkedBlockingDequeTest extends JSR166TestCase {
14	+
15	+	public static class Unbounded extends BlockingQueueTest {
16	+	protected BlockingQueue emptyCollection() {
17	+	return new LinkedBlockingDeque();
18	+	}
19	+	}
20	+
21	+	public static class Bounded extends BlockingQueueTest {
22	+	protected BlockingQueue emptyCollection() {
23	+	return new LinkedBlockingDeque(20);
24	+	}
25	+	}
26	+
27		public static void main(String[] args) {
28	<	junit.textui.TestRunner.run (suite());
28	>	junit.textui.TestRunner.run(suite());
29		}
30
31		public static Test suite() {
32	<	return new TestSuite(LinkedBlockingDequeTest.class);
32	>	return newTestSuite(LinkedBlockingDequeTest.class,
33	>	new Unbounded().testSuite(),
34	>	new Bounded().testSuite());
35		}
36
37		/**
#	Line 157 | Line 172 | public class LinkedBlockingDequeTest ext
172		}
173
174		/**
175	<	* getFirst returns next getFirst, or throws NSEE if empty
175	>	* getFirst() returns first element, or throws NSEE if empty
176		*/
177		public void testFirstElement() {
178		LinkedBlockingDeque q = populatedDeque(SIZE);
#	Line 173 | Line 188 | public class LinkedBlockingDequeTest ext
188		}
189
190		/**
191	<	*  getLast returns next element, or throws NSEE if empty
191	>	*  getLast() returns last element, or throws NSEE if empty
192		*/
193		public void testLastElement() {
194		LinkedBlockingDeque q = populatedDeque(SIZE);
#	Line 189 | Line 204 | public class LinkedBlockingDequeTest ext
204		}
205
206		/**
207	<	*  removeFirst removes next element, or throws NSEE if empty
207	>	* removeFirst() removes first element, or throws NSEE if empty
208		*/
209		public void testRemoveFirst() {
210		LinkedBlockingDeque q = populatedDeque(SIZE);
#	Line 204 | Line 219 | public class LinkedBlockingDequeTest ext
219		}
220
221		/**
222	<	*  removeLast removes last element, or throws NSEE if empty
222	>	* removeLast() removes last element, or throws NSEE if empty
223		*/
224		public void testRemoveLast() {
225		LinkedBlockingDeque q = populatedDeque(SIZE);
#	Line 513 | Line 528 | public class LinkedBlockingDequeTest ext
528		shouldThrow();
529		} catch (NullPointerException success) {}
530		}
531	+
532		/**
533		* addAll of a collection with any null elements throws NPE after
534		* possibly adding some elements
#	Line 527 | Line 543 | public class LinkedBlockingDequeTest ext
543		shouldThrow();
544		} catch (NullPointerException success) {}
545		}
546	+
547		/**
548		* addAll throws ISE if not enough room
549		*/
#	Line 760 | Line 777 | public class LinkedBlockingDequeTest ext
777		}
778
779		/**
763	–	*  timed poll before a delayed offer fails; after offer succeeds;
764	–	*  on interruption throws
765	–	*/
766	–	public void testTimedPollWithOffer() throws InterruptedException {
767	–	final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
768	–	Thread t = new Thread(new CheckedRunnable() {
769	–	public void realRun() throws InterruptedException {
770	–	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
771	–	assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
772	–	try {
773	–	q.poll(LONG_DELAY_MS, MILLISECONDS);
774	–	shouldThrow();
775	–	} catch (InterruptedException success) {}
776	–	}});
777	–
778	–	t.start();
779	–	Thread.sleep(SMALL_DELAY_MS);
780	–	assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
781	–	t.interrupt();
782	–	t.join();
783	–	}
784	–
785	–
786	–	/**
780		* putFirst(null) throws NPE
781		*/
782		public void testPutFirstNull() throws InterruptedException {
#	Line 1186 | Line 1179 | public class LinkedBlockingDequeTest ext
1179		}
1180
1181		/**
1182	<	*  timed poll before a delayed offerLast fails; after offerLast succeeds;
1183	<	*  on interruption throws
1182	>	* timed poll before a delayed offerLast fails; after offerLast succeeds;
1183	>	* on interruption throws
1184		*/
1185		public void testTimedPollWithOfferLast() throws InterruptedException {
1186		final LinkedBlockingDeque q = new LinkedBlockingDeque(2);
#	Line 1374 | Line 1367 | public class LinkedBlockingDequeTest ext
1367		/**
1368		* iterator.remove removes current element
1369		*/
1370	<	public void testIteratorRemove () {
1370	>	public void testIteratorRemove() {
1371		final LinkedBlockingDeque q = new LinkedBlockingDeque(3);
1372		q.add(two);
1373		q.add(one);
#	Line 1410 | Line 1403 | public class LinkedBlockingDequeTest ext
1403		/**
1404		* Modifications do not cause iterators to fail
1405		*/
1406	<	public void testWeaklyConsistentIteration () {
1406	>	public void testWeaklyConsistentIteration() {
1407		final LinkedBlockingDeque q = new LinkedBlockingDeque(3);
1408		q.add(one);
1409		q.add(two);
#	Line 1466 | Line 1459 | public class LinkedBlockingDequeTest ext
1459		/**
1460		* descendingIterator.remove removes current element
1461		*/
1462	<	public void testDescendingIteratorRemove () {
1462	>	public void testDescendingIteratorRemove() {
1463		final LinkedBlockingDeque q = new LinkedBlockingDeque();
1464		for (int iters = 0; iters < 100; ++iters) {
1465		q.add(new Integer(3));

Diff Legend

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