ViewVC Help

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

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

Comparing jsr166/src/test/tck/ConcurrentSkipListSubSetTest.java (file contents):
Revision 1.7 by jsr166, Mon Nov 16 05:30:07 2009 UTC vs.
Revision 1.39 by jsr166, Mon May 28 21:19:50 2018 UTC

#	Line 1 | Line 1
1		/*
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
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		*/
6
7	<	import junit.framework.*;
8	<	import java.util.*;
9	<	import java.util.concurrent.*;
10	<	import java.io.*;
7	>	import java.util.Arrays;
8	>	import java.util.Comparator;
9	>	import java.util.Iterator;
10	>	import java.util.NavigableSet;
11	>	import java.util.SortedSet;
12	>	import java.util.concurrent.ConcurrentSkipListSet;
13	>
14	>	import junit.framework.Test;
15	>	import junit.framework.TestSuite;
16
17		public class ConcurrentSkipListSubSetTest extends JSR166TestCase {
18		public static void main(String[] args) {
19	<	junit.textui.TestRunner.run (suite());
19	>	main(suite(), args);
20		}
21		public static Test suite() {
22	<	return new TestSuite(ConcurrentSkipListSubSetTest.class);
22	>	return new TestSuite(ConcurrentSkipListSubSetTest.class);
23		}
24
25		static class MyReverseComparator implements Comparator {
26		public int compare(Object x, Object y) {
27	<	int i = ((Integer)x).intValue();
23	<	int j = ((Integer)y).intValue();
24	<	if (i < j) return 1;
25	<	if (i > j) return -1;
26	<	return 0;
27	>	return ((Comparable)y).compareTo(x);
28		}
29		}
30
31		/**
32	<	* Create a set of given size containing consecutive
33	<	* Integers 0 ... n.
32	>	* Returns a new set of given size containing consecutive
33	>	* Integers 0 ... n - 1.
34		*/
35	<	private NavigableSet populatedSet(int n) {
36	<	ConcurrentSkipListSet q = new ConcurrentSkipListSet();
35	>	private static NavigableSet<Integer> populatedSet(int n) {
36	>	ConcurrentSkipListSet<Integer> q = new ConcurrentSkipListSet<>();
37		assertTrue(q.isEmpty());
38
39	<	for (int i = n-1; i >= 0; i-=2)
40	<	assertTrue(q.add(new Integer(i)));
41	<	for (int i = (n & 1); i < n; i+=2)
42	<	assertTrue(q.add(new Integer(i)));
39	>	for (int i = n - 1; i >= 0; i -= 2)
40	>	assertTrue(q.add(new Integer(i)));
41	>	for (int i = (n & 1); i < n; i += 2)
42	>	assertTrue(q.add(new Integer(i)));
43		assertTrue(q.add(new Integer(-n)));
44		assertTrue(q.add(new Integer(n)));
45		NavigableSet s = q.subSet(new Integer(0), true, new Integer(n), false);
46		assertFalse(s.isEmpty());
47	<	assertEquals(n, s.size());
47	>	assertEquals(n, s.size());
48		return s;
49		}
50
51		/**
52	<	* Create set of first 5 ints
52	>	* Returns a new set of first 5 ints.
53		*/
54	<	private NavigableSet set5() {
54	>	private static NavigableSet set5() {
55		ConcurrentSkipListSet q = new ConcurrentSkipListSet();
56		assertTrue(q.isEmpty());
57		q.add(one);
#	Line 61 | Line 62 | public class ConcurrentSkipListSubSetTes
62		q.add(zero);
63		q.add(seven);
64		NavigableSet s = q.subSet(one, true, seven, false);
65	<	assertEquals(5, s.size());
65	>	assertEquals(5, s.size());
66		return s;
67		}
68
69		/**
70	<	* Create set of first 5 negative ints
70	>	* Returns a new set of first 5 negative ints.
71		*/
72	<	private NavigableSet dset5() {
72	>	private static NavigableSet dset5() {
73		ConcurrentSkipListSet q = new ConcurrentSkipListSet();
74		assertTrue(q.isEmpty());
75		q.add(m1);
#	Line 77 | Line 78 | public class ConcurrentSkipListSubSetTes
78		q.add(m4);
79		q.add(m5);
80		NavigableSet s = q.descendingSet();
81	<	assertEquals(5, s.size());
81	>	assertEquals(5, s.size());
82		return s;
83		}
84
85		private static NavigableSet set0() {
86	<	ConcurrentSkipListSet set = new ConcurrentSkipListSet();
86	>	ConcurrentSkipListSet set = new ConcurrentSkipListSet();
87		assertTrue(set.isEmpty());
88		return set.tailSet(m1, true);
89		}
90
91		private static NavigableSet dset0() {
92	<	ConcurrentSkipListSet set = new ConcurrentSkipListSet();
92	>	ConcurrentSkipListSet set = new ConcurrentSkipListSet();
93		assertTrue(set.isEmpty());
94		return set;
95		}
#	Line 100 | Line 101 | public class ConcurrentSkipListSubSetTes
101		assertEquals(0, set0().size());
102		}
103
103	–
104		/**
105		* isEmpty is true before add, false after
106		*/
#	Line 121 | Line 121 | public class ConcurrentSkipListSubSetTes
121		public void testSize() {
122		NavigableSet q = populatedSet(SIZE);
123		for (int i = 0; i < SIZE; ++i) {
124	<	assertEquals(SIZE-i, q.size());
124	>	assertEquals(SIZE - i, q.size());
125		q.pollFirst();
126		}
127		for (int i = 0; i < SIZE; ++i) {
#	Line 134 | Line 134 | public class ConcurrentSkipListSubSetTes
134		* add(null) throws NPE
135		*/
136		public void testAddNull() {
137	<	try {
138	<	NavigableSet q = set0();
137	>	NavigableSet q = set0();
138	>	try {
139		q.add(null);
140		shouldThrow();
141	<	} catch (NullPointerException success) { }
141	>	} catch (NullPointerException success) {}
142		}
143
144		/**
#	Line 162 | Line 162 | public class ConcurrentSkipListSubSetTes
162		* Add of non-Comparable throws CCE
163		*/
164		public void testAddNonComparable() {
165	+	NavigableSet q = set0();
166		try {
166	–	NavigableSet q = set0();
167	–	q.add(new Object());
167		q.add(new Object());
168		q.add(new Object());
169		shouldThrow();
170	<	}
172	<	catch (ClassCastException success) {}
170	>	} catch (ClassCastException success) {}
171		}
172
175	–
173		/**
174		* addAll(null) throws NPE
175		*/
176		public void testAddAll1() {
177	+	NavigableSet q = set0();
178		try {
181	–	NavigableSet q = set0();
179		q.addAll(null);
180		shouldThrow();
181	<	}
185	<	catch (NullPointerException success) {}
181	>	} catch (NullPointerException success) {}
182		}
183	+
184		/**
185		* addAll of a collection with null elements throws NPE
186		*/
187		public void testAddAll2() {
188	+	NavigableSet q = set0();
189	+	Integer[] ints = new Integer[SIZE];
190		try {
192	–	NavigableSet q = set0();
193	–	Integer[] ints = new Integer[SIZE];
191		q.addAll(Arrays.asList(ints));
192		shouldThrow();
193	<	}
197	<	catch (NullPointerException success) {}
193	>	} catch (NullPointerException success) {}
194		}
195	+
196		/**
197		* addAll of a collection with any null elements throws NPE after
198		* possibly adding some elements
199		*/
200		public void testAddAll3() {
201	+	NavigableSet q = set0();
202	+	Integer[] ints = new Integer[SIZE];
203	+	for (int i = 0; i < SIZE - 1; ++i)
204	+	ints[i] = new Integer(i + SIZE);
205		try {
205	–	NavigableSet q = set0();
206	–	Integer[] ints = new Integer[SIZE];
207	–	for (int i = 0; i < SIZE-1; ++i)
208	–	ints[i] = new Integer(i+SIZE);
206		q.addAll(Arrays.asList(ints));
207		shouldThrow();
208	<	}
212	<	catch (NullPointerException success) {}
208	>	} catch (NullPointerException success) {}
209		}
210
211		/**
212		* Set contains all elements of successful addAll
213		*/
214		public void testAddAll5() {
215	<	try {
216	<	Integer[] empty = new Integer[0];
217	<	Integer[] ints = new Integer[SIZE];
218	<	for (int i = 0; i < SIZE; ++i)
219	<	ints[i] = new Integer(SIZE-1- i);
220	<	NavigableSet q = set0();
221	<	assertFalse(q.addAll(Arrays.asList(empty)));
222	<	assertTrue(q.addAll(Arrays.asList(ints)));
223	<	for (int i = 0; i < SIZE; ++i)
228	<	assertEquals(new Integer(i), q.pollFirst());
229	<	}
230	<	finally {}
215	>	Integer[] empty = new Integer[0];
216	>	Integer[] ints = new Integer[SIZE];
217	>	for (int i = 0; i < SIZE; ++i)
218	>	ints[i] = new Integer(SIZE - 1 - i);
219	>	NavigableSet q = set0();
220	>	assertFalse(q.addAll(Arrays.asList(empty)));
221	>	assertTrue(q.addAll(Arrays.asList(ints)));
222	>	for (int i = 0; i < SIZE; ++i)
223	>	assertEquals(new Integer(i), q.pollFirst());
224		}
225
226		/**
#	Line 236 | Line 229 | public class ConcurrentSkipListSubSetTes
229		public void testPoll() {
230		NavigableSet q = populatedSet(SIZE);
231		for (int i = 0; i < SIZE; ++i) {
232	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
232	>	assertEquals(i, q.pollFirst());
233		}
234	<	assertNull(q.pollFirst());
234	>	assertNull(q.pollFirst());
235		}
236
237		/**
#	Line 246 | Line 239 | public class ConcurrentSkipListSubSetTes
239		*/
240		public void testRemoveElement() {
241		NavigableSet q = populatedSet(SIZE);
242	<	for (int i = 1; i < SIZE; i+=2) {
243	<	assertTrue(q.remove(new Integer(i)));
244	<	}
245	<	for (int i = 0; i < SIZE; i+=2) {
246	<	assertTrue(q.remove(new Integer(i)));
247	<	assertFalse(q.remove(new Integer(i+1)));
242	>	for (int i = 1; i < SIZE; i += 2) {
243	>	assertTrue(q.contains(i));
244	>	assertTrue(q.remove(i));
245	>	assertFalse(q.contains(i));
246	>	assertTrue(q.contains(i - 1));
247	>	}
248	>	for (int i = 0; i < SIZE; i += 2) {
249	>	assertTrue(q.contains(i));
250	>	assertTrue(q.remove(i));
251	>	assertFalse(q.contains(i));
252	>	assertFalse(q.remove(i + 1));
253	>	assertFalse(q.contains(i + 1));
254		}
255		assertTrue(q.isEmpty());
256		}
#	Line 310 | Line 309 | public class ConcurrentSkipListSubSetTes
309		assertTrue(changed);
310
311		assertTrue(q.containsAll(p));
312	<	assertEquals(SIZE-i, q.size());
312	>	assertEquals(SIZE - i, q.size());
313		p.pollFirst();
314		}
315		}
#	Line 323 | Line 322 | public class ConcurrentSkipListSubSetTes
322		NavigableSet q = populatedSet(SIZE);
323		NavigableSet p = populatedSet(i);
324		assertTrue(q.removeAll(p));
325	<	assertEquals(SIZE-i, q.size());
325	>	assertEquals(SIZE - i, q.size());
326		for (int j = 0; j < i; ++j) {
327	<	Integer I = (Integer)(p.pollFirst());
328	<	assertFalse(q.contains(I));
327	>	Integer x = (Integer)(p.pollFirst());
328	>	assertFalse(q.contains(x));
329		}
330		}
331		}
332
334	–
335	–
333		/**
334		* lower returns preceding element
335		*/
#	Line 349 | Line 346 | public class ConcurrentSkipListSubSetTes
346
347		Object e4 = q.lower(zero);
348		assertNull(e4);
352	–
349		}
350
351		/**
#	Line 368 | Line 364 | public class ConcurrentSkipListSubSetTes
364
365		Object e4 = q.higher(six);
366		assertNull(e4);
371	–
367		}
368
369		/**
#	Line 387 | Line 382 | public class ConcurrentSkipListSubSetTes
382
383		Object e4 = q.floor(zero);
384		assertNull(e4);
390	–
385		}
386
387		/**
#	Line 406 | Line 400 | public class ConcurrentSkipListSubSetTes
400
401		Object e4 = q.ceiling(six);
402		assertNull(e4);
409	–
403		}
404
405		/**
406	<	* toArray contains all elements
406	>	* toArray contains all elements in sorted order
407		*/
408		public void testToArray() {
409		NavigableSet q = populatedSet(SIZE);
410	<	Object[] o = q.toArray();
411	<	Arrays.sort(o);
412	<	for (int i = 0; i < o.length; i++)
413	<	assertEquals(o[i], q.pollFirst());
410	>	Object[] a = q.toArray();
411	>	assertSame(Object[].class, a.getClass());
412	>	for (Object o : a)
413	>	assertSame(o, q.pollFirst());
414	>	assertTrue(q.isEmpty());
415		}
416
417		/**
418	<	* toArray(a) contains all elements
418	>	* toArray(a) contains all elements in sorted order
419		*/
420		public void testToArray2() {
421	<	NavigableSet q = populatedSet(SIZE);
422	<	Integer[] ints = new Integer[SIZE];
423	<	ints = (Integer[])q.toArray(ints);
424	<	Arrays.sort(ints);
425	<	for (int i = 0; i < ints.length; i++)
426	<	assertEquals(ints[i], q.pollFirst());
421	>	NavigableSet<Integer> q = populatedSet(SIZE);
422	>	Integer[] ints = new Integer[SIZE];
423	>	Integer[] array = q.toArray(ints);
424	>	assertSame(ints, array);
425	>	for (Integer o : ints)
426	>	assertSame(o, q.pollFirst());
427	>	assertTrue(q.isEmpty());
428		}
429
430		/**
#	Line 437 | Line 432 | public class ConcurrentSkipListSubSetTes
432		*/
433		public void testIterator() {
434		NavigableSet q = populatedSet(SIZE);
435	<	int i = 0;
436	<	Iterator it = q.iterator();
437	<	while (it.hasNext()) {
435	>	Iterator it = q.iterator();
436	>	int i;
437	>	for (i = 0; it.hasNext(); i++)
438		assertTrue(q.contains(it.next()));
444	–	++i;
445	–	}
439		assertEquals(i, SIZE);
440	+	assertIteratorExhausted(it);
441		}
442
443		/**
444		* iterator of empty set has no elements
445		*/
446		public void testEmptyIterator() {
447	<	NavigableSet q = set0();
454	<	int i = 0;
455	<	Iterator it = q.iterator();
456	<	while (it.hasNext()) {
457	<	assertTrue(q.contains(it.next()));
458	<	++i;
459	<	}
460	<	assertEquals(i, 0);
447	>	assertIteratorExhausted(set0().iterator());
448		}
449
450		/**
451		* iterator.remove removes current element
452		*/
453	<	public void testIteratorRemove () {
453	>	public void testIteratorRemove() {
454		final NavigableSet q = set0();
455		q.add(new Integer(2));
456		q.add(new Integer(1));
#	Line 479 | Line 466 | public class ConcurrentSkipListSubSetTes
466		assertFalse(it.hasNext());
467		}
468
482	–
469		/**
470		* toString contains toStrings of elements
471		*/
#	Line 487 | Line 473 | public class ConcurrentSkipListSubSetTes
473		NavigableSet q = populatedSet(SIZE);
474		String s = q.toString();
475		for (int i = 0; i < SIZE; ++i) {
476	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
476	>	assertTrue(s.contains(String.valueOf(i)));
477		}
478		}
479
480		/**
481	<	* A deserialized serialized set has same elements
481	>	* A deserialized/reserialized set equals original
482		*/
483	<	public void testSerialization() {
484	<	NavigableSet q = populatedSet(SIZE);
485	<	try {
486	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
487	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
488	<	out.writeObject(q);
489	<	out.close();
490	<
491	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
492	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
493	<	NavigableSet r = (NavigableSet)in.readObject();
508	<	assertEquals(q.size(), r.size());
509	<	while (!q.isEmpty())
510	<	assertEquals(q.pollFirst(), r.pollFirst());
511	<	} catch (Exception e) {
512	<	e.printStackTrace();
513	<	unexpectedException();
483	>	public void testSerialization() throws Exception {
484	>	NavigableSet x = populatedSet(SIZE);
485	>	NavigableSet y = serialClone(x);
486	>
487	>	assertNotSame(y, x);
488	>	assertEquals(x.size(), y.size());
489	>	assertEquals(x, y);
490	>	assertEquals(y, x);
491	>	while (!x.isEmpty()) {
492	>	assertFalse(y.isEmpty());
493	>	assertEquals(x.pollFirst(), y.pollFirst());
494		}
495	+	assertTrue(y.isEmpty());
496		}
497
498		/**
#	Line 639 | Line 620 | public class ConcurrentSkipListSubSetTes
620		public void testDescendingSize() {
621		NavigableSet q = populatedSet(SIZE);
622		for (int i = 0; i < SIZE; ++i) {
623	<	assertEquals(SIZE-i, q.size());
623	>	assertEquals(SIZE - i, q.size());
624		q.pollFirst();
625		}
626		for (int i = 0; i < SIZE; ++i) {
#	Line 652 | Line 633 | public class ConcurrentSkipListSubSetTes
633		* add(null) throws NPE
634		*/
635		public void testDescendingAddNull() {
636	<	try {
637	<	NavigableSet q = dset0();
636	>	NavigableSet q = dset0();
637	>	try {
638		q.add(null);
639		shouldThrow();
640	<	} catch (NullPointerException success) { }
640	>	} catch (NullPointerException success) {}
641		}
642
643		/**
#	Line 680 | Line 661 | public class ConcurrentSkipListSubSetTes
661		* Add of non-Comparable throws CCE
662		*/
663		public void testDescendingAddNonComparable() {
664	+	NavigableSet q = dset0();
665		try {
684	–	NavigableSet q = dset0();
685	–	q.add(new Object());
666		q.add(new Object());
667		q.add(new Object());
668		shouldThrow();
669	<	}
690	<	catch (ClassCastException success) {}
669	>	} catch (ClassCastException success) {}
670		}
671
693	–
672		/**
673		* addAll(null) throws NPE
674		*/
675		public void testDescendingAddAll1() {
676	+	NavigableSet q = dset0();
677		try {
699	–	NavigableSet q = dset0();
678		q.addAll(null);
679		shouldThrow();
680	<	}
703	<	catch (NullPointerException success) {}
680	>	} catch (NullPointerException success) {}
681		}
682	+
683		/**
684		* addAll of a collection with null elements throws NPE
685		*/
686		public void testDescendingAddAll2() {
687	+	NavigableSet q = dset0();
688	+	Integer[] ints = new Integer[SIZE];
689		try {
710	–	NavigableSet q = dset0();
711	–	Integer[] ints = new Integer[SIZE];
690		q.addAll(Arrays.asList(ints));
691		shouldThrow();
692	<	}
715	<	catch (NullPointerException success) {}
692	>	} catch (NullPointerException success) {}
693		}
694	+
695		/**
696		* addAll of a collection with any null elements throws NPE after
697		* possibly adding some elements
698		*/
699		public void testDescendingAddAll3() {
700	+	NavigableSet q = dset0();
701	+	Integer[] ints = new Integer[SIZE];
702	+	for (int i = 0; i < SIZE - 1; ++i)
703	+	ints[i] = new Integer(i + SIZE);
704		try {
723	–	NavigableSet q = dset0();
724	–	Integer[] ints = new Integer[SIZE];
725	–	for (int i = 0; i < SIZE-1; ++i)
726	–	ints[i] = new Integer(i+SIZE);
705		q.addAll(Arrays.asList(ints));
706		shouldThrow();
707	<	}
730	<	catch (NullPointerException success) {}
707	>	} catch (NullPointerException success) {}
708		}
709
710		/**
711		* Set contains all elements of successful addAll
712		*/
713		public void testDescendingAddAll5() {
714	<	try {
715	<	Integer[] empty = new Integer[0];
716	<	Integer[] ints = new Integer[SIZE];
717	<	for (int i = 0; i < SIZE; ++i)
718	<	ints[i] = new Integer(SIZE-1- i);
719	<	NavigableSet q = dset0();
720	<	assertFalse(q.addAll(Arrays.asList(empty)));
721	<	assertTrue(q.addAll(Arrays.asList(ints)));
722	<	for (int i = 0; i < SIZE; ++i)
746	<	assertEquals(new Integer(i), q.pollFirst());
747	<	}
748	<	finally {}
714	>	Integer[] empty = new Integer[0];
715	>	Integer[] ints = new Integer[SIZE];
716	>	for (int i = 0; i < SIZE; ++i)
717	>	ints[i] = new Integer(SIZE - 1 - i);
718	>	NavigableSet q = dset0();
719	>	assertFalse(q.addAll(Arrays.asList(empty)));
720	>	assertTrue(q.addAll(Arrays.asList(ints)));
721	>	for (int i = 0; i < SIZE; ++i)
722	>	assertEquals(new Integer(i), q.pollFirst());
723		}
724
725		/**
#	Line 754 | Line 728 | public class ConcurrentSkipListSubSetTes
728		public void testDescendingPoll() {
729		NavigableSet q = populatedSet(SIZE);
730		for (int i = 0; i < SIZE; ++i) {
731	<	assertEquals(i, ((Integer)q.pollFirst()).intValue());
731	>	assertEquals(i, q.pollFirst());
732		}
733	<	assertNull(q.pollFirst());
733	>	assertNull(q.pollFirst());
734		}
735
736		/**
#	Line 764 | Line 738 | public class ConcurrentSkipListSubSetTes
738		*/
739		public void testDescendingRemoveElement() {
740		NavigableSet q = populatedSet(SIZE);
741	<	for (int i = 1; i < SIZE; i+=2) {
741	>	for (int i = 1; i < SIZE; i += 2) {
742		assertTrue(q.remove(new Integer(i)));
743		}
744	<	for (int i = 0; i < SIZE; i+=2) {
744	>	for (int i = 0; i < SIZE; i += 2 ) {
745		assertTrue(q.remove(new Integer(i)));
746	<	assertFalse(q.remove(new Integer(i+1)));
746	>	assertFalse(q.remove(new Integer(i + 1)));
747		}
748		assertTrue(q.isEmpty());
749		}
#	Line 828 | Line 802 | public class ConcurrentSkipListSubSetTes
802		assertTrue(changed);
803
804		assertTrue(q.containsAll(p));
805	<	assertEquals(SIZE-i, q.size());
805	>	assertEquals(SIZE - i, q.size());
806		p.pollFirst();
807		}
808		}
#	Line 841 | Line 815 | public class ConcurrentSkipListSubSetTes
815		NavigableSet q = populatedSet(SIZE);
816		NavigableSet p = populatedSet(i);
817		assertTrue(q.removeAll(p));
818	<	assertEquals(SIZE-i, q.size());
818	>	assertEquals(SIZE - i, q.size());
819		for (int j = 0; j < i; ++j) {
820	<	Integer I = (Integer)(p.pollFirst());
821	<	assertFalse(q.contains(I));
820	>	Integer x = (Integer)(p.pollFirst());
821	>	assertFalse(q.contains(x));
822		}
823		}
824		}
825
852	–
853	–
826		/**
827		* lower returns preceding element
828		*/
#	Line 867 | Line 839 | public class ConcurrentSkipListSubSetTes
839
840		Object e4 = q.lower(zero);
841		assertNull(e4);
870	–
842		}
843
844		/**
#	Line 886 | Line 857 | public class ConcurrentSkipListSubSetTes
857
858		Object e4 = q.higher(m6);
859		assertNull(e4);
889	–
860		}
861
862		/**
#	Line 905 | Line 875 | public class ConcurrentSkipListSubSetTes
875
876		Object e4 = q.floor(zero);
877		assertNull(e4);
908	–
878		}
879
880		/**
#	Line 924 | Line 893 | public class ConcurrentSkipListSubSetTes
893
894		Object e4 = q.ceiling(m6);
895		assertNull(e4);
927	–
896		}
897
898		/**
#	Line 932 | Line 900 | public class ConcurrentSkipListSubSetTes
900		*/
901		public void testDescendingToArray() {
902		NavigableSet q = populatedSet(SIZE);
903	<	Object[] o = q.toArray();
903	>	Object[] o = q.toArray();
904		Arrays.sort(o);
905	<	for (int i = 0; i < o.length; i++)
906	<	assertEquals(o[i], q.pollFirst());
905	>	for (int i = 0; i < o.length; i++)
906	>	assertEquals(o[i], q.pollFirst());
907		}
908
909		/**
#	Line 943 | Line 911 | public class ConcurrentSkipListSubSetTes
911		*/
912		public void testDescendingToArray2() {
913		NavigableSet q = populatedSet(SIZE);
914	<	Integer[] ints = new Integer[SIZE];
915	<	ints = (Integer[])q.toArray(ints);
914	>	Integer[] ints = new Integer[SIZE];
915	>	assertSame(ints, q.toArray(ints));
916		Arrays.sort(ints);
917		for (int i = 0; i < ints.length; i++)
918		assertEquals(ints[i], q.pollFirst());
#	Line 956 | Line 924 | public class ConcurrentSkipListSubSetTes
924		public void testDescendingIterator() {
925		NavigableSet q = populatedSet(SIZE);
926		int i = 0;
927	<	Iterator it = q.iterator();
927	>	Iterator it = q.iterator();
928		while (it.hasNext()) {
929		assertTrue(q.contains(it.next()));
930		++i;
#	Line 970 | Line 938 | public class ConcurrentSkipListSubSetTes
938		public void testDescendingEmptyIterator() {
939		NavigableSet q = dset0();
940		int i = 0;
941	<	Iterator it = q.iterator();
941	>	Iterator it = q.iterator();
942		while (it.hasNext()) {
943		assertTrue(q.contains(it.next()));
944		++i;
945		}
946	<	assertEquals(i, 0);
946	>	assertEquals(0, i);
947		}
948
949		/**
950		* iterator.remove removes current element
951		*/
952	<	public void testDescendingIteratorRemove () {
952	>	public void testDescendingIteratorRemove() {
953		final NavigableSet q = dset0();
954		q.add(new Integer(2));
955		q.add(new Integer(1));
#	Line 997 | Line 965 | public class ConcurrentSkipListSubSetTes
965		assertFalse(it.hasNext());
966		}
967
1000	–
968		/**
969		* toString contains toStrings of elements
970		*/
#	Line 1005 | Line 972 | public class ConcurrentSkipListSubSetTes
972		NavigableSet q = populatedSet(SIZE);
973		String s = q.toString();
974		for (int i = 0; i < SIZE; ++i) {
975	<	assertTrue(s.indexOf(String.valueOf(i)) >= 0);
975	>	assertTrue(s.contains(String.valueOf(i)));
976		}
977		}
978
979		/**
980	<	* A deserialized serialized set has same elements
980	>	* A deserialized/reserialized set equals original
981		*/
982	<	public void testDescendingSerialization() {
983	<	NavigableSet q = populatedSet(SIZE);
984	<	try {
985	<	ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
986	<	ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
987	<	out.writeObject(q);
988	<	out.close();
989	<
990	<	ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
991	<	ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
992	<	NavigableSet r = (NavigableSet)in.readObject();
1026	<	assertEquals(q.size(), r.size());
1027	<	while (!q.isEmpty())
1028	<	assertEquals(q.pollFirst(), r.pollFirst());
1029	<	} catch (Exception e) {
1030	<	e.printStackTrace();
1031	<	unexpectedException();
982	>	public void testDescendingSerialization() throws Exception {
983	>	NavigableSet x = dset5();
984	>	NavigableSet y = serialClone(x);
985	>
986	>	assertNotSame(y, x);
987	>	assertEquals(x.size(), y.size());
988	>	assertEquals(x, y);
989	>	assertEquals(y, x);
990	>	while (!x.isEmpty()) {
991	>	assertFalse(y.isEmpty());
992	>	assertEquals(x.pollFirst(), y.pollFirst());
993		}
994	+	assertTrue(y.isEmpty());
995		}
996
997		/**

Diff Legend

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