ViewVC Help

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

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

Comparing jsr166/src/test/tck/ConcurrentLinkedQueueTest.java (file contents):
Revision 1.38 by jsr166, Fri May 15 18:21:19 2015 UTC vs.
Revision 1.45 by jsr166, Sat Mar 11 18:20:46 2017 UTC

#	Line 14 | Line 14 | import java.util.Queue;
14		import java.util.concurrent.ConcurrentLinkedQueue;
15
16		import junit.framework.Test;
17	–	import junit.framework.TestSuite;
17
18		public class ConcurrentLinkedQueueTest extends JSR166TestCase {
19
#	Line 23 | Line 22 | public class ConcurrentLinkedQueueTest e
22		}
23
24		public static Test suite() {
25	<	return new TestSuite(ConcurrentLinkedQueueTest.class);
25	>	class Implementation implements CollectionImplementation {
26	>	public Class<?> klazz() { return ConcurrentLinkedQueue.class; }
27	>	public Collection emptyCollection() { return new ConcurrentLinkedQueue(); }
28	>	public Object makeElement(int i) { return i; }
29	>	public boolean isConcurrent() { return true; }
30	>	public boolean permitsNulls() { return false; }
31	>	}
32	>	return newTestSuite(ConcurrentLinkedQueueTest.class,
33	>	CollectionTest.testSuite(new Implementation()));
34		}
35
36		/**
37		* Returns a new queue of given size containing consecutive
38	<	* Integers 0 ... n.
38	>	* Integers 0 ... n - 1.
39		*/
40	<	private ConcurrentLinkedQueue<Integer> populatedQueue(int n) {
41	<	ConcurrentLinkedQueue<Integer> q = new ConcurrentLinkedQueue<Integer>();
40	>	private static ConcurrentLinkedQueue<Integer> populatedQueue(int n) {
41	>	ConcurrentLinkedQueue<Integer> q = new ConcurrentLinkedQueue<>();
42		assertTrue(q.isEmpty());
43		for (int i = 0; i < n; ++i)
44		assertTrue(q.offer(new Integer(i)));
45		assertFalse(q.isEmpty());
46		assertEquals(n, q.size());
47	+	assertEquals((Integer) 0, q.peek());
48		return q;
49		}
50
#	Line 72 | Line 80 | public class ConcurrentLinkedQueueTest e
80		*/
81		public void testConstructor5() {
82		Integer[] ints = new Integer[SIZE];
83	<	for (int i = 0; i < SIZE-1; ++i)
83	>	for (int i = 0; i < SIZE - 1; ++i)
84		ints[i] = new Integer(i);
85		try {
86		new ConcurrentLinkedQueue(Arrays.asList(ints));
#	Line 112 | Line 120 | public class ConcurrentLinkedQueueTest e
120		public void testSize() {
121		ConcurrentLinkedQueue q = populatedQueue(SIZE);
122		for (int i = 0; i < SIZE; ++i) {
123	<	assertEquals(SIZE-i, q.size());
123	>	assertEquals(SIZE - i, q.size());
124		q.remove();
125		}
126		for (int i = 0; i < SIZE; ++i) {
#	Line 203 | Line 211 | public class ConcurrentLinkedQueueTest e
211		public void testAddAll3() {
212		ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
213		Integer[] ints = new Integer[SIZE];
214	<	for (int i = 0; i < SIZE-1; ++i)
214	>	for (int i = 0; i < SIZE - 1; ++i)
215		ints[i] = new Integer(i);
216		try {
217		q.addAll(Arrays.asList(ints));
#	Line 289 | Line 297 | public class ConcurrentLinkedQueueTest e
297		assertTrue(q.contains(i));
298		assertTrue(q.remove(i));
299		assertFalse(q.contains(i));
300	<	assertTrue(q.contains(i-1));
300	>	assertTrue(q.contains(i - 1));
301		}
302		for (int i = 0; i < SIZE; i += 2) {
303		assertTrue(q.contains(i));
304		assertTrue(q.remove(i));
305		assertFalse(q.contains(i));
306	<	assertFalse(q.remove(i+1));
307	<	assertFalse(q.contains(i+1));
306	>	assertFalse(q.remove(i + 1));
307	>	assertFalse(q.contains(i + 1));
308		}
309		assertTrue(q.isEmpty());
310		}
#	Line 355 | Line 363 | public class ConcurrentLinkedQueueTest e
363		assertTrue(changed);
364
365		assertTrue(q.containsAll(p));
366	<	assertEquals(SIZE-i, q.size());
366	>	assertEquals(SIZE - i, q.size());
367		p.remove();
368		}
369		}
#	Line 368 | Line 376 | public class ConcurrentLinkedQueueTest e
376		ConcurrentLinkedQueue q = populatedQueue(SIZE);
377		ConcurrentLinkedQueue p = populatedQueue(i);
378		assertTrue(q.removeAll(p));
379	<	assertEquals(SIZE-i, q.size());
379	>	assertEquals(SIZE - i, q.size());
380		for (int j = 0; j < i; ++j) {
381		Integer x = (Integer)(p.remove());
382		assertFalse(q.contains(x));

Diff Legend

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