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.7 by dl, Sun Oct 5 23:00:40 2003 UTC vs.
Revision 1.11 by dl, Sun Oct 31 14:55:14 2004 UTC

#	Line 1 | Line 1
1		/*
2	<	* Written by members of JCP JSR-166 Expert Group and released to the
3	<	* public domain. Use, modify, and redistribute this code in any way
4	<	* without acknowledgement. Other contributors include Andrew Wright,
5	<	* Jeffrey Hayes, Pat Fischer, Mike Judd.
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
5	>	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	>	* Pat Fisher, Mike Judd.
7		*/
8
9		import junit.framework.*;
#	Line 152 | Line 153 | public class PriorityBlockingQueueTest e
153		}
154
155		/**
156	<	* remainingCapacity does not change when elementa added or removed,
156	>	* remainingCapacity does not change when elements added or removed,
157		* but size does
158		*/
159		public void testRemainingCapacity() {
#	Line 625 | Line 626 | public class PriorityBlockingQueueTest e
626		q.clear();
627		assertTrue(q.isEmpty());
628		assertEquals(0, q.size());
629	<	assertEquals(NOCAP, q.remainingCapacity());
629	<	q.add(new Integer(1));
629	>	q.add(one);
630		assertFalse(q.isEmpty());
631	+	assertTrue(q.contains(one));
632		q.clear();
633		assertTrue(q.isEmpty());
634		}
#	Line 724 | Line 725 | public class PriorityBlockingQueueTest e
725		}
726
727		/**
728	<	* toArray with incompatable array type throws CCE
728	>	* toArray with incompatible array type throws CCE
729		*/
730		public void testToArray1_BadArg() {
731		try {
#	Line 870 | Line 871 | public class PriorityBlockingQueueTest e
871		assertEquals(l.size(), SIZE);
872		for (int i = 0; i < SIZE; ++i)
873		assertEquals(l.get(i), new Integer(i));
874	+	q.add(zero);
875	+	q.add(one);
876	+	assertFalse(q.isEmpty());
877	+	assertTrue(q.contains(zero));
878	+	assertTrue(q.contains(one));
879	+	l.clear();
880	+	q.drainTo(l);
881	+	assertEquals(q.size(), 0);
882	+	assertEquals(l.size(), 2);
883	+	for (int i = 0; i < 2; ++i)
884	+	assertEquals(l.get(i), new Integer(i));
885		}
886
887		/**
#	Line 890 | Line 902 | public class PriorityBlockingQueueTest e
902		for (int i = 0; i < SIZE; ++i)
903		assertEquals(l.get(i), new Integer(i));
904		t.join();
905	<	assertTrue(q.size() + l.size() == SIZE+1);
905	>	assertTrue(q.size() + l.size() >= SIZE);
906		} catch(Exception e){
907		unexpectedException();
908		}
#	Line 924 | Line 936 | public class PriorityBlockingQueueTest e
936		* drainTo(c, n) empties first max {n, size} elements of queue into c
937		*/
938		public void testDrainToN() {
939	+	PriorityBlockingQueue q = new PriorityBlockingQueue(SIZE*2);
940		for (int i = 0; i < SIZE + 2; ++i) {
941	<	PriorityBlockingQueue q = populatedQueue(SIZE);
941	>	for(int j = 0; j < SIZE; j++)
942	>	assertTrue(q.offer(new Integer(j)));
943		ArrayList l = new ArrayList();
944		q.drainTo(l, i);
945		int k = (i < SIZE)? i : SIZE;
932	–	assertEquals(q.size(), SIZE-k);
946		assertEquals(l.size(), k);
947	+	assertEquals(q.size(), SIZE-k);
948		for (int j = 0; j < k; ++j)
949	<	assertTrue(l.contains(new Integer(j)));
949	>	assertEquals(l.get(j), new Integer(j));
950	>	while (q.poll() != null) ;
951		}
952		}
953

Diff Legend

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