ViewVC Help

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

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

Comparing jsr166/src/test/tck/LinkedTransferQueueTest.java (file contents):
Revision 1.12 by jsr166, Sat Aug 15 00:35:01 2009 UTC vs.
Revision 1.21 by jsr166, Thu Nov 26 15:42:15 2009 UTC

#	Line 13 | Line 13 | import java.io.ObjectInputStream;
13		import java.io.ObjectOutputStream;
14		import java.util.ArrayList;
15		import java.util.Arrays;
16	–	import java.util.ConcurrentModificationException;
16		import java.util.Iterator;
17		import java.util.List;
18		import java.util.NoSuchElementException;
#	Line 45 | Line 44 | public class LinkedTransferQueueTest ext
44		try {
45		q.element();
46		shouldThrow();
47	<	} catch (NoSuchElementException success) {
49	<	}
47	>	} catch (NoSuchElementException success) {}
48		try {
49		q.iterator().next();
50		shouldThrow();
51	<	} catch (NoSuchElementException success) {
54	<	}
51	>	} catch (NoSuchElementException success) {}
52		try {
53		q.remove();
54		shouldThrow();
55	<	} catch (NoSuchElementException success) {
59	<	}
55	>	} catch (NoSuchElementException success) {}
56		}
57
58		/**
#	Line 76 | Line 72 | public class LinkedTransferQueueTest ext
72		try {
73		new LinkedTransferQueue(null);
74		shouldThrow();
75	<	} catch (NullPointerException success) {
80	<	}
75	>	} catch (NullPointerException success) {}
76		}
77
78		/**
#	Line 89 | Line 84 | public class LinkedTransferQueueTest ext
84		Integer[] ints = new Integer[SIZE];
85		new LinkedTransferQueue(Arrays.asList(ints));
86		shouldThrow();
87	<	} catch (NullPointerException success) {
93	<	}
87	>	} catch (NullPointerException success) {}
88		}
89
90		/**
#	Line 105 | Line 99 | public class LinkedTransferQueueTest ext
99		}
100		new LinkedTransferQueue(Arrays.asList(ints));
101		shouldThrow();
102	<	} catch (NullPointerException success) {
109	<	}
102	>	} catch (NullPointerException success) {}
103		}
104
105		/**
#	Line 158 | Line 151 | public class LinkedTransferQueueTest ext
151		LinkedTransferQueue q = new LinkedTransferQueue();
152		q.offer(null);
153		shouldThrow();
154	<	} catch (NullPointerException success) {
162	<	}
154	>	} catch (NullPointerException success) {}
155		}
156
157		/**
#	Line 170 | Line 162 | public class LinkedTransferQueueTest ext
162		LinkedTransferQueue q = new LinkedTransferQueue();
163		q.add(null);
164		shouldThrow();
165	<	} catch (NullPointerException success) {
174	<	}
165	>	} catch (NullPointerException success) {}
166		}
167
168		/**
#	Line 182 | Line 173 | public class LinkedTransferQueueTest ext
173		LinkedTransferQueue q = new LinkedTransferQueue();
174		q.addAll(null);
175		shouldThrow();
176	<	} catch (NullPointerException success) {
186	<	}
176	>	} catch (NullPointerException success) {}
177		}
178
179		/**
#	Line 194 | Line 184 | public class LinkedTransferQueueTest ext
184		LinkedTransferQueue q = populatedQueue(SIZE);
185		q.addAll(q);
186		shouldThrow();
187	<	} catch (IllegalArgumentException success) {
198	<	}
187	>	} catch (IllegalArgumentException success) {}
188		}
189
190		/**
#	Line 207 | Line 196 | public class LinkedTransferQueueTest ext
196		Integer[] ints = new Integer[SIZE];
197		q.addAll(Arrays.asList(ints));
198		shouldThrow();
199	<	} catch (NullPointerException success) {
211	<	}
199	>	} catch (NullPointerException success) {}
200		}
201
202		/**
#	Line 224 | Line 212 | public class LinkedTransferQueueTest ext
212		}
213		q.addAll(Arrays.asList(ints));
214		shouldThrow();
215	<	} catch (NullPointerException success) {
228	<	}
215	>	} catch (NullPointerException success) {}
216		}
217
218		/**
#	Line 284 | Line 271 | public class LinkedTransferQueueTest ext
271		public void testTakeFromEmpty() throws InterruptedException {
272		final LinkedTransferQueue q = new LinkedTransferQueue();
273		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
274	<	void realRun() throws InterruptedException {
274	>	public void realRun() throws InterruptedException {
275		q.take();
276		}});
277		Thread.sleep(SHORT_DELAY_MS);
#	Line 297 | Line 284 | public class LinkedTransferQueueTest ext
284		*/
285		public void testBlockingTake() throws InterruptedException {
286		final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
287	<	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
288	<	void realRun() throws InterruptedException {
287	>	Thread t = new Thread(new CheckedRunnable() {
288	>	public void realRun() throws InterruptedException {
289		for (int i = 0; i < SIZE; ++i) {
290	<	threadAssertEquals(i, (int) q.take());
290	>	assertEquals(i, (int) q.take());
291		}
292	<	q.take();
292	>	try {
293	>	q.take();
294	>	shouldThrow();
295	>	} catch (InterruptedException success) {}
296		}});
297	<	Thread.sleep(SMALL_DELAY_MS);
297	>
298	>	t.start();
299	>	Thread.sleep(SHORT_DELAY_MS);
300		t.interrupt();
301		t.join();
302		checkEmpty(q);
#	Line 355 | Line 347 | public class LinkedTransferQueueTest ext
347		*/
348		public void testInterruptedTimedPoll() throws InterruptedException {
349		final LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
350	<	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
351	<	void realRun() throws InterruptedException {
350	>	Thread t = newStartedThread(new CheckedRunnable() {
351	>	public void realRun() throws InterruptedException {
352		for (int i = 0; i < SIZE; ++i) {
353		long t0 = System.nanoTime();
354		threadAssertEquals(i, (int) q.poll(LONG_DELAY_MS,
#	Line 364 | Line 356 | public class LinkedTransferQueueTest ext
356		long millisElapsed = (System.nanoTime() - t0)/(1024 * 1024);
357		assertTrue(millisElapsed < SMALL_DELAY_MS);
358		}
359	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
359	>	try {
360	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
361	>	shouldThrow();
362	>	} catch (InterruptedException success) {}
363		}});
364	+
365		Thread.sleep(SMALL_DELAY_MS);
366		t.interrupt();
367		t.join();
#	Line 378 | Line 374 | public class LinkedTransferQueueTest ext
374		*/
375		public void testTimedPollWithOffer() throws InterruptedException {
376		final LinkedTransferQueue q = new LinkedTransferQueue();
377	<	Thread t = newStartedThread(new CheckedInterruptedRunnable() {
378	<	void realRun() throws InterruptedException {
379	<	threadAssertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
380	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
381	<	q.poll(LONG_DELAY_MS, MILLISECONDS);
377	>	Thread t = new Thread(new CheckedRunnable() {
378	>	public void realRun() throws InterruptedException {
379	>	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
380	>	assertSame(zero, q.poll(LONG_DELAY_MS, MILLISECONDS));
381	>	try {
382	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
383	>	shouldThrow();
384	>	} catch (InterruptedException success) {}
385		}});
386	+
387	+	t.start();
388		Thread.sleep(SMALL_DELAY_MS);
389		assertTrue(q.offer(zero, SHORT_DELAY_MS, MILLISECONDS));
390		t.interrupt();
#	Line 417 | Line 418 | public class LinkedTransferQueueTest ext
418		try {
419		q.element();
420		shouldThrow();
421	<	} catch (NoSuchElementException success) {
421	<	}
421	>	} catch (NoSuchElementException success) {}
422		checkEmpty(q);
423		}
424
#	Line 433 | Line 433 | public class LinkedTransferQueueTest ext
433		try {
434		q.remove();
435		shouldThrow();
436	<	} catch (NoSuchElementException success) {
437	<	}
436	>	} catch (NoSuchElementException success) {}
437		checkEmpty(q);
438		}
439
#	Line 545 | Line 544 | public class LinkedTransferQueueTest ext
544		}
545
546		/**
547	<	* toArray contains all elements
547	>	* toArray() contains all elements
548		*/
549		public void testToArray() throws InterruptedException {
550		LinkedTransferQueue q = populatedQueue(SIZE);
#	Line 571 | Line 570 | public class LinkedTransferQueueTest ext
570		* toArray(null) throws NullPointerException
571		*/
572		public void testToArray_BadArg() {
573	+	LinkedTransferQueue q = populatedQueue(SIZE);
574		try {
575	–	LinkedTransferQueue q = populatedQueue(SIZE);
575		Object o[] = q.toArray(null);
576		shouldThrow();
577	<	} catch (NullPointerException success) {
579	<	}
577	>	} catch (NullPointerException success) {}
578		}
579
580		/**
581	<	* toArray with incompatible array type throws CCE
581	>	* toArray(incompatible array type) throws CCE
582		*/
583		public void testToArray1_BadArg() {
584	+	LinkedTransferQueue q = populatedQueue(SIZE);
585		try {
587	–	LinkedTransferQueue q = populatedQueue(SIZE);
586		Object o[] = q.toArray(new String[10]);
587		shouldThrow();
588	<	} catch (ArrayStoreException success) {
591	<	}
588	>	} catch (ArrayStoreException success) {}
589		}
590
591		/**
#	Line 677 | Line 674 | public class LinkedTransferQueueTest ext
674		ExecutorService executor = Executors.newFixedThreadPool(2);
675
676		executor.execute(new CheckedRunnable() {
677	<	void realRun() {
677	>	public void realRun() {
678		threadAssertTrue(q.offer(three, MEDIUM_DELAY_MS,
679		MILLISECONDS));
680		}});
681
682		executor.execute(new CheckedRunnable() {
683	<	void realRun() throws InterruptedException {
683	>	public void realRun() throws InterruptedException {
684		Thread.sleep(SMALL_DELAY_MS);
685		threadAssertEquals(one, q.take());
686		}});
#	Line 692 | Line 689 | public class LinkedTransferQueueTest ext
689		}
690
691		/**
692	<	* poll retrieves elements across Executor threads
692	>	* timed poll retrieves elements across Executor threads
693		*/
694		public void testPollInExecutor() {
695		final LinkedTransferQueue q = new LinkedTransferQueue();
696		ExecutorService executor = Executors.newFixedThreadPool(2);
697
698		executor.execute(new CheckedRunnable() {
699	<	void realRun() throws InterruptedException {
699	>	public void realRun() throws InterruptedException {
700		threadAssertNull(q.poll());
701		threadAssertTrue(null != q.poll(MEDIUM_DELAY_MS,
702		MILLISECONDS));
#	Line 707 | Line 704 | public class LinkedTransferQueueTest ext
704		}});
705
706		executor.execute(new CheckedRunnable() {
707	<	void realRun() throws InterruptedException {
707	>	public void realRun() throws InterruptedException {
708		Thread.sleep(SMALL_DELAY_MS);
709		q.put(one);
710		}});
#	Line 747 | Line 744 | public class LinkedTransferQueueTest ext
744		try {
745		q.drainTo(null);
746		shouldThrow();
747	<	} catch (NullPointerException success) {
751	<	}
747	>	} catch (NullPointerException success) {}
748		}
749
750		/**
#	Line 759 | Line 755 | public class LinkedTransferQueueTest ext
755		try {
756		q.drainTo(q);
757		shouldThrow();
758	<	} catch (IllegalArgumentException success) {
763	<	}
758	>	} catch (IllegalArgumentException success) {}
759		}
760
761		/**
#	Line 790 | Line 785 | public class LinkedTransferQueueTest ext
785		}
786
787		/**
788	<	* drainTo empties full queue, unblocking a waiting put.
788	>	* drainTo(c) empties full queue, unblocking a waiting put.
789		*/
790		public void testDrainToWithActivePut() throws InterruptedException {
791		final LinkedTransferQueue q = populatedQueue(SIZE);
792		Thread t = newStartedThread(new CheckedRunnable() {
793	<	void realRun() {
793	>	public void realRun() {
794		q.put(SIZE + 1);
795		}});
796		ArrayList l = new ArrayList();
#	Line 816 | Line 811 | public class LinkedTransferQueueTest ext
811		try {
812		q.drainTo(null, SIZE);
813		shouldThrow();
814	<	} catch (NullPointerException success) {
820	<	}
814	>	} catch (NullPointerException success) {}
815		}
816
817		/**
#	Line 828 | Line 822 | public class LinkedTransferQueueTest ext
822		try {
823		q.drainTo(q, SIZE);
824		shouldThrow();
825	<	} catch (IllegalArgumentException success) {
832	<	}
825	>	} catch (IllegalArgumentException success) {}
826		}
827
828		/**
#	Line 855 | Line 848 | public class LinkedTransferQueueTest ext
848		}
849
850		/**
851	<	* poll and take decrement the waiting consumer count
851	>	* timed poll() or take() increments the waiting consumer count;
852	>	* offer(e) decrements the waiting consumer count
853		*/
854		public void testWaitingConsumer() throws InterruptedException {
855		final LinkedTransferQueue q = new LinkedTransferQueue();
856	<	final ConsumerObserver waiting = new ConsumerObserver();
856	>	assertEquals(q.getWaitingConsumerCount(), 0);
857	>	assertFalse(q.hasWaitingConsumer());
858
859		Thread t = newStartedThread(new CheckedRunnable() {
860	<	void realRun() throws InterruptedException {
860	>	public void realRun() throws InterruptedException {
861		Thread.sleep(SMALL_DELAY_MS);
862		threadAssertTrue(q.hasWaitingConsumer());
863	<	waiting.setWaitingConsumer(q.getWaitingConsumerCount());
863	>	threadAssertEquals(q.getWaitingConsumerCount(), 1);
864		threadAssertTrue(q.offer(new Object()));
865	+	threadAssertFalse(q.hasWaitingConsumer());
866	+	threadAssertEquals(q.getWaitingConsumerCount(), 0);
867		}});
868
869		assertTrue(q.poll(LONG_DELAY_MS, MILLISECONDS) != null);
870	<	assertTrue(q.getWaitingConsumerCount()
871	<	< waiting.getWaitingConsumers());
870	>	assertEquals(q.getWaitingConsumerCount(), 0);
871	>	assertFalse(q.hasWaitingConsumer());
872		t.join();
873		}
874
#	Line 883 | Line 880 | public class LinkedTransferQueueTest ext
880		LinkedTransferQueue q = new LinkedTransferQueue();
881		q.transfer(null);
882		shouldThrow();
883	<	} catch (NullPointerException ex) {
887	<	}
883	>	} catch (NullPointerException success) {}
884		}
885
886		/**
#	Line 896 | Line 892 | public class LinkedTransferQueueTest ext
892		= new LinkedTransferQueue<Integer>();
893
894		Thread t = newStartedThread(new CheckedRunnable() {
895	<	void realRun() throws InterruptedException {
895	>	public void realRun() throws InterruptedException {
896		q.transfer(SIZE);
897		threadAssertTrue(q.isEmpty());
898		}});
#	Line 916 | Line 912 | public class LinkedTransferQueueTest ext
912		= new LinkedTransferQueue<Integer>();
913
914		Thread first = newStartedThread(new CheckedRunnable() {
915	<	void realRun() throws InterruptedException {
915	>	public void realRun() throws InterruptedException {
916		Integer i = SIZE + 1;
917		q.transfer(i);
918		threadAssertTrue(!q.contains(i));
#	Line 925 | Line 921 | public class LinkedTransferQueueTest ext
921
922		Thread interruptedThread = newStartedThread(
923		new CheckedInterruptedRunnable() {
924	<	void realRun() throws InterruptedException {
924	>	public void realRun() throws InterruptedException {
925		while (q.size() == 0)
926		Thread.yield();
927		q.transfer(SIZE);
#	Line 951 | Line 947 | public class LinkedTransferQueueTest ext
947		final LinkedTransferQueue q = new LinkedTransferQueue();
948
949		Thread t = newStartedThread(new CheckedRunnable() {
950	<	void realRun() throws InterruptedException {
950	>	public void realRun() throws InterruptedException {
951		q.transfer(four);
952		threadAssertFalse(q.contains(four));
953		threadAssertEquals(three, q.poll());
#	Line 972 | Line 968 | public class LinkedTransferQueueTest ext
968		= new LinkedTransferQueue<Integer>();
969
970		Thread t = newStartedThread(new CheckedRunnable() {
971	<	void realRun() throws InterruptedException {
971	>	public void realRun() throws InterruptedException {
972		q.transfer(SIZE);
973		checkEmpty(q);
974		}});
#	Line 991 | Line 987 | public class LinkedTransferQueueTest ext
987		final LinkedTransferQueue q = new LinkedTransferQueue();
988		q.tryTransfer(null);
989		shouldThrow();
990	<	} catch (NullPointerException ex) {
995	<	}
990	>	} catch (NullPointerException success) {}
991		}
992
993		/**
#	Line 1015 | Line 1010 | public class LinkedTransferQueueTest ext
1010		final LinkedTransferQueue q = new LinkedTransferQueue();
1011
1012		Thread t = newStartedThread(new CheckedRunnable() {
1013	<	void realRun() {
1013	>	public void realRun() {
1014		while (! q.hasWaitingConsumer())
1015		Thread.yield();
1016		threadAssertTrue(q.hasWaitingConsumer());
#	Line 1038 | Line 1033 | public class LinkedTransferQueueTest ext
1033		final LinkedTransferQueue q = new LinkedTransferQueue();
1034
1035		Thread t = newStartedThread(new CheckedRunnable() {
1036	<	void realRun() {
1036	>	public void realRun() {
1037		while (! q.hasWaitingConsumer())
1038		Thread.yield();
1039		threadAssertTrue(q.hasWaitingConsumer());
#	Line 1060 | Line 1055 | public class LinkedTransferQueueTest ext
1055		final LinkedTransferQueue q = new LinkedTransferQueue();
1056
1057		Thread toInterrupt = newStartedThread(new CheckedInterruptedRunnable() {
1058	<	void realRun() throws InterruptedException {
1058	>	public void realRun() throws InterruptedException {
1059		q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
1060		}});
1061
#	Line 1076 | Line 1071 | public class LinkedTransferQueueTest ext
1071		final LinkedTransferQueue q = new LinkedTransferQueue();
1072
1073		Thread t = newStartedThread(new CheckedRunnable() {
1074	<	void realRun() throws InterruptedException {
1074	>	public void realRun() throws InterruptedException {
1075		threadAssertFalse
1076		(q.tryTransfer(new Object(),
1077		SHORT_DELAY_MS, MILLISECONDS));
#	Line 1096 | Line 1091 | public class LinkedTransferQueueTest ext
1091		assertTrue(q.offer(four));
1092
1093		Thread t = newStartedThread(new CheckedRunnable() {
1094	<	void realRun() throws InterruptedException {
1094	>	public void realRun() throws InterruptedException {
1095		threadAssertTrue(q.tryTransfer(five,
1096		MEDIUM_DELAY_MS, MILLISECONDS));
1097		threadAssertTrue(q.isEmpty());
#	Line 1121 | Line 1116 | public class LinkedTransferQueueTest ext
1116		assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1117		assertEquals(1, q.size());
1118		assertEquals(four, q.poll());
1124	–	checkEmpty(q);
1119		assertNull(q.poll());
1120	+	checkEmpty(q);
1121		}
1122
1123		private LinkedTransferQueue<Integer> populatedQueue(int n) {
#	Line 1136 | Line 1131 | public class LinkedTransferQueueTest ext
1131		assertFalse(q.isEmpty());
1132		return q;
1133		}
1139	–
1140	–	private static class ConsumerObserver {
1141	–
1142	–	private int waitingConsumers;
1143	–
1144	–	private ConsumerObserver() {
1145	–	}
1146	–
1147	–	private void setWaitingConsumer(int i) {
1148	–	this.waitingConsumers = i;
1149	–	}
1150	–
1151	–	private int getWaitingConsumers() {
1152	–	return waitingConsumers;
1153	–	}
1154	–	}
1134		}

Diff Legend

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