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.44 by jsr166, Tue Mar 15 19:47:06 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 254 | 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<Integer> q = populatedQueue(SIZE);
201 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
200 >        final BlockingQueue 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) {
205 <                    assertEquals(i, (int) q.take());
205 >                    assertEquals(i, q.take());
206                  }
207 <                aboutToWait.countDown();
207 >
208 >                Thread.currentThread().interrupt();
209                  try {
210                      q.take();
211                      shouldThrow();
212                  } catch (InterruptedException success) {}
213 +                assertFalse(Thread.interrupted());
214 +
215 +                pleaseInterrupt.countDown();
216 +                try {
217 +                    q.take();
218 +                    shouldThrow();
219 +                } catch (InterruptedException success) {}
220 +                assertFalse(Thread.interrupted());
221              }});
222  
223 <        aboutToWait.await();
224 <        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
223 >        await(pleaseInterrupt);
224 >        assertThreadStaysAlive(t);
225          t.interrupt();
226 <        awaitTermination(t, MEDIUM_DELAY_MS);
275 <        checkEmpty(q);
226 >        awaitTermination(t);
227      }
228  
229      /**
# Line 305 | Line 256 | public class LinkedTransferQueueTest ext
256      public void testTimedPoll() throws InterruptedException {
257          LinkedTransferQueue<Integer> q = populatedQueue(SIZE);
258          for (int i = 0; i < SIZE; ++i) {
259 <            long t0 = System.nanoTime();
260 <            assertEquals(i, (int) q.poll(SMALL_DELAY_MS, MILLISECONDS));
261 <            assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
262 <        }
263 <        long t0 = System.nanoTime();
264 <        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
265 <        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
259 >            long startTime = System.nanoTime();
260 >            assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
261 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
262 >        }
263 >        long startTime = System.nanoTime();
264 >        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
265 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
266          checkEmpty(q);
267      }
268  
# Line 417 | Line 368 | public class LinkedTransferQueueTest ext
368      }
369  
370      /**
420     * remove(x) removes x and returns true if present
421     */
422    public void testRemoveElement() throws InterruptedException {
423        LinkedTransferQueue q = populatedQueue(SIZE);
424        for (int i = 1; i < SIZE; i+=2) {
425            assertTrue(q.contains(i));
426            assertTrue(q.remove(i));
427            assertFalse(q.contains(i));
428            assertTrue(q.contains(i-1));
429        }
430        for (int i = 0; i < SIZE; i+=2) {
431            assertTrue(q.contains(i));
432            assertTrue(q.remove(i));
433            assertFalse(q.contains(i));
434            assertFalse(q.remove(i+1));
435            assertFalse(q.contains(i+1));
436        }
437        checkEmpty(q);
438    }
439
440    /**
371       * An add following remove(x) succeeds
372       */
373      public void testRemoveElementAndAdd() throws InterruptedException {
# Line 553 | Line 483 | public class LinkedTransferQueueTest ext
483      }
484  
485      /**
556     * toArray(null) throws NullPointerException
557     */
558    public void testToArray_NullArg() {
559        LinkedTransferQueue q = populatedQueue(SIZE);
560        try {
561            q.toArray(null);
562            shouldThrow();
563        } catch (NullPointerException success) {}
564    }
565
566    /**
486       * toArray(incompatible array type) throws ArrayStoreException
487       */
488      public void testToArray1_BadArg() {
# Line 646 | Line 565 | public class LinkedTransferQueueTest ext
565          LinkedTransferQueue q = populatedQueue(SIZE);
566          String s = q.toString();
567          for (int i = 0; i < SIZE; ++i) {
568 <            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
568 >            assertTrue(s.contains(String.valueOf(i)));
569          }
570      }
571  
# Line 655 | Line 574 | public class LinkedTransferQueueTest ext
574       */
575      public void testOfferInExecutor() {
576          final LinkedTransferQueue q = new LinkedTransferQueue();
577 <        final CountDownLatch threadsStarted = new CountDownLatch(2);
577 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
578          ExecutorService executor = Executors.newFixedThreadPool(2);
579  
580          executor.execute(new CheckedRunnable() {
581              public void realRun() throws InterruptedException {
663                threadsStarted.countDown();
582                  threadsStarted.await();
583 <                assertTrue(q.offer(one, MEDIUM_DELAY_MS, MILLISECONDS));
583 >                assertTrue(q.offer(one, LONG_DELAY_MS, MILLISECONDS));
584              }});
585  
586          executor.execute(new CheckedRunnable() {
587              public void realRun() throws InterruptedException {
670                threadsStarted.countDown();
588                  threadsStarted.await();
589                  assertSame(one, q.take());
590                  checkEmpty(q);
# Line 681 | Line 598 | public class LinkedTransferQueueTest ext
598       */
599      public void testPollInExecutor() {
600          final LinkedTransferQueue q = new LinkedTransferQueue();
601 <        final CountDownLatch threadsStarted = new CountDownLatch(2);
601 >        final CheckedBarrier threadsStarted = new CheckedBarrier(2);
602          ExecutorService executor = Executors.newFixedThreadPool(2);
603  
604          executor.execute(new CheckedRunnable() {
605              public void realRun() throws InterruptedException {
606                  assertNull(q.poll());
690                threadsStarted.countDown();
607                  threadsStarted.await();
608 <                assertSame(one, q.poll(SMALL_DELAY_MS, MILLISECONDS));
608 >                assertSame(one, q.poll(LONG_DELAY_MS, MILLISECONDS));
609                  checkEmpty(q);
610              }});
611  
612          executor.execute(new CheckedRunnable() {
613              public void realRun() throws InterruptedException {
698                threadsStarted.countDown();
614                  threadsStarted.await();
615                  q.put(one);
616              }});
# Line 707 | 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);
626 <
712 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
713 <        ObjectOutputStream out
714 <            = new ObjectOutputStream(new BufferedOutputStream(bout));
715 <        out.writeObject(q);
716 <        out.close();
717 <
718 <        ByteArrayInputStream bin
719 <            = new ByteArrayInputStream(bout.toByteArray());
720 <        ObjectInputStream in
721 <            = new ObjectInputStream(new BufferedInputStream(bin));
722 <        LinkedTransferQueue r = (LinkedTransferQueue) in.readObject();
625 >        Queue x = populatedQueue(SIZE);
626 >        Queue y = serialClone(x);
627  
628 <        assertEquals(q.size(), r.size());
629 <        assertEquals(q.toString(), r.toString());
630 <        assertTrue(Arrays.equals(q.toArray(), r.toArray()));
631 <        while (!q.isEmpty()) {
632 <            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 <    }
731 <
732 <    /**
733 <     * drainTo(null) throws NullPointerException
734 <     */
735 <    public void testDrainToNull() {
736 <        LinkedTransferQueue q = populatedQueue(SIZE);
737 <        try {
738 <            q.drainTo(null);
739 <            shouldThrow();
740 <        } catch (NullPointerException success) {}
741 <    }
742 <
743 <    /**
744 <     * drainTo(this) throws IllegalArgumentException
745 <     */
746 <    public void testDrainToSelf() {
747 <        LinkedTransferQueue q = populatedQueue(SIZE);
748 <        try {
749 <            q.drainTo(q);
750 <            shouldThrow();
751 <        } catch (IllegalArgumentException success) {}
636 >        assertTrue(y.isEmpty());
637      }
638  
639      /**
# Line 758 | 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 770 | 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 797 | Line 682 | public class LinkedTransferQueueTest ext
682      }
683  
684      /**
800     * drainTo(null, n) throws NullPointerException
801     */
802    public void testDrainToNullN() {
803        LinkedTransferQueue q = populatedQueue(SIZE);
804        try {
805            q.drainTo(null, SIZE);
806            shouldThrow();
807        } catch (NullPointerException success) {}
808    }
809
810    /**
811     * drainTo(this, n) throws IllegalArgumentException
812     */
813    public void testDrainToSelfN() {
814        LinkedTransferQueue q = populatedQueue(SIZE);
815        try {
816            q.drainTo(q, SIZE);
817            shouldThrow();
818        } catch (IllegalArgumentException success) {}
819    }
820
821    /**
685       * drainTo(c, n) empties first min(n, size) elements of queue into c
686       */
687      public void testDrainToN() {
# Line 846 | 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 854 | 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);
# Line 1051 | Line 914 | public class LinkedTransferQueueTest ext
914      }
915  
916      /**
917 <     * tryTransfer waits the amount given, and throws
1055 <     * InterruptedException when interrupted.
917 >     * tryTransfer blocks interruptibly if no takers
918       */
919      public void testTryTransfer5() throws InterruptedException {
920          final LinkedTransferQueue q = new LinkedTransferQueue();
921 <        final CountDownLatch threadStarted = new CountDownLatch(1);
921 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
922          assertTrue(q.isEmpty());
923  
924          Thread t = newStartedThread(new CheckedRunnable() {
925              public void realRun() throws InterruptedException {
926 <                long t0 = System.nanoTime();
1065 <                threadStarted.countDown();
926 >                Thread.currentThread().interrupt();
927                  try {
928                      q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
929                      shouldThrow();
930                  } catch (InterruptedException success) {}
931 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
932 <                assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
931 >                assertFalse(Thread.interrupted());
932 >
933 >                pleaseInterrupt.countDown();
934 >                try {
935 >                    q.tryTransfer(new Object(), LONG_DELAY_MS, MILLISECONDS);
936 >                    shouldThrow();
937 >                } catch (InterruptedException success) {}
938 >                assertFalse(Thread.interrupted());
939              }});
940  
941 <        threadStarted.await();
942 <        while (q.isEmpty())
1076 <            Thread.yield();
1077 <        Thread.sleep(SHORT_DELAY_MS);
941 >        await(pleaseInterrupt);
942 >        assertThreadStaysAlive(t);
943          t.interrupt();
944 <        awaitTermination(t, MEDIUM_DELAY_MS);
944 >        awaitTermination(t);
945          checkEmpty(q);
946      }
947  
# Line 1090 | Line 955 | public class LinkedTransferQueueTest ext
955              public void realRun() throws InterruptedException {
956                  long t0 = System.nanoTime();
957                  assertFalse(q.tryTransfer(new Object(),
958 <                                          SHORT_DELAY_MS, MILLISECONDS));
959 <                assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
958 >                                          timeoutMillis(), MILLISECONDS));
959 >                assertTrue(millisElapsedSince(t0) >= timeoutMillis());
960                  checkEmpty(q);
961              }});
962  
963 <        awaitTermination(t, MEDIUM_DELAY_MS);
963 >        awaitTermination(t);
964          checkEmpty(q);
965      }
966  
# Line 1131 | Line 996 | public class LinkedTransferQueueTest ext
996          assertTrue(q.offer(four));
997          assertEquals(1, q.size());
998          long t0 = System.nanoTime();
999 <        assertFalse(q.tryTransfer(five, SHORT_DELAY_MS, MILLISECONDS));
1000 <        assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS);
999 >        assertFalse(q.tryTransfer(five, timeoutMillis(), MILLISECONDS));
1000 >        assertTrue(millisElapsedSince(t0) >= timeoutMillis());
1001          assertEquals(1, q.size());
1002          assertSame(four, q.poll());
1003          assertNull(q.poll());

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines