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.47 by jsr166, Mon May 30 22:43:20 2011 UTC vs.
Revision 1.56 by jsr166, Wed Dec 31 19:21:20 2014 UTC

# Line 5 | Line 5
5   * Other contributors include John Vint
6   */
7  
8 < import java.io.BufferedInputStream;
9 < import java.io.BufferedOutputStream;
10 < import java.io.ByteArrayInputStream;
11 < import java.io.ByteArrayOutputStream;
12 < import java.io.ObjectInputStream;
13 < import java.io.ObjectOutputStream;
8 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
9 >
10   import java.util.ArrayList;
11   import java.util.Arrays;
12   import java.util.Collection;
13   import java.util.Iterator;
14   import java.util.List;
15   import java.util.NoSuchElementException;
16 + import java.util.Queue;
17   import java.util.concurrent.BlockingQueue;
18   import java.util.concurrent.CountDownLatch;
19   import java.util.concurrent.Executors;
20   import java.util.concurrent.ExecutorService;
21   import java.util.concurrent.LinkedTransferQueue;
22 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
26 < import static java.util.concurrent.TimeUnit.NANOSECONDS;
22 >
23   import junit.framework.Test;
28 – import junit.framework.TestSuite;
24  
25   @SuppressWarnings({"unchecked", "rawtypes"})
26   public class LinkedTransferQueueTest extends JSR166TestCase {
# Line 183 | Line 178 | public class LinkedTransferQueueTest ext
178      public void testPut() {
179          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
180          for (int i = 0; i < SIZE; ++i) {
181 <            assertEquals(q.size(), i);
181 >            assertEquals(i, q.size());
182              q.put(i);
183              assertTrue(q.contains(i));
184          }
# Line 374 | Line 369 | public class LinkedTransferQueueTest ext
369      }
370  
371      /**
377 –     * remove(x) removes x and returns true if present
378 –     */
379 –    public void testRemoveElement() throws InterruptedException {
380 –        LinkedTransferQueue q = populatedQueue(SIZE);
381 –        for (int i = 1; i < SIZE; i+=2) {
382 –            assertTrue(q.contains(i));
383 –            assertTrue(q.remove(i));
384 –            assertFalse(q.contains(i));
385 –            assertTrue(q.contains(i-1));
386 –        }
387 –        for (int i = 0; i < SIZE; i+=2) {
388 –            assertTrue(q.contains(i));
389 –            assertTrue(q.remove(i));
390 –            assertFalse(q.contains(i));
391 –            assertFalse(q.remove(i+1));
392 –            assertFalse(q.contains(i+1));
393 –        }
394 –        checkEmpty(q);
395 –    }
396 –
397 –    /**
372       * An add following remove(x) succeeds
373       */
374      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 649 | Line 623 | public class LinkedTransferQueueTest ext
623       * A deserialized serialized queue has same elements in same order
624       */
625      public void testSerialization() throws Exception {
626 <        LinkedTransferQueue q = populatedQueue(SIZE);
626 >        Queue x = populatedQueue(SIZE);
627 >        Queue y = serialClone(x);
628  
629 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
630 <        ObjectOutputStream out
631 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
632 <        out.writeObject(q);
633 <        out.close();
634 <
635 <        ByteArrayInputStream bin
661 <            = new ByteArrayInputStream(bout.toByteArray());
662 <        ObjectInputStream in
663 <            = new ObjectInputStream(new BufferedInputStream(bin));
664 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
665 <
666 <        assertEquals(q.size(), r.size());
667 <        assertEquals(q.toString(), r.toString());
668 <        assertTrue(Arrays.equals(q.toArray(), r.toArray()));
669 <        while (!q.isEmpty()) {
670 <            assertEquals(q.remove(), r.remove());
629 >        assertNotSame(y, x);
630 >        assertEquals(x.size(), y.size());
631 >        assertEquals(x.toString(), y.toString());
632 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
633 >        while (!x.isEmpty()) {
634 >            assertFalse(y.isEmpty());
635 >            assertEquals(x.remove(), y.remove());
636          }
637 +        assertTrue(y.isEmpty());
638      }
639  
640      /**
# Line 678 | Line 644 | public class LinkedTransferQueueTest ext
644          LinkedTransferQueue q = populatedQueue(SIZE);
645          ArrayList l = new ArrayList();
646          q.drainTo(l);
647 <        assertEquals(q.size(), 0);
648 <        assertEquals(l.size(), SIZE);
647 >        assertEquals(0, q.size());
648 >        assertEquals(SIZE, l.size());
649          for (int i = 0; i < SIZE; ++i) {
650 <            assertEquals(l.get(i), i);
650 >            assertEquals(i, l.get(i));
651          }
652          q.add(zero);
653          q.add(one);
# Line 690 | Line 656 | public class LinkedTransferQueueTest ext
656          assertTrue(q.contains(one));
657          l.clear();
658          q.drainTo(l);
659 <        assertEquals(q.size(), 0);
660 <        assertEquals(l.size(), 2);
659 >        assertEquals(0, q.size());
660 >        assertEquals(2, l.size());
661          for (int i = 0; i < 2; ++i) {
662 <            assertEquals(l.get(i), i);
662 >            assertEquals(i, l.get(i));
663          }
664      }
665  
# Line 709 | Line 675 | public class LinkedTransferQueueTest ext
675          ArrayList l = new ArrayList();
676          q.drainTo(l);
677          assertTrue(l.size() >= SIZE);
678 <        for (int i = 0; i < SIZE; ++i) {
679 <            assertEquals(l.get(i), i);
714 <        }
678 >        for (int i = 0; i < SIZE; ++i)
679 >            assertEquals(i, l.get(i));
680          awaitTermination(t, MEDIUM_DELAY_MS);
681          assertTrue(q.size() + l.size() >= SIZE);
682      }
# Line 728 | Line 693 | public class LinkedTransferQueueTest ext
693              ArrayList l = new ArrayList();
694              q.drainTo(l, i);
695              int k = (i < SIZE) ? i : SIZE;
696 <            assertEquals(l.size(), k);
697 <            assertEquals(q.size(), SIZE - k);
698 <            for (int j = 0; j < k; ++j) {
699 <                assertEquals(l.get(j), j);
700 <            }
736 <            while (q.poll() != null)
737 <                ;
696 >            assertEquals(k, l.size());
697 >            assertEquals(SIZE - k, q.size());
698 >            for (int j = 0; j < k; ++j)
699 >                assertEquals(j, l.get(j));
700 >            do {} while (q.poll() != null);
701          }
702      }
703  
# Line 744 | Line 707 | public class LinkedTransferQueueTest ext
707       */
708      public void testWaitingConsumer() throws InterruptedException {
709          final LinkedTransferQueue q = new LinkedTransferQueue();
710 <        assertEquals(q.getWaitingConsumerCount(), 0);
710 >        assertEquals(0, q.getWaitingConsumerCount());
711          assertFalse(q.hasWaitingConsumer());
712          final CountDownLatch threadStarted = new CountDownLatch(1);
713  
# Line 752 | Line 715 | public class LinkedTransferQueueTest ext
715              public void realRun() throws InterruptedException {
716                  threadStarted.countDown();
717                  assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
718 <                assertEquals(q.getWaitingConsumerCount(), 0);
718 >                assertEquals(0, q.getWaitingConsumerCount());
719                  assertFalse(q.hasWaitingConsumer());
720              }});
721  
722          threadStarted.await();
723          waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
724 <        assertEquals(q.getWaitingConsumerCount(), 1);
724 >        assertEquals(1, q.getWaitingConsumerCount());
725          assertTrue(q.hasWaitingConsumer());
726  
727          assertTrue(q.offer(one));
728 <        assertEquals(q.getWaitingConsumerCount(), 0);
728 >        assertEquals(0, q.getWaitingConsumerCount());
729          assertFalse(q.hasWaitingConsumer());
730  
731          awaitTermination(t, MEDIUM_DELAY_MS);
# Line 1050 | Line 1013 | public class LinkedTransferQueueTest ext
1013          assertFalse(q.isEmpty());
1014          return q;
1015      }
1016 +
1017 +    /**
1018 +     * remove(null), contains(null) always return false
1019 +     */
1020 +    public void testNeverContainsNull() {
1021 +        Collection<?>[] qs = {
1022 +            new LinkedTransferQueue<Object>(),
1023 +            populatedQueue(2),
1024 +        };
1025 +
1026 +        for (Collection<?> q : qs) {
1027 +            assertFalse(q.contains(null));
1028 +            assertFalse(q.remove(null));
1029 +        }
1030 +    }
1031   }

Diff Legend

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