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.46 by jsr166, Fri May 27 20:07:24 2011 UTC vs.
Revision 1.50 by jsr166, Sat Nov 26 05:19:17 2011 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.concurrent.*;
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;
22   import static java.util.concurrent.TimeUnit.NANOSECONDS;
22 – import junit.framework.Test;
23 – import junit.framework.TestSuite;
23  
24   @SuppressWarnings({"unchecked", "rawtypes"})
25   public class LinkedTransferQueueTest extends JSR166TestCase {
# Line 65 | Line 64 | public class LinkedTransferQueueTest ext
64       * NullPointerException
65       */
66      public void testConstructor3() {
67 +        Collection<Integer> elements = Arrays.asList(new Integer[SIZE]);
68          try {
69 <            Integer[] ints = new Integer[SIZE];
70 <            new LinkedTransferQueue(Arrays.asList(ints));
69 >            new LinkedTransferQueue(elements);
70              shouldThrow();
71          } catch (NullPointerException success) {}
72      }
# Line 77 | Line 76 | public class LinkedTransferQueueTest ext
76       * throws NullPointerException
77       */
78      public void testConstructor4() {
79 +        Integer[] ints = new Integer[SIZE];
80 +        for (int i = 0; i < SIZE-1; ++i)
81 +            ints[i] = i;
82 +        Collection<Integer> elements = Arrays.asList(ints);
83          try {
84 <            Integer[] ints = new Integer[SIZE];
82 <            for (int i = 0; i < SIZE - 1; ++i) {
83 <                ints[i] = i;
84 <            }
85 <            new LinkedTransferQueue(Arrays.asList(ints));
84 >            new LinkedTransferQueue(elements);
85              shouldThrow();
86          } catch (NullPointerException success) {}
87      }
# Line 129 | Line 128 | public class LinkedTransferQueueTest ext
128      }
129  
130      /**
132 –     * offer(null) throws NullPointerException
133 –     */
134 –    public void testOfferNull() {
135 –        try {
136 –            LinkedTransferQueue q = new LinkedTransferQueue();
137 –            q.offer(null);
138 –            shouldThrow();
139 –        } catch (NullPointerException success) {}
140 –    }
141 –
142 –    /**
143 –     * add(null) throws NullPointerException
144 –     */
145 –    public void testAddNull() {
146 –        try {
147 –            LinkedTransferQueue q = new LinkedTransferQueue();
148 –            q.add(null);
149 –            shouldThrow();
150 –        } catch (NullPointerException success) {}
151 –    }
152 –
153 –    /**
154 –     * addAll(null) throws NullPointerException
155 –     */
156 –    public void testAddAll1() {
157 –        try {
158 –            LinkedTransferQueue q = new LinkedTransferQueue();
159 –            q.addAll(null);
160 –            shouldThrow();
161 –        } catch (NullPointerException success) {}
162 –    }
163 –
164 –    /**
131       * addAll(this) throws IllegalArgumentException
132       */
133      public void testAddAllSelf() {
# Line 173 | Line 139 | public class LinkedTransferQueueTest ext
139      }
140  
141      /**
176 –     * addAll of a collection with null elements throws NullPointerException
177 –     */
178 –    public void testAddAll2() {
179 –        try {
180 –            LinkedTransferQueue q = new LinkedTransferQueue();
181 –            Integer[] ints = new Integer[SIZE];
182 –            q.addAll(Arrays.asList(ints));
183 –            shouldThrow();
184 –        } catch (NullPointerException success) {}
185 –    }
186 –
187 –    /**
142       * addAll of a collection with any null elements throws
143       * NullPointerException after possibly adding some elements
144       */
# Line 218 | Line 172 | public class LinkedTransferQueueTest ext
172      }
173  
174      /**
221 –     * put(null) throws NullPointerException
222 –     */
223 –    public void testPutNull() throws InterruptedException {
224 –        try {
225 –            LinkedTransferQueue q = new LinkedTransferQueue();
226 –            q.put(null);
227 –            shouldThrow();
228 –        } catch (NullPointerException success) {}
229 –    }
230 –
231 –    /**
175       * all elements successfully put are contained
176       */
177      public void testPut() {
# Line 425 | Line 368 | public class LinkedTransferQueueTest ext
368      }
369  
370      /**
428 –     * remove(x) removes x and returns true if present
429 –     */
430 –    public void testRemoveElement() throws InterruptedException {
431 –        LinkedTransferQueue q = populatedQueue(SIZE);
432 –        for (int i = 1; i < SIZE; i+=2) {
433 –            assertTrue(q.contains(i));
434 –            assertTrue(q.remove(i));
435 –            assertFalse(q.contains(i));
436 –            assertTrue(q.contains(i-1));
437 –        }
438 –        for (int i = 0; i < SIZE; i+=2) {
439 –            assertTrue(q.contains(i));
440 –            assertTrue(q.remove(i));
441 –            assertFalse(q.contains(i));
442 –            assertFalse(q.remove(i+1));
443 –            assertFalse(q.contains(i+1));
444 –        }
445 –        checkEmpty(q);
446 –    }
447 –
448 –    /**
371       * An add following remove(x) succeeds
372       */
373      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 561 | Line 483 | public class LinkedTransferQueueTest ext
483      }
484  
485      /**
564 –     * toArray(null) throws NullPointerException
565 –     */
566 –    public void testToArray_NullArg() {
567 –        LinkedTransferQueue q = populatedQueue(SIZE);
568 –        try {
569 –            q.toArray(null);
570 –            shouldThrow();
571 –        } catch (NullPointerException success) {}
572 –    }
573 –
574 –    /**
486       * toArray(incompatible array type) throws ArrayStoreException
487       */
488      public void testToArray1_BadArg() {
# Line 711 | Line 622 | public class LinkedTransferQueueTest ext
622       * A deserialized serialized queue has same elements in same order
623       */
624      public void testSerialization() throws Exception {
625 <        LinkedTransferQueue q = populatedQueue(SIZE);
625 >        Queue x = populatedQueue(SIZE);
626 >        Queue y = serialClone(x);
627  
628 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
629 <        ObjectOutputStream out
630 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
631 <        out.writeObject(q);
632 <        out.close();
633 <
634 <        ByteArrayInputStream bin
723 <            = new ByteArrayInputStream(bout.toByteArray());
724 <        ObjectInputStream in
725 <            = new ObjectInputStream(new BufferedInputStream(bin));
726 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
727 <
728 <        assertEquals(q.size(), r.size());
729 <        assertEquals(q.toString(), r.toString());
730 <        assertTrue(Arrays.equals(q.toArray(), r.toArray()));
731 <        while (!q.isEmpty()) {
732 <            assertEquals(q.remove(), r.remove());
628 >        assertTrue(x != y);
629 >        assertEquals(x.size(), y.size());
630 >        assertEquals(x.toString(), y.toString());
631 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
632 >        while (!x.isEmpty()) {
633 >            assertFalse(y.isEmpty());
634 >            assertEquals(x.remove(), y.remove());
635          }
636 <    }
735 <
736 <    /**
737 <     * drainTo(null) throws NullPointerException
738 <     */
739 <    public void testDrainToNull() {
740 <        LinkedTransferQueue q = populatedQueue(SIZE);
741 <        try {
742 <            q.drainTo(null);
743 <            shouldThrow();
744 <        } catch (NullPointerException success) {}
745 <    }
746 <
747 <    /**
748 <     * drainTo(this) throws IllegalArgumentException
749 <     */
750 <    public void testDrainToSelf() {
751 <        LinkedTransferQueue q = populatedQueue(SIZE);
752 <        try {
753 <            q.drainTo(q);
754 <            shouldThrow();
755 <        } catch (IllegalArgumentException success) {}
636 >        assertTrue(y.isEmpty());
637      }
638  
639      /**
# Line 762 | Line 643 | public class LinkedTransferQueueTest ext
643          LinkedTransferQueue q = populatedQueue(SIZE);
644          ArrayList l = new ArrayList();
645          q.drainTo(l);
646 <        assertEquals(q.size(), 0);
647 <        assertEquals(l.size(), SIZE);
646 >        assertEquals(0, q.size());
647 >        assertEquals(SIZE, l.size());
648          for (int i = 0; i < SIZE; ++i) {
649              assertEquals(l.get(i), i);
650          }
# Line 774 | Line 655 | public class LinkedTransferQueueTest ext
655          assertTrue(q.contains(one));
656          l.clear();
657          q.drainTo(l);
658 <        assertEquals(q.size(), 0);
659 <        assertEquals(l.size(), 2);
658 >        assertEquals(0, q.size());
659 >        assertEquals(2, l.size());
660          for (int i = 0; i < 2; ++i) {
661              assertEquals(l.get(i), i);
662          }
# Line 801 | Line 682 | public class LinkedTransferQueueTest ext
682      }
683  
684      /**
804 –     * drainTo(null, n) throws NullPointerException
805 –     */
806 –    public void testDrainToNullN() {
807 –        LinkedTransferQueue q = populatedQueue(SIZE);
808 –        try {
809 –            q.drainTo(null, SIZE);
810 –            shouldThrow();
811 –        } catch (NullPointerException success) {}
812 –    }
813 –
814 –    /**
815 –     * drainTo(this, n) throws IllegalArgumentException
816 –     */
817 –    public void testDrainToSelfN() {
818 –        LinkedTransferQueue q = populatedQueue(SIZE);
819 –        try {
820 –            q.drainTo(q, SIZE);
821 –            shouldThrow();
822 –        } catch (IllegalArgumentException success) {}
823 –    }
824 –
825 –    /**
685       * drainTo(c, n) empties first min(n, size) elements of queue into c
686       */
687      public void testDrainToN() {
# Line 850 | Line 709 | public class LinkedTransferQueueTest ext
709       */
710      public void testWaitingConsumer() throws InterruptedException {
711          final LinkedTransferQueue q = new LinkedTransferQueue();
712 <        assertEquals(q.getWaitingConsumerCount(), 0);
712 >        assertEquals(0, q.getWaitingConsumerCount());
713          assertFalse(q.hasWaitingConsumer());
714          final CountDownLatch threadStarted = new CountDownLatch(1);
715  
# Line 858 | Line 717 | public class LinkedTransferQueueTest ext
717              public void realRun() throws InterruptedException {
718                  threadStarted.countDown();
719                  assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
720 <                assertEquals(q.getWaitingConsumerCount(), 0);
720 >                assertEquals(0, q.getWaitingConsumerCount());
721                  assertFalse(q.hasWaitingConsumer());
722              }});
723  
724          threadStarted.await();
725          waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
726 <        assertEquals(q.getWaitingConsumerCount(), 1);
726 >        assertEquals(1, q.getWaitingConsumerCount());
727          assertTrue(q.hasWaitingConsumer());
728  
729          assertTrue(q.offer(one));
730 <        assertEquals(q.getWaitingConsumerCount(), 0);
730 >        assertEquals(0, q.getWaitingConsumerCount());
731          assertFalse(q.hasWaitingConsumer());
732  
733          awaitTermination(t, MEDIUM_DELAY_MS);

Diff Legend

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