ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/LinkedTransferQueueTest.java
(Generate patch)

Comparing jsr166/src/test/tck/LinkedTransferQueueTest.java (file contents):
Revision 1.85 by jsr166, Fri Sep 6 22:47:02 2019 UTC vs.
Revision 1.86 by dl, Tue Jan 26 13:33:06 2021 UTC

# Line 39 | Line 39 | public class LinkedTransferQueueTest ext
39          class Implementation implements CollectionImplementation {
40              public Class<?> klazz() { return LinkedTransferQueue.class; }
41              public Collection emptyCollection() { return new LinkedTransferQueue(); }
42 <            public Object makeElement(int i) { return i; }
42 >            public Object makeElement(int i) { return JSR166TestCase.itemFor(i); }
43              public boolean isConcurrent() { return true; }
44              public boolean permitsNulls() { return false; }
45          }
# Line 53 | Line 53 | public class LinkedTransferQueueTest ext
53       * being true
54       */
55      public void testConstructor1() {
56 <        assertEquals(0, new LinkedTransferQueue().size());
56 >        mustEqual(0, new LinkedTransferQueue().size());
57          assertTrue(new LinkedTransferQueue().isEmpty());
58      }
59  
# Line 73 | Line 73 | public class LinkedTransferQueueTest ext
73       * NullPointerException
74       */
75      public void testConstructor3() {
76 <        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
76 >        Collection<Item> elements = Arrays.asList(new Item[SIZE]);
77          try {
78              new LinkedTransferQueue(elements);
79              shouldThrow();
# Line 85 | Line 85 | public class LinkedTransferQueueTest ext
85       * throws NullPointerException
86       */
87      public void testConstructor4() {
88 <        Integer[] ints = new Integer[SIZE];
89 <        for (int i = 0; i < SIZE - 1; ++i)
90 <            ints[i] = i;
91 <        Collection<Integer> elements = Arrays.asList(ints);
88 >        Item[] items = new Item[2];
89 >        items[0] = zero;
90 >        Collection<Item> elements = Arrays.asList(items);
91          try {
92              new LinkedTransferQueue(elements);
93              shouldThrow();
# Line 99 | Line 98 | public class LinkedTransferQueueTest ext
98       * Queue contains all elements of the collection it is initialized by
99       */
100      public void testConstructor5() {
101 <        Integer[] ints = new Integer[SIZE];
102 <        for (int i = 0; i < SIZE; ++i) {
103 <            ints[i] = i;
104 <        }
105 <        List intList = Arrays.asList(ints);
106 <        LinkedTransferQueue q
108 <            = new LinkedTransferQueue(intList);
109 <        assertEquals(q.size(), intList.size());
110 <        assertEquals(q.toString(), intList.toString());
101 >        Item[] items = defaultItems;
102 >        List<Item> intList = Arrays.asList(items);
103 >        LinkedTransferQueue<Item> q
104 >            = new LinkedTransferQueue<Item>(intList);
105 >        mustEqual(q.size(), intList.size());
106 >        mustEqual(q.toString(), intList.toString());
107          assertTrue(Arrays.equals(q.toArray(),
108                                       intList.toArray()));
109          assertTrue(Arrays.equals(q.toArray(new Object[0]),
# Line 115 | Line 111 | public class LinkedTransferQueueTest ext
111          assertTrue(Arrays.equals(q.toArray(new Object[SIZE]),
112                                   intList.toArray(new Object[SIZE])));
113          for (int i = 0; i < SIZE; ++i) {
114 <            assertEquals(ints[i], q.poll());
114 >            mustEqual(items[i], q.poll());
115          }
116      }
117  
# Line 123 | Line 119 | public class LinkedTransferQueueTest ext
119       * remainingCapacity() always returns Integer.MAX_VALUE
120       */
121      public void testRemainingCapacity() {
122 <        BlockingQueue q = populatedQueue(SIZE);
122 >        BlockingQueue<Item> q = populatedQueue(SIZE);
123          for (int i = 0; i < SIZE; ++i) {
124 <            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
125 <            assertEquals(SIZE - i, q.size());
126 <            assertEquals(i, q.remove());
124 >            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
125 >            mustEqual(SIZE - i, q.size());
126 >            mustEqual(i, q.remove());
127          }
128          for (int i = 0; i < SIZE; ++i) {
129 <            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
130 <            assertEquals(i, q.size());
131 <            assertTrue(q.add(i));
129 >            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
130 >            mustEqual(i, q.size());
131 >            mustAdd(q, i);
132          }
133      }
134  
# Line 140 | Line 136 | public class LinkedTransferQueueTest ext
136       * addAll(this) throws IllegalArgumentException
137       */
138      public void testAddAllSelf() {
139 <        LinkedTransferQueue q = populatedQueue(SIZE);
139 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
140          try {
141              q.addAll(q);
142              shouldThrow();
# Line 152 | Line 148 | public class LinkedTransferQueueTest ext
148       * NullPointerException after possibly adding some elements
149       */
150      public void testAddAll3() {
151 <        LinkedTransferQueue q = new LinkedTransferQueue();
152 <        Integer[] ints = new Integer[SIZE];
157 <        for (int i = 0; i < SIZE - 1; ++i)
158 <            ints[i] = i;
151 >        LinkedTransferQueue<Item> q = new LinkedTransferQueue<Item>();
152 >        Item[] items = new Item[2]; items[0] = zero;
153          try {
154 <            q.addAll(Arrays.asList(ints));
154 >            q.addAll(Arrays.asList(items));
155              shouldThrow();
156          } catch (NullPointerException success) {}
157      }
# Line 166 | Line 160 | public class LinkedTransferQueueTest ext
160       * Queue contains all elements, in traversal order, of successful addAll
161       */
162      public void testAddAll5() {
163 <        Integer[] empty = new Integer[0];
164 <        Integer[] ints = new Integer[SIZE];
171 <        for (int i = 0; i < SIZE; ++i) {
172 <            ints[i] = i;
173 <        }
163 >        Item[] empty = new Item[0];
164 >        Item[] items = defaultItems;
165          LinkedTransferQueue q = new LinkedTransferQueue();
166          assertFalse(q.addAll(Arrays.asList(empty)));
167 <        assertTrue(q.addAll(Arrays.asList(ints)));
167 >        assertTrue(q.addAll(Arrays.asList(items)));
168          for (int i = 0; i < SIZE; ++i) {
169 <            assertEquals(ints[i], q.poll());
169 >            mustEqual(items[i], q.poll());
170          }
171      }
172  
# Line 183 | Line 174 | public class LinkedTransferQueueTest ext
174       * all elements successfully put are contained
175       */
176      public void testPut() {
177 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
177 >        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
178 >        Item[] items = defaultItems;
179          for (int i = 0; i < SIZE; ++i) {
180 <            assertEquals(i, q.size());
181 <            q.put(i);
182 <            assertTrue(q.contains(i));
180 >            mustEqual(i, q.size());
181 >            q.put(items[i]);
182 >            mustContain(q, items[i]);
183          }
184      }
185  
# Line 195 | Line 187 | public class LinkedTransferQueueTest ext
187       * take retrieves elements in FIFO order
188       */
189      public void testTake() throws InterruptedException {
190 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
190 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
191          for (int i = 0; i < SIZE; ++i) {
192 <            assertEquals(i, (int) q.take());
192 >            mustEqual(i, q.take());
193          }
194      }
195  
# Line 205 | Line 197 | public class LinkedTransferQueueTest ext
197       * take removes existing elements until empty, then blocks interruptibly
198       */
199      public void testBlockingTake() throws InterruptedException {
200 <        final BlockingQueue q = populatedQueue(SIZE);
200 >        final BlockingQueue<Item> q = populatedQueue(SIZE);
201          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
202          Thread t = newStartedThread(new CheckedRunnable() {
203              public void realRun() throws InterruptedException {
204 <                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
204 >                for (int i = 0; i < SIZE; i++) mustEqual(i, q.take());
205  
206                  Thread.currentThread().interrupt();
207                  try {
# Line 236 | Line 228 | public class LinkedTransferQueueTest ext
228       * poll succeeds unless empty
229       */
230      public void testPoll() throws InterruptedException {
231 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
231 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
232          for (int i = 0; i < SIZE; ++i) {
233 <            assertEquals(i, (int) q.poll());
233 >            mustEqual(i, q.poll());
234          }
235          assertNull(q.poll());
236          checkEmpty(q);
# Line 248 | Line 240 | public class LinkedTransferQueueTest ext
240       * timed poll with zero timeout succeeds when non-empty, else times out
241       */
242      public void testTimedPoll0() throws InterruptedException {
243 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
243 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
244          for (int i = 0; i < SIZE; ++i) {
245 <            assertEquals(i, (int) q.poll(0, MILLISECONDS));
245 >            mustEqual(i, q.poll(0, MILLISECONDS));
246          }
247          assertNull(q.poll(0, MILLISECONDS));
248          checkEmpty(q);
# Line 260 | Line 252 | public class LinkedTransferQueueTest ext
252       * timed poll with nonzero timeout succeeds when non-empty, else times out
253       */
254      public void testTimedPoll() throws InterruptedException {
255 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
255 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
256          long startTime = System.nanoTime();
257          for (int i = 0; i < SIZE; ++i)
258 <            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
258 >            mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
259          assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
260  
261          startTime = System.nanoTime();
# Line 277 | Line 269 | public class LinkedTransferQueueTest ext
269       * returning timeout status
270       */
271      public void testInterruptedTimedPoll() throws InterruptedException {
272 <        final BlockingQueue<Integer> q = populatedQueue(SIZE);
272 >        final BlockingQueue<Item> q = populatedQueue(SIZE);
273          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
274          Thread t = newStartedThread(new CheckedRunnable() {
275              public void realRun() throws InterruptedException {
276                  for (int i = 0; i < SIZE; i++)
277 <                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
277 >                    mustEqual(i, q.poll(LONG_DELAY_MS, MILLISECONDS));
278  
279                  Thread.currentThread().interrupt();
280                  try {
# Line 311 | Line 303 | public class LinkedTransferQueueTest ext
303       * instead of returning timeout status
304       */
305      public void testTimedPollAfterInterrupt() throws InterruptedException {
306 <        final BlockingQueue<Integer> q = populatedQueue(SIZE);
306 >        final BlockingQueue<Item> q = populatedQueue(SIZE);
307          Thread t = newStartedThread(new CheckedRunnable() {
308              public void realRun() throws InterruptedException {
309                  Thread.currentThread().interrupt();
310                  for (int i = 0; i < SIZE; ++i)
311 <                    assertEquals(i, (int) q.poll(randomTimeout(), randomTimeUnit()));
311 >                    mustEqual(i, q.poll(randomTimeout(), randomTimeUnit()));
312                  try {
313                      q.poll(randomTimeout(), randomTimeUnit());
314                      shouldThrow();
# Line 332 | Line 324 | public class LinkedTransferQueueTest ext
324       * peek returns next element, or null if empty
325       */
326      public void testPeek() throws InterruptedException {
327 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
327 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
328          for (int i = 0; i < SIZE; ++i) {
329 <            assertEquals(i, (int) q.peek());
330 <            assertEquals(i, (int) q.poll());
329 >            mustEqual(i, q.peek());
330 >            mustEqual(i, q.poll());
331              assertTrue(q.peek() == null ||
332 <                       i != (int) q.peek());
332 >                       i != q.peek().value);
333          }
334          assertNull(q.peek());
335          checkEmpty(q);
# Line 347 | Line 339 | public class LinkedTransferQueueTest ext
339       * element returns next element, or throws NoSuchElementException if empty
340       */
341      public void testElement() throws InterruptedException {
342 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
342 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
343          for (int i = 0; i < SIZE; ++i) {
344 <            assertEquals(i, (int) q.element());
345 <            assertEquals(i, (int) q.poll());
344 >            mustEqual(i, q.element());
345 >            mustEqual(i, q.poll());
346          }
347          try {
348              q.element();
# Line 363 | Line 355 | public class LinkedTransferQueueTest ext
355       * remove removes next element, or throws NoSuchElementException if empty
356       */
357      public void testRemove() throws InterruptedException {
358 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
358 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
359          for (int i = 0; i < SIZE; ++i) {
360 <            assertEquals(i, (int) q.remove());
360 >            mustEqual(i, q.remove());
361          }
362          try {
363              q.remove();
# Line 378 | Line 370 | public class LinkedTransferQueueTest ext
370       * An add following remove(x) succeeds
371       */
372      public void testRemoveElementAndAdd() throws InterruptedException {
373 <        LinkedTransferQueue q = new LinkedTransferQueue();
374 <        assertTrue(q.add(one));
375 <        assertTrue(q.add(two));
376 <        assertTrue(q.remove(one));
377 <        assertTrue(q.remove(two));
378 <        assertTrue(q.add(three));
379 <        assertSame(q.take(), three);
373 >        LinkedTransferQueue<Item> q = new LinkedTransferQueue<Item>();
374 >        mustAdd(q, one);
375 >        mustAdd(q, two);
376 >        mustRemove(q, one);
377 >        mustRemove(q, two);
378 >        mustAdd(q, three);
379 >        mustEqual(q.take(), three);
380      }
381  
382      /**
383       * contains(x) reports true when elements added but not yet removed
384       */
385      public void testContains() {
386 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
386 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
387          for (int i = 0; i < SIZE; ++i) {
388 <            assertTrue(q.contains(i));
389 <            assertEquals(i, (int) q.poll());
390 <            assertFalse(q.contains(i));
388 >            mustContain(q, i);
389 >            mustEqual(i, q.poll());
390 >            mustNotContain(q, i);
391          }
392      }
393  
# Line 403 | Line 395 | public class LinkedTransferQueueTest ext
395       * clear removes all elements
396       */
397      public void testClear() throws InterruptedException {
398 <        LinkedTransferQueue q = populatedQueue(SIZE);
398 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
399          q.clear();
400          checkEmpty(q);
401 <        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
401 >        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
402          q.add(one);
403          assertFalse(q.isEmpty());
404 <        assertEquals(1, q.size());
405 <        assertTrue(q.contains(one));
404 >        mustEqual(1, q.size());
405 >        mustContain(q, one);
406          q.clear();
407          checkEmpty(q);
408      }
# Line 419 | Line 411 | public class LinkedTransferQueueTest ext
411       * containsAll(c) is true when c contains a subset of elements
412       */
413      public void testContainsAll() {
414 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
415 <        LinkedTransferQueue<Integer> p = new LinkedTransferQueue<>();
414 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
415 >        LinkedTransferQueue<Item> p = new LinkedTransferQueue<>();
416          for (int i = 0; i < SIZE; ++i) {
417              assertTrue(q.containsAll(p));
418              assertFalse(p.containsAll(q));
419 <            p.add(i);
419 >            mustAdd(p, i);
420          }
421          assertTrue(p.containsAll(q));
422      }
# Line 434 | Line 426 | public class LinkedTransferQueueTest ext
426       * if changed
427       */
428      public void testRetainAll() {
429 <        LinkedTransferQueue q = populatedQueue(SIZE);
430 <        LinkedTransferQueue p = populatedQueue(SIZE);
429 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
430 >        LinkedTransferQueue<Item> p = populatedQueue(SIZE);
431          for (int i = 0; i < SIZE; ++i) {
432              boolean changed = q.retainAll(p);
433              if (i == 0) {
# Line 444 | Line 436 | public class LinkedTransferQueueTest ext
436                  assertTrue(changed);
437              }
438              assertTrue(q.containsAll(p));
439 <            assertEquals(SIZE - i, q.size());
439 >            mustEqual(SIZE - i, q.size());
440              p.remove();
441          }
442      }
# Line 455 | Line 447 | public class LinkedTransferQueueTest ext
447       */
448      public void testRemoveAll() {
449          for (int i = 1; i < SIZE; ++i) {
450 <            LinkedTransferQueue q = populatedQueue(SIZE);
451 <            LinkedTransferQueue p = populatedQueue(i);
450 >            LinkedTransferQueue<Item> q = populatedQueue(SIZE);
451 >            LinkedTransferQueue<Item> p = populatedQueue(i);
452              assertTrue(q.removeAll(p));
453 <            assertEquals(SIZE - i, q.size());
453 >            mustEqual(SIZE - i, q.size());
454              for (int j = 0; j < i; ++j) {
455 <                assertFalse(q.contains(p.remove()));
455 >                mustNotContain(q, p.remove());
456              }
457          }
458      }
# Line 469 | Line 461 | public class LinkedTransferQueueTest ext
461       * toArray() contains all elements in FIFO order
462       */
463      public void testToArray() {
464 <        LinkedTransferQueue q = populatedQueue(SIZE);
464 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
465          Object[] a = q.toArray();
466          assertSame(Object[].class, a.getClass());
467          for (Object o : a)
# Line 481 | Line 473 | public class LinkedTransferQueueTest ext
473       * toArray(a) contains all elements in FIFO order
474       */
475      public void testToArray2() {
476 <        LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
477 <        Integer[] ints = new Integer[SIZE];
478 <        Integer[] array = q.toArray(ints);
479 <        assertSame(ints, array);
480 <        for (Integer o : ints)
476 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
477 >        Item[] items = new Item[SIZE];
478 >        Item[] array = q.toArray(items);
479 >        assertSame(items, array);
480 >        for (Item o : items)
481              assertSame(o, q.poll());
482          assertTrue(q.isEmpty());
483      }
# Line 494 | Line 486 | public class LinkedTransferQueueTest ext
486       * toArray(incompatible array type) throws ArrayStoreException
487       */
488      public void testToArray1_BadArg() {
489 <        LinkedTransferQueue q = populatedQueue(SIZE);
489 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
490          try {
491              q.toArray(new String[10]);
492              shouldThrow();
# Line 505 | Line 497 | public class LinkedTransferQueueTest ext
497       * iterator iterates through all elements
498       */
499      public void testIterator() throws InterruptedException {
500 <        LinkedTransferQueue q = populatedQueue(SIZE);
501 <        Iterator it = q.iterator();
500 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
501 >        Iterator<? extends Item> it = q.iterator();
502          int i;
503          for (i = 0; it.hasNext(); i++)
504 <            assertTrue(q.contains(it.next()));
505 <        assertEquals(i, SIZE);
504 >            mustContain(q, it.next());
505 >        mustEqual(i, SIZE);
506          assertIteratorExhausted(it);
507  
508          it = q.iterator();
509          for (i = 0; it.hasNext(); i++)
510 <            assertEquals(it.next(), q.take());
511 <        assertEquals(i, SIZE);
510 >            mustEqual(it.next(), q.take());
511 >        mustEqual(i, SIZE);
512          assertIteratorExhausted(it);
513      }
514  
# Line 531 | Line 523 | public class LinkedTransferQueueTest ext
523       * iterator.remove() removes current element
524       */
525      public void testIteratorRemove() {
526 <        final LinkedTransferQueue q = new LinkedTransferQueue();
526 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<Item>();
527          q.add(two);
528          q.add(one);
529          q.add(three);
530  
531 <        Iterator it = q.iterator();
531 >        Iterator<? extends Item> it = q.iterator();
532          it.next();
533          it.remove();
534  
# Line 550 | Line 542 | public class LinkedTransferQueueTest ext
542       * iterator ordering is FIFO
543       */
544      public void testIteratorOrdering() {
545 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
546 <        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
545 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
546 >        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
547          q.add(one);
548          q.add(two);
549          q.add(three);
550 <        assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
550 >        mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
551          int k = 0;
552 <        for (Integer n : q) {
553 <            assertEquals(++k, (int) n);
552 >        for (Item n : q) {
553 >            mustEqual(++k, n);
554          }
555 <        assertEquals(3, k);
555 >        mustEqual(3, k);
556      }
557  
558      /**
559       * Modifications do not cause iterators to fail
560       */
561      public void testWeaklyConsistentIteration() {
562 <        final LinkedTransferQueue q = new LinkedTransferQueue();
562 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<Item>();
563          q.add(one);
564          q.add(two);
565          q.add(three);
566 <        for (Iterator it = q.iterator(); it.hasNext();) {
566 >        for (Iterator<? extends Item> it = q.iterator(); it.hasNext();) {
567              q.remove();
568              it.next();
569          }
570 <        assertEquals(0, q.size());
570 >        mustEqual(0, q.size());
571      }
572  
573      /**
574       * toString contains toStrings of elements
575       */
576      public void testToString() {
577 <        LinkedTransferQueue q = populatedQueue(SIZE);
577 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
578          String s = q.toString();
579          for (int i = 0; i < SIZE; ++i) {
580              assertTrue(s.contains(String.valueOf(i)));
# Line 593 | Line 585 | public class LinkedTransferQueueTest ext
585       * offer transfers elements across Executor tasks
586       */
587      public void testOfferInExecutor() {
588 <        final LinkedTransferQueue q = new LinkedTransferQueue();
588 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<Item>();
589          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
590          final ExecutorService executor = Executors.newFixedThreadPool(2);
591          try (PoolCleaner cleaner = cleaner(executor)) {
# Line 619 | Line 611 | public class LinkedTransferQueueTest ext
611       * timed poll retrieves elements across Executor threads
612       */
613      public void testPollInExecutor() {
614 <        final LinkedTransferQueue q = new LinkedTransferQueue();
614 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<Item>();
615          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
616          final ExecutorService executor = Executors.newFixedThreadPool(2);
617          try (PoolCleaner cleaner = cleaner(executor)) {
# Line 646 | Line 638 | public class LinkedTransferQueueTest ext
638       * A deserialized/reserialized queue has same elements in same order
639       */
640      public void testSerialization() throws Exception {
641 <        Queue x = populatedQueue(SIZE);
642 <        Queue y = serialClone(x);
641 >        Queue<Item> x = populatedQueue(SIZE);
642 >        Queue<Item> y = serialClone(x);
643  
644          assertNotSame(y, x);
645 <        assertEquals(x.size(), y.size());
646 <        assertEquals(x.toString(), y.toString());
645 >        mustEqual(x.size(), y.size());
646 >        mustEqual(x.toString(), y.toString());
647          assertTrue(Arrays.equals(x.toArray(), y.toArray()));
648          while (!x.isEmpty()) {
649              assertFalse(y.isEmpty());
650 <            assertEquals(x.remove(), y.remove());
650 >            mustEqual(x.remove(), y.remove());
651          }
652          assertTrue(y.isEmpty());
653      }
# Line 664 | Line 656 | public class LinkedTransferQueueTest ext
656       * drainTo(c) empties queue into another collection c
657       */
658      public void testDrainTo() {
659 <        LinkedTransferQueue q = populatedQueue(SIZE);
659 >        LinkedTransferQueue<Item> q = populatedQueue(SIZE);
660          ArrayList l = new ArrayList();
661          q.drainTo(l);
662 <        assertEquals(0, q.size());
663 <        assertEquals(SIZE, l.size());
662 >        mustEqual(0, q.size());
663 >        mustEqual(SIZE, l.size());
664          for (int i = 0; i < SIZE; ++i) {
665 <            assertEquals(i, l.get(i));
665 >            mustEqual(i, l.get(i));
666          }
667          q.add(zero);
668          q.add(one);
669          assertFalse(q.isEmpty());
670 <        assertTrue(q.contains(zero));
671 <        assertTrue(q.contains(one));
670 >        mustContain(q, zero);
671 >        mustContain(q, one);
672          l.clear();
673          q.drainTo(l);
674 <        assertEquals(0, q.size());
675 <        assertEquals(2, l.size());
674 >        mustEqual(0, q.size());
675 >        mustEqual(2, l.size());
676          for (int i = 0; i < 2; ++i) {
677 <            assertEquals(i, l.get(i));
677 >            mustEqual(i, l.get(i));
678          }
679      }
680  
# Line 690 | Line 682 | public class LinkedTransferQueueTest ext
682       * drainTo(c) empties full queue, unblocking a waiting put.
683       */
684      public void testDrainToWithActivePut() throws InterruptedException {
685 <        final LinkedTransferQueue q = populatedQueue(SIZE);
685 >        final LinkedTransferQueue<Item> q = populatedQueue(SIZE);
686          Thread t = newStartedThread(new CheckedRunnable() {
687              public void realRun() {
688 <                q.put(SIZE + 1);
688 >                q.put(new Item(SIZE + 1));
689              }});
690          ArrayList l = new ArrayList();
691          q.drainTo(l);
692          assertTrue(l.size() >= SIZE);
693          for (int i = 0; i < SIZE; ++i)
694 <            assertEquals(i, l.get(i));
694 >            mustEqual(i, l.get(i));
695          awaitTermination(t);
696          assertTrue(q.size() + l.size() >= SIZE);
697      }
# Line 708 | Line 700 | public class LinkedTransferQueueTest ext
700       * drainTo(c, n) empties first min(n, size) elements of queue into c
701       */
702      public void testDrainToN() {
703 <        LinkedTransferQueue q = new LinkedTransferQueue();
703 >        LinkedTransferQueue<Item> q = new LinkedTransferQueue<Item>();
704          for (int i = 0; i < SIZE + 2; ++i) {
705              for (int j = 0; j < SIZE; j++) {
706 <                assertTrue(q.offer(j));
706 >                mustOffer(q, j);
707              }
708              ArrayList l = new ArrayList();
709              q.drainTo(l, i);
710              int k = (i < SIZE) ? i : SIZE;
711 <            assertEquals(k, l.size());
712 <            assertEquals(SIZE - k, q.size());
711 >            mustEqual(k, l.size());
712 >            mustEqual(SIZE - k, q.size());
713              for (int j = 0; j < k; ++j)
714 <                assertEquals(j, l.get(j));
714 >                mustEqual(j, l.get(j));
715              do {} while (q.poll() != null);
716          }
717      }
# Line 729 | Line 721 | public class LinkedTransferQueueTest ext
721       * offer(e) decrements the waiting consumer count
722       */
723      public void testWaitingConsumer() throws InterruptedException {
724 <        final LinkedTransferQueue q = new LinkedTransferQueue();
725 <        assertEquals(0, q.getWaitingConsumerCount());
724 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<Item>();
725 >        mustEqual(0, q.getWaitingConsumerCount());
726          assertFalse(q.hasWaitingConsumer());
727          final CountDownLatch threadStarted = new CountDownLatch(1);
728  
# Line 739 | Line 731 | public class LinkedTransferQueueTest ext
731                  threadStarted.countDown();
732                  long startTime = System.nanoTime();
733                  assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
734 <                assertEquals(0, q.getWaitingConsumerCount());
734 >                mustEqual(0, q.getWaitingConsumerCount());
735                  assertFalse(q.hasWaitingConsumer());
736                  assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
737              }});
# Line 752 | Line 744 | public class LinkedTransferQueueTest ext
744          waitForThreadToEnterWaitState(t, oneConsumer);
745  
746          assertTrue(q.offer(one));
747 <        assertEquals(0, q.getWaitingConsumerCount());
747 >        mustEqual(0, q.getWaitingConsumerCount());
748          assertFalse(q.hasWaitingConsumer());
749  
750          awaitTermination(t);
# Line 763 | Line 755 | public class LinkedTransferQueueTest ext
755       */
756      public void testTransfer1() throws InterruptedException {
757          try {
758 <            LinkedTransferQueue q = new LinkedTransferQueue();
758 >            LinkedTransferQueue<Item> q = new LinkedTransferQueue<Item>();
759              q.transfer(null);
760              shouldThrow();
761          } catch (NullPointerException success) {}
# Line 774 | Line 766 | public class LinkedTransferQueueTest ext
766       * is returned by the associated poll.
767       */
768      public void testTransfer2() throws InterruptedException {
769 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
769 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
770          final CountDownLatch threadStarted = new CountDownLatch(1);
771  
772          Thread t = newStartedThread(new CheckedRunnable() {
# Line 799 | Line 791 | public class LinkedTransferQueueTest ext
791       * transfer waits until a poll occurs, and then transfers in fifo order
792       */
793      public void testTransfer3() throws InterruptedException {
794 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
794 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
795  
796          Thread first = newStartedThread(new CheckedRunnable() {
797              public void realRun() throws InterruptedException {
798                  q.transfer(four);
799 <                assertFalse(q.contains(four));
800 <                assertEquals(1, q.size());
799 >                mustNotContain(q, four);
800 >                mustEqual(1, q.size());
801              }});
802  
803          Thread interruptedThread = newStartedThread(
# Line 818 | Line 810 | public class LinkedTransferQueueTest ext
810  
811          while (q.size() < 2)
812              Thread.yield();
813 <        assertEquals(2, q.size());
813 >        mustEqual(2, q.size());
814          assertSame(four, q.poll());
815          first.join();
816 <        assertEquals(1, q.size());
816 >        mustEqual(1, q.size());
817          interruptedThread.interrupt();
818          interruptedThread.join();
819          checkEmpty(q);
# Line 832 | Line 824 | public class LinkedTransferQueueTest ext
824       * thread returns the element
825       */
826      public void testTransfer4() throws InterruptedException {
827 <        final LinkedTransferQueue q = new LinkedTransferQueue();
827 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<Item>();
828  
829          Thread t = newStartedThread(new CheckedRunnable() {
830              public void realRun() throws InterruptedException {
831                  q.transfer(four);
832 <                assertFalse(q.contains(four));
832 >                mustNotContain(q, four);
833                  assertSame(three, q.poll());
834              }});
835  
836          while (q.isEmpty())
837              Thread.yield();
838          assertFalse(q.isEmpty());
839 <        assertEquals(1, q.size());
839 >        mustEqual(1, q.size());
840          assertTrue(q.offer(three));
841          assertSame(four, q.poll());
842          awaitTermination(t);
# Line 855 | Line 847 | public class LinkedTransferQueueTest ext
847       * is returned by the associated take.
848       */
849      public void testTransfer5() throws InterruptedException {
850 <        final LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
850 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
851  
852          Thread t = newStartedThread(new CheckedRunnable() {
853              public void realRun() throws InterruptedException {
# Line 866 | Line 858 | public class LinkedTransferQueueTest ext
858          while (q.isEmpty())
859              Thread.yield();
860          assertFalse(q.isEmpty());
861 <        assertEquals(1, q.size());
861 >        mustEqual(1, q.size());
862          assertSame(four, q.take());
863          checkEmpty(q);
864          awaitTermination(t);
# Line 876 | Line 868 | public class LinkedTransferQueueTest ext
868       * tryTransfer(null) throws NullPointerException
869       */
870      public void testTryTransfer1() {
871 <        final LinkedTransferQueue q = new LinkedTransferQueue();
871 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<Item>();
872          try {
873              q.tryTransfer(null);
874              shouldThrow();
# Line 888 | Line 880 | public class LinkedTransferQueueTest ext
880       * consumers waiting to poll or take.
881       */
882      public void testTryTransfer2() throws InterruptedException {
883 <        final LinkedTransferQueue q = new LinkedTransferQueue();
883 >        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<Object>();
884          assertFalse(q.tryTransfer(new Object()));
885          assertFalse(q.hasWaitingConsumer());
886          checkEmpty(q);
# Line 900 | Line 892 | public class LinkedTransferQueueTest ext
892       */
893      public void testTryTransfer3() throws InterruptedException {
894          final Object hotPotato = new Object();
895 <        final LinkedTransferQueue q = new LinkedTransferQueue();
895 >        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<Object>();
896  
897          Thread t = newStartedThread(new CheckedRunnable() {
898              public void realRun() {
# Line 924 | Line 916 | public class LinkedTransferQueueTest ext
916       */
917      public void testTryTransfer4() throws InterruptedException {
918          final Object hotPotato = new Object();
919 <        final LinkedTransferQueue q = new LinkedTransferQueue();
919 >        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<Object>();
920  
921          Thread t = newStartedThread(new CheckedRunnable() {
922              public void realRun() {
# Line 944 | Line 936 | public class LinkedTransferQueueTest ext
936       * tryTransfer blocks interruptibly if no takers
937       */
938      public void testTryTransfer5() throws InterruptedException {
939 <        final LinkedTransferQueue q = new LinkedTransferQueue();
939 >        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<Object>();
940          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
941          assertTrue(q.isEmpty());
942  
# Line 976 | Line 968 | public class LinkedTransferQueueTest ext
968       * tryTransfer gives up after the timeout and returns false
969       */
970      public void testTryTransfer6() throws InterruptedException {
971 <        final LinkedTransferQueue q = new LinkedTransferQueue();
971 >        final LinkedTransferQueue<Object> q = new LinkedTransferQueue<Object>();
972  
973          Thread t = newStartedThread(new CheckedRunnable() {
974              public void realRun() throws InterruptedException {
# Line 996 | Line 988 | public class LinkedTransferQueueTest ext
988       * before transfering to a poll or take
989       */
990      public void testTryTransfer7() throws InterruptedException {
991 <        final LinkedTransferQueue q = new LinkedTransferQueue();
991 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<Item>();
992          assertTrue(q.offer(four));
993  
994          Thread t = newStartedThread(new CheckedRunnable() {
# Line 1009 | Line 1001 | public class LinkedTransferQueueTest ext
1001  
1002          while (q.size() != 2)
1003              Thread.yield();
1004 <        assertEquals(2, q.size());
1004 >        mustEqual(2, q.size());
1005          assertSame(four, q.poll());
1006          assertSame(five, q.poll());
1007          checkEmpty(q);
# Line 1021 | Line 1013 | public class LinkedTransferQueueTest ext
1013       * returning false not enqueueing and the successive poll is null
1014       */
1015      public void testTryTransfer8() throws InterruptedException {
1016 <        final LinkedTransferQueue q = new LinkedTransferQueue();
1016 >        final LinkedTransferQueue<Item> q = new LinkedTransferQueue<Item>();
1017          assertTrue(q.offer(four));
1018 <        assertEquals(1, q.size());
1018 >        mustEqual(1, q.size());
1019          long startTime = System.nanoTime();
1020          assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1021          assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
1022 <        assertEquals(1, q.size());
1022 >        mustEqual(1, q.size());
1023          assertSame(four, q.poll());
1024          assertNull(q.poll());
1025          checkEmpty(q);
1026      }
1027  
1028 <    private LinkedTransferQueue<Integer> populatedQueue(int n) {
1029 <        LinkedTransferQueue<Integer> q = new LinkedTransferQueue<>();
1028 >    private LinkedTransferQueue<Item> populatedQueue(int n) {
1029 >        LinkedTransferQueue<Item> q = new LinkedTransferQueue<>();
1030          checkEmpty(q);
1031          for (int i = 0; i < n; i++) {
1032 <            assertEquals(i, q.size());
1033 <            assertTrue(q.offer(i));
1034 <            assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
1032 >            mustEqual(i, q.size());
1033 >            mustOffer(q, i);
1034 >            mustEqual(Integer.MAX_VALUE, q.remainingCapacity());
1035          }
1036          assertFalse(q.isEmpty());
1037          return q;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines