--- jsr166/src/test/tck/LinkedBlockingQueueTest.java	2021/01/26 13:33:06	1.82
+++ jsr166/src/test/tck/LinkedBlockingQueueTest.java	2021/01/27 01:57:24	1.83
@@ -129,7 +129,7 @@ public class LinkedBlockingQueueTest ext
      */
     public void testConstructor6() {
         Item[] items = defaultItems;
-        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>(Arrays.asList(items));
+        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(Arrays.asList(items));
         for (int i = 0; i < SIZE; ++i)
             mustEqual(items[i], q.poll());
     }
@@ -138,7 +138,7 @@ public class LinkedBlockingQueueTest ext
      * Queue transitions from empty to full when elements added
      */
     public void testEmptyFull() {
-        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>(2);
+        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(2);
         assertTrue(q.isEmpty());
         mustEqual(2, q.remainingCapacity());
         q.add(one);
@@ -170,7 +170,7 @@ public class LinkedBlockingQueueTest ext
      * Offer succeeds if not full; fails if full
      */
     public void testOffer() {
-        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>(1);
+        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(1);
         assertTrue(q.offer(zero));
         assertFalse(q.offer(one));
     }
@@ -179,7 +179,7 @@ public class LinkedBlockingQueueTest ext
      * add succeeds if not full; throws IllegalStateException if full
      */
     public void testAdd() {
-        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>(SIZE);
+        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(SIZE);
         for (int i = 0; i < SIZE; ++i)
             mustAdd(q, i);
         mustEqual(0, q.remainingCapacity());
@@ -205,7 +205,7 @@ public class LinkedBlockingQueueTest ext
      * possibly adding some elements
      */
     public void testAddAll3() {
-        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>(SIZE);
+        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(SIZE);
         Item[] items = new Item[2]; items[0] = zero;
         Collection<Item> elements = Arrays.asList(items);
         try {
@@ -218,7 +218,7 @@ public class LinkedBlockingQueueTest ext
      * addAll throws IllegalStateException if not enough room
      */
     public void testAddAll4() {
-        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>(SIZE - 1);
+        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(SIZE - 1);
         Item[] items = defaultItems;
         Collection<Item> elements = Arrays.asList(items);
         try {
@@ -233,7 +233,7 @@ public class LinkedBlockingQueueTest ext
     public void testAddAll5() {
         Item[] empty = new Item[0];
         Item[] items = defaultItems;
-        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>(SIZE);
+        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(SIZE);
         assertFalse(q.addAll(Arrays.asList(empty)));
         assertTrue(q.addAll(Arrays.asList(items)));
         for (int i = 0; i < SIZE; ++i)
@@ -244,7 +244,7 @@ public class LinkedBlockingQueueTest ext
      * all elements successfully put are contained
      */
     public void testPut() throws InterruptedException {
-        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>(SIZE);
+        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             Item x = itemFor(i);
             q.put(x);
@@ -257,7 +257,7 @@ public class LinkedBlockingQueueTest ext
      * put blocks interruptibly if full
      */
     public void testBlockingPut() throws InterruptedException {
-        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>(SIZE);
+        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(SIZE);
         final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
         Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
@@ -294,7 +294,7 @@ public class LinkedBlockingQueueTest ext
      */
     public void testPutWithTake() throws InterruptedException {
         final int capacity = 2;
-        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>(2);
+        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(2);
         final CountDownLatch pleaseTake = new CountDownLatch(1);
         final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
         Thread t = newStartedThread(new CheckedRunnable() {
@@ -334,7 +334,7 @@ public class LinkedBlockingQueueTest ext
      * timed offer times out if full and elements not taken
      */
     public void testTimedOffer() {
-        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>(2);
+        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(2);
         final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
         Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
@@ -526,7 +526,7 @@ public class LinkedBlockingQueueTest ext
      * An add following remove(x) succeeds
      */
     public void testRemoveElementAndAdd() throws InterruptedException {
-        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>();
+        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>();
         assertTrue(q.add(one));
         assertTrue(q.add(two));
         mustRemove(q, one);
@@ -568,7 +568,7 @@ public class LinkedBlockingQueueTest ext
      */
     public void testContainsAll() {
         LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
-        LinkedBlockingQueue<Item> p = new LinkedBlockingQueue<Item>(SIZE);
+        LinkedBlockingQueue<Item> p = new LinkedBlockingQueue<>(SIZE);
         for (int i = 0; i < SIZE; ++i) {
             assertTrue(q.containsAll(p));
             assertFalse(p.containsAll(q));
@@ -677,7 +677,7 @@ public class LinkedBlockingQueueTest ext
      * iterator.remove removes current element
      */
     public void testIteratorRemove() {
-        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>(3);
+        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(3);
         q.add(two);
         q.add(one);
         q.add(three);
@@ -696,7 +696,7 @@ public class LinkedBlockingQueueTest ext
      * iterator ordering is FIFO
      */
     public void testIteratorOrdering() {
-        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>(3);
+        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(3);
         q.add(one);
         q.add(two);
         q.add(three);
@@ -712,7 +712,7 @@ public class LinkedBlockingQueueTest ext
      * Modifications do not cause iterators to fail
      */
     public void testWeaklyConsistentIteration() {
-        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>(3);
+        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(3);
         q.add(one);
         q.add(two);
         q.add(three);
@@ -738,7 +738,7 @@ public class LinkedBlockingQueueTest ext
      * offer transfers elements across Executor tasks
      */
     public void testOfferInExecutor() {
-        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>(2);
+        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(2);
         q.add(one);
         q.add(two);
         final CheckedBarrier threadsStarted = new CheckedBarrier(2);
@@ -764,7 +764,7 @@ public class LinkedBlockingQueueTest ext
      * timed poll retrieves elements across Executor threads
      */
     public void testPollInExecutor() {
-        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>(2);
+        final LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>(2);
         final CheckedBarrier threadsStarted = new CheckedBarrier(2);
         final ExecutorService executor = Executors.newFixedThreadPool(2);
         try (PoolCleaner cleaner = cleaner(executor)) {
@@ -807,7 +807,7 @@ public class LinkedBlockingQueueTest ext
      */
     public void testDrainTo() {
         LinkedBlockingQueue<Item> q = populatedQueue(SIZE);
-        ArrayList<Item> l = new ArrayList<Item>();
+        ArrayList<Item> l = new ArrayList<>();
         q.drainTo(l);
         mustEqual(0, q.size());
         mustEqual(SIZE, l.size());
@@ -837,7 +837,7 @@ public class LinkedBlockingQueueTest ext
             }});
 
         t.start();
-        ArrayList<Item> l = new ArrayList<Item>();
+        ArrayList<Item> l = new ArrayList<>();
         q.drainTo(l);
         assertTrue(l.size() >= SIZE);
         for (int i = 0; i < SIZE; ++i)
@@ -850,11 +850,11 @@ public class LinkedBlockingQueueTest ext
      * drainTo(c, n) empties first min(n, size) elements of queue into c
      */
     public void testDrainToN() {
-        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<Item>();
+        LinkedBlockingQueue<Item> q = new LinkedBlockingQueue<>();
         for (int i = 0; i < SIZE + 2; ++i) {
             for (int j = 0; j < SIZE; j++)
                 mustOffer(q, j);
-            ArrayList<Item> l = new ArrayList<Item>();
+            ArrayList<Item> l = new ArrayList<>();
             q.drainTo(l, i);
             int k = (i < SIZE) ? i : SIZE;
             mustEqual(k, l.size());
@@ -870,7 +870,7 @@ public class LinkedBlockingQueueTest ext
      */
     public void testNeverContainsNull() {
         Collection<?>[] qs = {
-            new LinkedBlockingQueue<Object>(),
+            new LinkedBlockingQueue<>(),
             populatedQueue(2),
         };