ViewVC Help

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

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

Comparing jsr166/src/test/tck/ArrayBlockingQueueTest.java (file contents):
Revision 1.10 by dl, Thu Jan 8 01:29:46 2004 UTC vs.
Revision 1.11 by dl, Sun Oct 31 14:55:14 2004 UTC

#	Line 650 | Line 650 | public class ArrayBlockingQueueTest exte
650		assertEquals(SIZE, q.remainingCapacity());
651		q.add(one);
652		assertFalse(q.isEmpty());
653	+	assertTrue(q.contains(one));
654		q.clear();
655		assertTrue(q.isEmpty());
656		}
#	Line 970 | Line 971 | public class ArrayBlockingQueueTest exte
971		assertEquals(l.size(), SIZE);
972		for (int i = 0; i < SIZE; ++i)
973		assertEquals(l.get(i), new Integer(i));
974	+	q.add(zero);
975	+	q.add(one);
976	+	assertFalse(q.isEmpty());
977	+	assertTrue(q.contains(zero));
978	+	assertTrue(q.contains(one));
979	+	l.clear();
980	+	q.drainTo(l);
981	+	assertEquals(q.size(), 0);
982	+	assertEquals(l.size(), 2);
983	+	for (int i = 0; i < 2; ++i)
984	+	assertEquals(l.get(i), new Integer(i));
985		}
986
987		/**
#	Line 1028 | Line 1040 | public class ArrayBlockingQueueTest exte
1040		* drainTo(c, n) empties first max {n, size} elements of queue into c
1041		*/
1042		public void testDrainToN() {
1043	+	ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE*2);
1044		for (int i = 0; i < SIZE + 2; ++i) {
1045	<	ArrayBlockingQueue q = populatedQueue(SIZE);
1045	>	for(int j = 0; j < SIZE; j++)
1046	>	assertTrue(q.offer(new Integer(j)));
1047		ArrayList l = new ArrayList();
1048		q.drainTo(l, i);
1049		int k = (i < SIZE)? i : SIZE;
1036	–	assertEquals(q.size(), SIZE-k);
1050		assertEquals(l.size(), k);
1051	+	assertEquals(q.size(), SIZE-k);
1052		for (int j = 0; j < k; ++j)
1053		assertEquals(l.get(j), new Integer(j));
1054	+	while (q.poll() != null) ;
1055		}
1056		}
1057

Diff Legend

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