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.34 by jsr166, Sun May 24 01:42:14 2015 UTC vs.
Revision 1.39 by jsr166, Mon May 28 21:19:50 2018 UTC

#	Line 30 | Line 30 | public class ConcurrentSkipListSubSetTes
30
31		/**
32		* Returns a new set of given size containing consecutive
33	<	* Integers 0 ... n.
33	>	* Integers 0 ... n - 1.
34		*/
35	<	private NavigableSet<Integer> populatedSet(int n) {
36	<	ConcurrentSkipListSet<Integer> q =
37	<	new ConcurrentSkipListSet<Integer>();
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)
#	Line 52 | Line 51 | public class ConcurrentSkipListSubSetTes
51		/**
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 70 | Line 69 | public class ConcurrentSkipListSubSetTes
69		/**
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 408 | Line 407 | public class ConcurrentSkipListSubSetTes
407		*/
408		public void testToArray() {
409		NavigableSet q = populatedSet(SIZE);
410	<	Object[] o = q.toArray();
411	<	for (int i = 0; i < o.length; i++)
412	<	assertSame(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		/**
#	Line 421 | Line 422 | public class ConcurrentSkipListSubSetTes
422		Integer[] ints = new Integer[SIZE];
423		Integer[] array = q.toArray(ints);
424		assertSame(ints, array);
425	<	for (int i = 0; i < ints.length; i++)
426	<	assertSame(ints[i], q.pollFirst());
425	>	for (Integer o : ints)
426	>	assertSame(o, q.pollFirst());
427	>	assertTrue(q.isEmpty());
428		}
429
430		/**
#	Line 476 | Line 478 | public class ConcurrentSkipListSubSetTes
478		}
479
480		/**
481	<	* A deserialized serialized set has same elements
481	>	* A deserialized/reserialized set equals original
482		*/
483		public void testSerialization() throws Exception {
484		NavigableSet x = populatedSet(SIZE);
#	Line 975 | Line 977 | public class ConcurrentSkipListSubSetTes
977		}
978
979		/**
980	<	* A deserialized serialized set has same elements
980	>	* A deserialized/reserialized set equals original
981		*/
982		public void testDescendingSerialization() throws Exception {
983		NavigableSet x = dset5();

Diff Legend

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