ViewVC Help

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

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

Comparing jsr166/src/test/tck/PriorityBlockingQueueTest.java (file contents):
Revision 1.43 by dl, Fri May 6 11:22:07 2011 UTC vs.
Revision 1.45 by jsr166, Mon May 30 22:43:20 2011 UTC

#	Line 7 | Line 7
7		*/
8
9		import junit.framework.*;
10	<	import java.util.*;
11	<	import java.util.concurrent.*;
10	>	import java.util.Arrays;
11	>	import java.util.ArrayList;
12	>	import java.util.Collection;
13	>	import java.util.Comparator;
14	>	import java.util.Iterator;
15	>	import java.util.NoSuchElementException;
16	>	import java.util.concurrent.PriorityBlockingQueue;
17	>	import java.util.concurrent.BlockingQueue;
18	>	import java.util.concurrent.CountDownLatch;
19	>	import java.util.concurrent.Executors;
20	>	import java.util.concurrent.ExecutorService;
21		import static java.util.concurrent.TimeUnit.MILLISECONDS;
22		import java.io.*;
23
#	Line 75 | Line 84 | public class PriorityBlockingQueueTest e
84		*/
85		public void testConstructor2() {
86		try {
87	<	PriorityBlockingQueue q = new PriorityBlockingQueue(0);
87	>	new PriorityBlockingQueue(0);
88		shouldThrow();
89		} catch (IllegalArgumentException success) {}
90		}
#	Line 85 | Line 94 | public class PriorityBlockingQueueTest e
94		*/
95		public void testConstructor3() {
96		try {
97	<	PriorityBlockingQueue q = new PriorityBlockingQueue(null);
97	>	new PriorityBlockingQueue(null);
98		shouldThrow();
99		} catch (NullPointerException success) {}
100		}
#	Line 94 | Line 103 | public class PriorityBlockingQueueTest e
103		* Initializing from Collection of null elements throws NPE
104		*/
105		public void testConstructor4() {
106	+	Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
107		try {
108	<	Integer[] ints = new Integer[SIZE];
99	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
108	>	new PriorityBlockingQueue(elements);
109		shouldThrow();
110		} catch (NullPointerException success) {}
111		}
#	Line 105 | Line 114 | public class PriorityBlockingQueueTest e
114		* Initializing from Collection with some null elements throws NPE
115		*/
116		public void testConstructor5() {
117	+	Integer[] ints = new Integer[SIZE];
118	+	for (int i = 0; i < SIZE-1; ++i)
119	+	ints[i] = i;
120	+	Collection<Integer> elements = Arrays.asList(ints);
121		try {
122	<	Integer[] ints = new Integer[SIZE];
110	<	for (int i = 0; i < SIZE-1; ++i)
111	<	ints[i] = new Integer(i);
112	<	PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
122	>	new PriorityBlockingQueue(elements);
123		shouldThrow();
124		} catch (NullPointerException success) {}
125		}
#	Line 120 | Line 130 | public class PriorityBlockingQueueTest e
130		public void testConstructor6() {
131		Integer[] ints = new Integer[SIZE];
132		for (int i = 0; i < SIZE; ++i)
133	<	ints[i] = new Integer(i);
133	>	ints[i] = i;
134		PriorityBlockingQueue q = new PriorityBlockingQueue(Arrays.asList(ints));
135		for (int i = 0; i < SIZE; ++i)
136		assertEquals(ints[i], q.poll());
#	Line 175 | Line 185 | public class PriorityBlockingQueueTest e
185		}
186
187		/**
178	–	* offer(null) throws NPE
179	–	*/
180	–	public void testOfferNull() {
181	–	try {
182	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
183	–	q.offer(null);
184	–	shouldThrow();
185	–	} catch (NullPointerException success) {}
186	–	}
187	–
188	–	/**
189	–	* add(null) throws NPE
190	–	*/
191	–	public void testAddNull() {
192	–	try {
193	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
194	–	q.add(null);
195	–	shouldThrow();
196	–	} catch (NullPointerException success) {}
197	–	}
198	–
199	–	/**
188		* Offer of comparable element succeeds
189		*/
190		public void testOffer() {
#	Line 230 | Line 218 | public class PriorityBlockingQueueTest e
218		}
219
220		/**
233	–	* addAll(null) throws NPE
234	–	*/
235	–	public void testAddAll1() {
236	–	try {
237	–	PriorityBlockingQueue q = new PriorityBlockingQueue(1);
238	–	q.addAll(null);
239	–	shouldThrow();
240	–	} catch (NullPointerException success) {}
241	–	}
242	–
243	–	/**
221		* addAll(this) throws IAE
222		*/
223		public void testAddAllSelf() {
#	Line 252 | Line 229 | public class PriorityBlockingQueueTest e
229		}
230
231		/**
255	–	* addAll of a collection with null elements throws NPE
256	–	*/
257	–	public void testAddAll2() {
258	–	try {
259	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
260	–	Integer[] ints = new Integer[SIZE];
261	–	q.addAll(Arrays.asList(ints));
262	–	shouldThrow();
263	–	} catch (NullPointerException success) {}
264	–	}
265	–
266	–	/**
232		* addAll of a collection with any null elements throws NPE after
233		* possibly adding some elements
234		*/
#	Line 294 | Line 259 | public class PriorityBlockingQueueTest e
259		}
260
261		/**
297	–	* put(null) throws NPE
298	–	*/
299	–	public void testPutNull() {
300	–	try {
301	–	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
302	–	q.put(null);
303	–	shouldThrow();
304	–	} catch (NullPointerException success) {}
305	–	}
306	–
307	–	/**
262		* all elements successfully put are contained
263		*/
264		public void testPut() {
#	Line 323 | Line 277 | public class PriorityBlockingQueueTest e
277		public void testPutWithTake() throws InterruptedException {
278		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
279		final int size = 4;
280	<	Thread t = new Thread(new CheckedRunnable() {
280	>	Thread t = newStartedThread(new CheckedRunnable() {
281		public void realRun() {
282		for (int i = 0; i < size; i++)
283		q.put(new Integer(0));
284		}});
285
286	<	t.start();
287	<	delay(SHORT_DELAY_MS);
334	<	assertEquals(q.size(), size);
286	>	awaitTermination(t);
287	>	assertEquals(size, q.size());
288		q.take();
336	–	t.interrupt();
337	–	t.join();
289		}
290
291		/**
#	Line 342 | Line 293 | public class PriorityBlockingQueueTest e
293		*/
294		public void testTimedOffer() throws InterruptedException {
295		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
296	<	Thread t = new Thread(new CheckedRunnable() {
296	>	Thread t = newStartedThread(new CheckedRunnable() {
297		public void realRun() {
298		q.put(new Integer(0));
299		q.put(new Integer(0));
#	Line 350 | Line 301 | public class PriorityBlockingQueueTest e
301		assertTrue(q.offer(new Integer(0), LONG_DELAY_MS, MILLISECONDS));
302		}});
303
304	<	t.start();
354	<	delay(SMALL_DELAY_MS);
355	<	t.interrupt();
356	<	t.join();
304	>	awaitTermination(t);
305		}
306
307		/**
#	Line 371 | Line 319 | public class PriorityBlockingQueueTest e
319		*/
320		public void testBlockingTake() throws InterruptedException {
321		final PriorityBlockingQueue q = populatedQueue(SIZE);
322	<	Thread t = new Thread(new CheckedRunnable() {
322	>	final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
323	>	Thread t = newStartedThread(new CheckedRunnable() {
324		public void realRun() throws InterruptedException {
325		for (int i = 0; i < SIZE; ++i) {
326		assertEquals(i, q.take());
327		}
328	+
329	+	Thread.currentThread().interrupt();
330	+	try {
331	+	q.take();
332	+	shouldThrow();
333	+	} catch (InterruptedException success) {}
334	+	assertFalse(Thread.interrupted());
335	+
336	+	pleaseInterrupt.countDown();
337		try {
338		q.take();
339		shouldThrow();
340		} catch (InterruptedException success) {}
341	+	assertFalse(Thread.interrupted());
342		}});
343
344	<	t.start();
345	<	delay(SHORT_DELAY_MS);
344	>	await(pleaseInterrupt);
345	>	assertThreadStaysAlive(t);
346		t.interrupt();
347	<	t.join();
347	>	awaitTermination(t);
348		}
349
391	–
350		/**
351		* poll succeeds unless empty
352		*/
#	Line 415 | Line 373 | public class PriorityBlockingQueueTest e
373		* timed poll with nonzero timeout succeeds when non-empty, else times out
374		*/
375		public void testTimedPoll() throws InterruptedException {
376	<	PriorityBlockingQueue q = populatedQueue(SIZE);
376	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
377		for (int i = 0; i < SIZE; ++i) {
378	<	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
379	<	}
380	<	assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
378	>	long startTime = System.nanoTime();
379	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
380	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
381	>	}
382	>	long startTime = System.nanoTime();
383	>	assertNull(q.poll(timeoutMillis(), MILLISECONDS));
384	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
385	>	checkEmpty(q);
386		}
387
388		/**
#	Line 439 | Line 402 | public class PriorityBlockingQueueTest e
402		long t0 = System.nanoTime();
403		aboutToWait.countDown();
404		try {
405	<	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
405	>	q.poll(LONG_DELAY_MS, MILLISECONDS);
406		shouldThrow();
407		} catch (InterruptedException success) {
408		assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
#	Line 617 | Line 580 | public class PriorityBlockingQueueTest e
580		}
581
582		/**
620	–	* toArray(null) throws NullPointerException
621	–	*/
622	–	public void testToArray_NullArg() {
623	–	PriorityBlockingQueue q = populatedQueue(SIZE);
624	–	try {
625	–	q.toArray(null);
626	–	shouldThrow();
627	–	} catch (NullPointerException success) {}
628	–	}
629	–
630	–	/**
583		* toArray(incompatible array type) throws ArrayStoreException
584		*/
585		public void testToArray1_BadArg() {
#	Line 671 | Line 623 | public class PriorityBlockingQueueTest e
623		assertFalse(it.hasNext());
624		}
625
674	–
626		/**
627		* toString contains toStrings of elements
628		*/
#	Line 679 | Line 630 | public class PriorityBlockingQueueTest e
630		PriorityBlockingQueue q = populatedQueue(SIZE);
631		String s = q.toString();
632		for (int i = 0; i < SIZE; ++i) {
633	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
633	>	assertTrue(s.contains(String.valueOf(i)));
634		}
635		}
636
637		/**
638	<	* offer transfers elements across Executor tasks
638	>	* timed poll transfers elements across Executor tasks
639		*/
640		public void testPollInExecutor() {
641		final PriorityBlockingQueue q = new PriorityBlockingQueue(2);
642	+	final CheckedBarrier threadsStarted = new CheckedBarrier(2);
643		ExecutorService executor = Executors.newFixedThreadPool(2);
644		executor.execute(new CheckedRunnable() {
645		public void realRun() throws InterruptedException {
646		assertNull(q.poll());
647	<	assertSame(one, q.poll(MEDIUM_DELAY_MS, MILLISECONDS));
648	<	assertTrue(q.isEmpty());
647	>	threadsStarted.await();
648	>	assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
649	>	checkEmpty(q);
650		}});
651
652		executor.execute(new CheckedRunnable() {
653		public void realRun() throws InterruptedException {
654	<	delay(SMALL_DELAY_MS);
654	>	threadsStarted.await();
655		q.put(one);
656		}});
657
#	Line 724 | Line 677 | public class PriorityBlockingQueueTest e
677		}
678
679		/**
727	–	* drainTo(null) throws NPE
728	–	*/
729	–	public void testDrainToNull() {
730	–	PriorityBlockingQueue q = populatedQueue(SIZE);
731	–	try {
732	–	q.drainTo(null);
733	–	shouldThrow();
734	–	} catch (NullPointerException success) {}
735	–	}
736	–
737	–	/**
738	–	* drainTo(this) throws IAE
739	–	*/
740	–	public void testDrainToSelf() {
741	–	PriorityBlockingQueue q = populatedQueue(SIZE);
742	–	try {
743	–	q.drainTo(q);
744	–	shouldThrow();
745	–	} catch (IllegalArgumentException success) {}
746	–	}
747	–
748	–	/**
680		* drainTo(c) empties queue into another collection c
681		*/
682		public void testDrainTo() {
#	Line 790 | Line 721 | public class PriorityBlockingQueueTest e
721		}
722
723		/**
793	–	* drainTo(null, n) throws NPE
794	–	*/
795	–	public void testDrainToNullN() {
796	–	PriorityBlockingQueue q = populatedQueue(SIZE);
797	–	try {
798	–	q.drainTo(null, 0);
799	–	shouldThrow();
800	–	} catch (NullPointerException success) {}
801	–	}
802	–
803	–	/**
804	–	* drainTo(this, n) throws IAE
805	–	*/
806	–	public void testDrainToSelfN() {
807	–	PriorityBlockingQueue q = populatedQueue(SIZE);
808	–	try {
809	–	q.drainTo(q, 0);
810	–	shouldThrow();
811	–	} catch (IllegalArgumentException success) {}
812	–	}
813	–
814	–	/**
724		* drainTo(c, n) empties first min(n, size) elements of queue into c
725		*/
726		public void testDrainToN() {

Diff Legend

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