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.30 by jsr166, Thu May 30 03:28:55 2013 UTC vs.
Revision 1.36 by jsr166, Sun Feb 22 04:34:44 2015 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–	import junit.framework.*;
9		import java.util.Arrays;
10		import java.util.Collection;
11		import java.util.Iterator;
#	Line 14 | Line 13 | import java.util.NoSuchElementException;
13		import java.util.Queue;
14		import java.util.concurrent.ConcurrentLinkedQueue;
15
16	+	import junit.framework.Test;
17	+	import junit.framework.TestSuite;
18	+
19		public class ConcurrentLinkedQueueTest extends JSR166TestCase {
20
21		public static void main(String[] args) {
#	Line 50 | Line 52 | public class ConcurrentLinkedQueueTest e
52		*/
53		public void testConstructor3() {
54		try {
55	<	ConcurrentLinkedQueue q = new ConcurrentLinkedQueue((Collection)null);
55	>	new ConcurrentLinkedQueue((Collection)null);
56		shouldThrow();
57		} catch (NullPointerException success) {}
58		}
#	Line 61 | Line 63 | public class ConcurrentLinkedQueueTest e
63		public void testConstructor4() {
64		try {
65		Integer[] ints = new Integer[SIZE];
66	<	ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(Arrays.asList(ints));
66	>	new ConcurrentLinkedQueue(Arrays.asList(ints));
67		shouldThrow();
68		} catch (NullPointerException success) {}
69		}
#	Line 74 | Line 76 | public class ConcurrentLinkedQueueTest e
76		Integer[] ints = new Integer[SIZE];
77		for (int i = 0; i < SIZE-1; ++i)
78		ints[i] = new Integer(i);
79	<	ConcurrentLinkedQueue q = new ConcurrentLinkedQueue(Arrays.asList(ints));
79	>	new ConcurrentLinkedQueue(Arrays.asList(ints));
80		shouldThrow();
81		} catch (NullPointerException success) {}
82		}
#	Line 285 | Line 287 | public class ConcurrentLinkedQueueTest e
287		*/
288		public void testRemoveElement() {
289		ConcurrentLinkedQueue q = populatedQueue(SIZE);
290	<	for (int i = 1; i < SIZE; i+=2) {
290	>	for (int i = 1; i < SIZE; i += 2) {
291		assertTrue(q.contains(i));
292		assertTrue(q.remove(i));
293		assertFalse(q.contains(i));
294		assertTrue(q.contains(i-1));
295		}
296	<	for (int i = 0; i < SIZE; i+=2) {
296	>	for (int i = 0; i < SIZE; i += 2) {
297		assertTrue(q.contains(i));
298		assertTrue(q.remove(i));
299		assertFalse(q.contains(i));
#	Line 370 | Line 372 | public class ConcurrentLinkedQueueTest e
372		assertTrue(q.removeAll(p));
373		assertEquals(SIZE-i, q.size());
374		for (int j = 0; j < i; ++j) {
375	<	Integer I = (Integer)(p.remove());
376	<	assertFalse(q.contains(I));
375	>	Integer x = (Integer)(p.remove());
376	>	assertFalse(q.contains(x));
377		}
378		}
379		}
#	Line 425 | Line 427 | public class ConcurrentLinkedQueueTest e
427		*/
428		public void testIterator() {
429		ConcurrentLinkedQueue q = populatedQueue(SIZE);
428	–	int i = 0;
430		Iterator it = q.iterator();
431	<	while (it.hasNext()) {
431	>	int i;
432	>	for (i = 0; it.hasNext(); i++)
433		assertTrue(q.contains(it.next()));
432	–	++i;
433	–	}
434		assertEquals(i, SIZE);
435	+	assertIteratorExhausted(it);
436	+	}
437	+
438	+	/**
439	+	* iterator of empty collection has no elements
440	+	*/
441	+	public void testEmptyIterator() {
442	+	assertIteratorExhausted(new ConcurrentLinkedQueue().iterator());
443		}
444
445		/**
#	Line 514 | Line 522 | public class ConcurrentLinkedQueueTest e
522		assertTrue(y.isEmpty());
523		}
524
525	+	/**
526	+	* remove(null), contains(null) always return false
527	+	*/
528	+	public void testNeverContainsNull() {
529	+	Collection<?>[] qs = {
530	+	new ConcurrentLinkedQueue<Object>(),
531	+	populatedQueue(2),
532	+	};
533	+
534	+	for (Collection<?> q : qs) {
535	+	assertFalse(q.contains(null));
536	+	assertFalse(q.remove(null));
537	+	}
538	+	}
539		}

Diff Legend

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