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.39 by jsr166, Sat May 23 00:53:08 2015 UTC vs.
Revision 1.47 by jsr166, Fri Aug 4 03:30:21 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 164 | Line 172 | public class ConcurrentLinkedQueueTest e
172		}
173
174		/**
175	<	* addAll(null) throws NPE
175	>	* addAll(null) throws NullPointerException
176		*/
177		public void testAddAll1() {
178		ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
#	Line 175 | Line 183 | public class ConcurrentLinkedQueueTest e
183		}
184
185		/**
186	<	* addAll(this) throws IAE
186	>	* addAll(this) throws IllegalArgumentException
187		*/
188		public void testAddAllSelf() {
189		ConcurrentLinkedQueue q = populatedQueue(SIZE);
#	Line 186 | Line 194 | public class ConcurrentLinkedQueueTest e
194		}
195
196		/**
197	<	* addAll of a collection with null elements throws NPE
197	>	* addAll of a collection with null elements throws NullPointerException
198		*/
199		public void testAddAll2() {
200		ConcurrentLinkedQueue q = new ConcurrentLinkedQueue();
#	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 503 | Line 511 | public class ConcurrentLinkedQueueTest e
511		}
512
513		/**
514	<	* A deserialized serialized queue has same elements in same order
514	>	* A deserialized/reserialized queue has same elements in same order
515		*/
516		public void testSerialization() throws Exception {
517		Queue x = populatedQueue(SIZE);

Diff Legend

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