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.54 by jsr166, Wed Dec 31 16:44:02 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;
14 < import java.util.ArrayList;
8 > import junit.framework.*;
9   import java.util.Arrays;
10 + import java.util.ArrayList;
11   import java.util.Collection;
12   import java.util.Iterator;
13   import java.util.List;
14   import java.util.NoSuchElementException;
15 + import java.util.Queue;
16   import java.util.concurrent.BlockingQueue;
17   import java.util.concurrent.CountDownLatch;
18   import java.util.concurrent.Executors;
19   import java.util.concurrent.ExecutorService;
20   import java.util.concurrent.LinkedTransferQueue;
21   import static java.util.concurrent.TimeUnit.MILLISECONDS;
26 – import static java.util.concurrent.TimeUnit.NANOSECONDS;
27 – import junit.framework.Test;
28 – import junit.framework.TestSuite;
22  
23   @SuppressWarnings({"unchecked", "rawtypes"})
24   public class LinkedTransferQueueTest extends JSR166TestCase {
# Line 183 | Line 176 | public class LinkedTransferQueueTest ext
176      public void testPut() {
177          LinkedTransferQueue<Integer> q = new LinkedTransferQueue<Integer>();
178          for (int i = 0; i < SIZE; ++i) {
179 <            assertEquals(q.size(), i);
179 >            assertEquals(i, q.size());
180              q.put(i);
181              assertTrue(q.contains(i));
182          }
# Line 374 | Line 367 | public class LinkedTransferQueueTest ext
367      }
368  
369      /**
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 –    /**
370       * An add following remove(x) succeeds
371       */
372      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 649 | Line 621 | public class LinkedTransferQueueTest ext
621       * A deserialized serialized queue has same elements in same order
622       */
623      public void testSerialization() throws Exception {
624 <        LinkedTransferQueue q = populatedQueue(SIZE);
624 >        Queue x = populatedQueue(SIZE);
625 >        Queue y = serialClone(x);
626  
627 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
628 <        ObjectOutputStream out
629 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
630 <        out.writeObject(q);
631 <        out.close();
632 <
633 <        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());
627 >        assertNotSame(y, x);
628 >        assertEquals(x.size(), y.size());
629 >        assertEquals(x.toString(), y.toString());
630 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
631 >        while (!x.isEmpty()) {
632 >            assertFalse(y.isEmpty());
633 >            assertEquals(x.remove(), y.remove());
634          }
635 +        assertTrue(y.isEmpty());
636      }
637  
638      /**
# Line 678 | Line 642 | public class LinkedTransferQueueTest ext
642          LinkedTransferQueue q = populatedQueue(SIZE);
643          ArrayList l = new ArrayList();
644          q.drainTo(l);
645 <        assertEquals(q.size(), 0);
646 <        assertEquals(l.size(), SIZE);
645 >        assertEquals(0, q.size());
646 >        assertEquals(SIZE, l.size());
647          for (int i = 0; i < SIZE; ++i) {
648 <            assertEquals(l.get(i), i);
648 >            assertEquals(i, l.get(i));
649          }
650          q.add(zero);
651          q.add(one);
# Line 690 | Line 654 | public class LinkedTransferQueueTest ext
654          assertTrue(q.contains(one));
655          l.clear();
656          q.drainTo(l);
657 <        assertEquals(q.size(), 0);
658 <        assertEquals(l.size(), 2);
657 >        assertEquals(0, q.size());
658 >        assertEquals(2, l.size());
659          for (int i = 0; i < 2; ++i) {
660 <            assertEquals(l.get(i), i);
660 >            assertEquals(i, l.get(i));
661          }
662      }
663  
# Line 709 | Line 673 | public class LinkedTransferQueueTest ext
673          ArrayList l = new ArrayList();
674          q.drainTo(l);
675          assertTrue(l.size() >= SIZE);
676 <        for (int i = 0; i < SIZE; ++i) {
677 <            assertEquals(l.get(i), i);
714 <        }
676 >        for (int i = 0; i < SIZE; ++i)
677 >            assertEquals(i, l.get(i));
678          awaitTermination(t, MEDIUM_DELAY_MS);
679          assertTrue(q.size() + l.size() >= SIZE);
680      }
# Line 728 | Line 691 | public class LinkedTransferQueueTest ext
691              ArrayList l = new ArrayList();
692              q.drainTo(l, i);
693              int k = (i < SIZE) ? i : SIZE;
694 <            assertEquals(l.size(), k);
695 <            assertEquals(q.size(), SIZE - k);
696 <            for (int j = 0; j < k; ++j) {
697 <                assertEquals(l.get(j), j);
735 <            }
694 >            assertEquals(k, l.size());
695 >            assertEquals(SIZE - k, q.size());
696 >            for (int j = 0; j < k; ++j)
697 >                assertEquals(j, l.get(j));
698              while (q.poll() != null)
699                  ;
700          }
# Line 744 | Line 706 | public class LinkedTransferQueueTest ext
706       */
707      public void testWaitingConsumer() throws InterruptedException {
708          final LinkedTransferQueue q = new LinkedTransferQueue();
709 <        assertEquals(q.getWaitingConsumerCount(), 0);
709 >        assertEquals(0, q.getWaitingConsumerCount());
710          assertFalse(q.hasWaitingConsumer());
711          final CountDownLatch threadStarted = new CountDownLatch(1);
712  
# Line 752 | Line 714 | public class LinkedTransferQueueTest ext
714              public void realRun() throws InterruptedException {
715                  threadStarted.countDown();
716                  assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
717 <                assertEquals(q.getWaitingConsumerCount(), 0);
717 >                assertEquals(0, q.getWaitingConsumerCount());
718                  assertFalse(q.hasWaitingConsumer());
719              }});
720  
721          threadStarted.await();
722          waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
723 <        assertEquals(q.getWaitingConsumerCount(), 1);
723 >        assertEquals(1, q.getWaitingConsumerCount());
724          assertTrue(q.hasWaitingConsumer());
725  
726          assertTrue(q.offer(one));
727 <        assertEquals(q.getWaitingConsumerCount(), 0);
727 >        assertEquals(0, q.getWaitingConsumerCount());
728          assertFalse(q.hasWaitingConsumer());
729  
730          awaitTermination(t, MEDIUM_DELAY_MS);
# Line 1050 | Line 1012 | public class LinkedTransferQueueTest ext
1012          assertFalse(q.isEmpty());
1013          return q;
1014      }
1015 +
1016 +    /**
1017 +     * remove(null), contains(null) always return false
1018 +     */
1019 +    public void testNeverContainsNull() {
1020 +        Collection<?>[] qs = {
1021 +            new LinkedTransferQueue<Object>(),
1022 +            populatedQueue(2),
1023 +        };
1024 +
1025 +        for (Collection<?> q : qs) {
1026 +            assertFalse(q.contains(null));
1027 +            assertFalse(q.remove(null));
1028 +        }
1029 +    }
1030   }

Diff Legend

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