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.35 by jsr166, Wed Nov 3 07:54:52 2010 UTC vs.
Revision 1.42 by jsr166, Thu Apr 14 22:55:08 2011 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
#	Line 49 | Line 49 | public class PriorityBlockingQueueTest e
49		* Create a queue of given size containing consecutive
50		* Integers 0 ... n.
51		*/
52	<	private PriorityBlockingQueue populatedQueue(int n) {
53	<	PriorityBlockingQueue q = new PriorityBlockingQueue(n);
52	>	private PriorityBlockingQueue<Integer> populatedQueue(int n) {
53	>	PriorityBlockingQueue<Integer> q =
54	>	new PriorityBlockingQueue<Integer>(n);
55		assertTrue(q.isEmpty());
56		for (int i = n-1; i >= 0; i-=2)
57		assertTrue(q.offer(new Integer(i)));
#	Line 295 | Line 296 | public class PriorityBlockingQueueTest e
296		/**
297		* put(null) throws NPE
298		*/
299	<	public void testPutNull() {
299	>	public void testPutNull() {
300		try {
301		PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
302		q.put(null);
303		shouldThrow();
304		} catch (NullPointerException success) {}
305	<	}
305	>	}
306
307		/**
308		* all elements successfully put are contained
309		*/
310	<	public void testPut() {
311	<	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
312	<	for (int i = 0; i < SIZE; ++i) {
313	<	Integer I = new Integer(i);
314	<	q.put(I);
315	<	assertTrue(q.contains(I));
316	<	}
317	<	assertEquals(SIZE, q.size());
310	>	public void testPut() {
311	>	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE);
312	>	for (int i = 0; i < SIZE; ++i) {
313	>	Integer I = new Integer(i);
314	>	q.put(I);
315	>	assertTrue(q.contains(I));
316	>	}
317	>	assertEquals(SIZE, q.size());
318		}
319
320		/**
#	Line 426 | Line 427 | public class PriorityBlockingQueueTest e
427		* returning timeout status
428		*/
429		public void testInterruptedTimedPoll() throws InterruptedException {
430	<	Thread t = new Thread(new CheckedRunnable() {
430	>	final BlockingQueue<Integer> q = populatedQueue(SIZE);
431	>	final CountDownLatch aboutToWait = new CountDownLatch(1);
432	>	Thread t = newStartedThread(new CheckedRunnable() {
433		public void realRun() throws InterruptedException {
431	–	PriorityBlockingQueue q = populatedQueue(SIZE);
434		for (int i = 0; i < SIZE; ++i) {
435	<	assertEquals(i, q.poll(SHORT_DELAY_MS, MILLISECONDS));
435	>	long t0 = System.nanoTime();
436	>	assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
437	>	assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
438		}
439	+	long t0 = System.nanoTime();
440	+	aboutToWait.countDown();
441		try {
442	<	q.poll(SMALL_DELAY_MS, MILLISECONDS);
442	>	q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
443		shouldThrow();
444	<	} catch (InterruptedException success) {}
444	>	} catch (InterruptedException success) {
445	>	assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
446	>	}
447		}});
448
449	<	t.start();
450	<	Thread.sleep(SHORT_DELAY_MS);
449	>	aboutToWait.await();
450	>	waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
451		t.interrupt();
452	<	t.join();
452	>	awaitTermination(t, MEDIUM_DELAY_MS);
453		}
454
455		/**
#	Line 493 | Line 501 | public class PriorityBlockingQueueTest e
501		public void testRemoveElement() {
502		PriorityBlockingQueue q = populatedQueue(SIZE);
503		for (int i = 1; i < SIZE; i+=2) {
504	<	assertTrue(q.remove(new Integer(i)));
504	>	assertTrue(q.contains(i));
505	>	assertTrue(q.remove(i));
506	>	assertFalse(q.contains(i));
507	>	assertTrue(q.contains(i-1));
508		}
509		for (int i = 0; i < SIZE; i+=2) {
510	<	assertTrue(q.remove(new Integer(i)));
511	<	assertFalse(q.remove(new Integer(i+1)));
510	>	assertTrue(q.contains(i));
511	>	assertTrue(q.remove(i));
512	>	assertFalse(q.contains(i));
513	>	assertFalse(q.remove(i+1));
514	>	assertFalse(q.contains(i+1));
515		}
516		assertTrue(q.isEmpty());
517		}
#	Line 586 | Line 600 | public class PriorityBlockingQueueTest e
600		Object[] o = q.toArray();
601		Arrays.sort(o);
602		for (int i = 0; i < o.length; i++)
603	<	assertEquals(o[i], q.take());
603	>	assertSame(o[i], q.take());
604		}
605
606		/**
607		* toArray(a) contains all elements
608		*/
609		public void testToArray2() throws InterruptedException {
610	<	PriorityBlockingQueue q = populatedQueue(SIZE);
610	>	PriorityBlockingQueue<Integer> q = populatedQueue(SIZE);
611		Integer[] ints = new Integer[SIZE];
612	<	ints = (Integer[])q.toArray(ints);
612	>	Integer[] array = q.toArray(ints);
613	>	assertSame(ints, array);
614		Arrays.sort(ints);
615		for (int i = 0; i < ints.length; i++)
616	<	assertEquals(ints[i], q.take());
616	>	assertSame(ints[i], q.take());
617		}
618
619		/**
620	<	* toArray(null) throws NPE
620	>	* toArray(null) throws NullPointerException
621		*/
622	<	public void testToArray_BadArg() {
622	>	public void testToArray_NullArg() {
623		PriorityBlockingQueue q = populatedQueue(SIZE);
624		try {
625	<	Object o[] = q.toArray(null);
625	>	q.toArray(null);
626		shouldThrow();
627		} catch (NullPointerException success) {}
628		}

Diff Legend

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