--- jsr166/src/test/tck/ConcurrentSkipListSetTest.java 2021/01/26 13:33:05 1.51 +++ jsr166/src/test/tck/ConcurrentSkipListSetTest.java 2021/01/27 01:57:24 1.52 @@ -54,7 +54,7 @@ public class ConcurrentSkipListSetTest e * Returns a new set of first 5 ints. */ private static ConcurrentSkipListSet set5() { - ConcurrentSkipListSet q = new ConcurrentSkipListSet(); + ConcurrentSkipListSet q = new ConcurrentSkipListSet<>(); assertTrue(q.isEmpty()); q.add(one); q.add(two); @@ -109,7 +109,7 @@ public class ConcurrentSkipListSetTest e */ public void testConstructor6() { Item[] items = defaultItems; - ConcurrentSkipListSet q = new ConcurrentSkipListSet(Arrays.asList(items)); + ConcurrentSkipListSet q = new ConcurrentSkipListSet<>(Arrays.asList(items)); for (int i = 0; i < SIZE; ++i) mustEqual(items[i], q.pollFirst()); } @@ -120,7 +120,7 @@ public class ConcurrentSkipListSetTest e public void testConstructor7() { MyReverseComparator cmp = new MyReverseComparator(); @SuppressWarnings("unchecked") - ConcurrentSkipListSet q = new ConcurrentSkipListSet(cmp); + ConcurrentSkipListSet q = new ConcurrentSkipListSet<>(cmp); mustEqual(cmp, q.comparator()); Item[] items = defaultItems; q.addAll(Arrays.asList(items)); @@ -132,7 +132,7 @@ public class ConcurrentSkipListSetTest e * isEmpty is true before add, false after */ public void testEmpty() { - ConcurrentSkipListSet q = new ConcurrentSkipListSet(); + ConcurrentSkipListSet q = new ConcurrentSkipListSet<>(); assertTrue(q.isEmpty()); mustAdd(q, one); assertFalse(q.isEmpty()); @@ -161,7 +161,7 @@ public class ConcurrentSkipListSetTest e * add(null) throws NPE */ public void testAddNull() { - ConcurrentSkipListSet q = new ConcurrentSkipListSet(); + ConcurrentSkipListSet q = new ConcurrentSkipListSet<>(); try { q.add(null); shouldThrow(); @@ -172,7 +172,7 @@ public class ConcurrentSkipListSetTest e * Add of comparable element succeeds */ public void testAdd() { - ConcurrentSkipListSet q = new ConcurrentSkipListSet(); + ConcurrentSkipListSet q = new ConcurrentSkipListSet<>(); assertTrue(q.add(zero)); assertTrue(q.add(one)); } @@ -181,7 +181,7 @@ public class ConcurrentSkipListSetTest e * Add of duplicate element fails */ public void testAddDup() { - ConcurrentSkipListSet q = new ConcurrentSkipListSet(); + ConcurrentSkipListSet q = new ConcurrentSkipListSet<>(); assertTrue(q.add(zero)); assertFalse(q.add(zero)); } @@ -190,7 +190,7 @@ public class ConcurrentSkipListSetTest e * Add of non-Comparable throws CCE */ public void testAddNonComparable() { - ConcurrentSkipListSet q = new ConcurrentSkipListSet(); + ConcurrentSkipListSet q = new ConcurrentSkipListSet<>(); try { q.add(new Object()); q.add(new Object()); @@ -209,7 +209,7 @@ public class ConcurrentSkipListSetTest e * addAll(null) throws NPE */ public void testAddAll1() { - ConcurrentSkipListSet q = new ConcurrentSkipListSet(); + ConcurrentSkipListSet q = new ConcurrentSkipListSet<>(); try { q.addAll(null); shouldThrow(); @@ -220,7 +220,7 @@ public class ConcurrentSkipListSetTest e * addAll of a collection with null elements throws NPE */ public void testAddAll2() { - ConcurrentSkipListSet q = new ConcurrentSkipListSet(); + ConcurrentSkipListSet q = new ConcurrentSkipListSet<>(); Item[] items = new Item[SIZE]; try { q.addAll(Arrays.asList(items)); @@ -233,7 +233,7 @@ public class ConcurrentSkipListSetTest e * possibly adding some elements */ public void testAddAll3() { - ConcurrentSkipListSet q = new ConcurrentSkipListSet(); + ConcurrentSkipListSet q = new ConcurrentSkipListSet<>(); Item[] items = new Item[2]; items[0] = zero; try { q.addAll(Arrays.asList(items)); @@ -247,7 +247,7 @@ public class ConcurrentSkipListSetTest e public void testAddAll5() { Item[] empty = new Item[0]; Item[] items = defaultItems; - ConcurrentSkipListSet q = new ConcurrentSkipListSet(); + ConcurrentSkipListSet q = new ConcurrentSkipListSet<>(); assertFalse(q.addAll(Arrays.asList(empty))); assertTrue(q.addAll(Arrays.asList(items))); for (int i = 0; i < SIZE; ++i) @@ -328,7 +328,7 @@ public class ConcurrentSkipListSetTest e */ public void testContainsAll() { ConcurrentSkipListSet q = populatedSet(SIZE); - ConcurrentSkipListSet p = new ConcurrentSkipListSet(); + ConcurrentSkipListSet p = new ConcurrentSkipListSet<>(); for (int i = 0; i < SIZE; ++i) { assertTrue(q.containsAll(p)); assertFalse(p.containsAll(q)); @@ -484,7 +484,7 @@ public class ConcurrentSkipListSetTest e * iterator of empty set has no elements */ public void testEmptyIterator() { - NavigableSet s = new ConcurrentSkipListSet(); + NavigableSet s = new ConcurrentSkipListSet<>(); assertIteratorExhausted(s.iterator()); assertIteratorExhausted(s.descendingSet().iterator()); } @@ -493,7 +493,7 @@ public class ConcurrentSkipListSetTest e * iterator.remove removes current element */ public void testIteratorRemove() { - final ConcurrentSkipListSet q = new ConcurrentSkipListSet(); + final ConcurrentSkipListSet q = new ConcurrentSkipListSet<>(); q.add(two); q.add(one); q.add(three); @@ -700,7 +700,7 @@ public class ConcurrentSkipListSetTest e */ public void testAddAll_idempotent() throws Exception { Set x = populatedSet(SIZE); - Set y = new ConcurrentSkipListSet(x); + Set y = new ConcurrentSkipListSet<>(x); y.addAll(x); mustEqual(x, y); mustEqual(y, x);