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

Comparing jsr166/src/test/tck/SynchronousQueueTest.java (file contents):
Revision 1.36 by jsr166, Sat May 28 13:40:20 2011 UTC vs.
Revision 1.41 by jsr166, Thu Dec 8 19:09:58 2011 UTC

# Line 7 | Line 7
7   */
8  
9   import junit.framework.*;
10 < import java.util.*;
11 < import java.util.concurrent.*;
10 > import java.util.Arrays;
11 > import java.util.ArrayList;
12 > import java.util.Collection;
13 > import java.util.Iterator;
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.SynchronousQueue;
21   import static java.util.concurrent.TimeUnit.MILLISECONDS;
13 – import java.io.*;
22  
23   public class SynchronousQueueTest extends JSR166TestCase {
24  
# Line 50 | Line 58 | public class SynchronousQueueTest extend
58      }
59  
60      /**
53 –     * offer(null) throws NullPointerException
54 –     */
55 –    public void testOfferNull()      { testOfferNull(false); }
56 –    public void testOfferNull_fair() { testOfferNull(true); }
57 –    public void testOfferNull(boolean fair) {
58 –        SynchronousQueue q = new SynchronousQueue(fair);
59 –        try {
60 –            q.offer(null);
61 –            shouldThrow();
62 –        } catch (NullPointerException success) {}
63 –    }
64 –
65 –    /**
66 –     * add(null) throws NullPointerException
67 –     */
68 –    public void testAddNull()      { testAddNull(false); }
69 –    public void testAddNull_fair() { testAddNull(true); }
70 –    public void testAddNull(boolean fair) {
71 –        SynchronousQueue q = new SynchronousQueue(fair);
72 –        try {
73 –            q.add(null);
74 –            shouldThrow();
75 –        } catch (NullPointerException success) {}
76 –    }
77 –
78 –    /**
61       * offer fails if no active taker
62       */
63      public void testOffer()      { testOffer(false); }
# Line 100 | Line 82 | public class SynchronousQueueTest extend
82      }
83  
84      /**
103 –     * addAll(null) throws NullPointerException
104 –     */
105 –    public void testAddAll_null()      { testAddAll_null(false); }
106 –    public void testAddAll_null_fair() { testAddAll_null(true); }
107 –    public void testAddAll_null(boolean fair) {
108 –        SynchronousQueue q = new SynchronousQueue(fair);
109 –        try {
110 –            q.addAll(null);
111 –            shouldThrow();
112 –        } catch (NullPointerException success) {}
113 –    }
114 –
115 –    /**
85       * addAll(this) throws IllegalArgumentException
86       */
87      public void testAddAll_self()      { testAddAll_self(false); }
# Line 126 | Line 95 | public class SynchronousQueueTest extend
95      }
96  
97      /**
129 –     * addAll of a collection with null elements throws NullPointerException
130 –     */
131 –    public void testAddAll_null2()      { testAddAll_null2(false); }
132 –    public void testAddAll_null2_fair() { testAddAll_null2(true); }
133 –    public void testAddAll_null2(boolean fair) {
134 –        SynchronousQueue q = new SynchronousQueue(fair);
135 –        Collection<Integer> ints = Arrays.asList(new Integer[1]);
136 –        try {
137 –            q.addAll(ints);
138 –            shouldThrow();
139 –        } catch (NullPointerException success) {}
140 –    }
141 –
142 –    /**
98       * addAll throws ISE if no active taker
99       */
100      public void testAddAll_ISE()      { testAddAll_ISE(false); }
# Line 157 | Line 112 | public class SynchronousQueueTest extend
112      }
113  
114      /**
160 –     * put(null) throws NPE
161 –     */
162 –    public void testPutNull() throws InterruptedException {
163 –        try {
164 –            SynchronousQueue q = new SynchronousQueue();
165 –            q.put(null);
166 –            shouldThrow();
167 –        } catch (NullPointerException success) {}
168 –    }
169 –
170 –    /**
115       * put blocks interruptibly if no active taker
116       */
117      public void testBlockingPut()      { testBlockingPut(false); }
# Line 222 | Line 166 | public class SynchronousQueueTest extend
166              }});
167  
168          await(pleaseTake);
169 <        assertEquals(q.remainingCapacity(), 0);
169 >        assertEquals(0, q.remainingCapacity());
170          try { assertSame(one, q.take()); }
171          catch (InterruptedException e) { threadUnexpectedException(e); }
172  
# Line 230 | Line 174 | public class SynchronousQueueTest extend
174          assertThreadStaysAlive(t);
175          t.interrupt();
176          awaitTermination(t);
177 <        assertEquals(q.remainingCapacity(), 0);
177 >        assertEquals(0, q.remainingCapacity());
178      }
179  
180      /**
# Line 378 | Line 322 | public class SynchronousQueueTest extend
322      }
323  
324      /**
381 –     * remove(x) returns false
382 –     */
383 –    public void testRemoveElement()      { testRemoveElement(false); }
384 –    public void testRemoveElement_fair() { testRemoveElement(true); }
385 –    public void testRemoveElement(boolean fair) {
386 –        final SynchronousQueue q = new SynchronousQueue(fair);
387 –        assertFalse(q.remove(zero));
388 –        assertTrue(q.isEmpty());
389 –    }
390 –
391 –    /**
325       * contains returns false
326       */
327      public void testContains()      { testContains(false); }
# Line 456 | Line 389 | public class SynchronousQueueTest extend
389      public void testToArray(boolean fair) {
390          final SynchronousQueue q = new SynchronousQueue(fair);
391          Object[] o = q.toArray();
392 <        assertEquals(o.length, 0);
392 >        assertEquals(0, o.length);
393      }
394  
395      /**
396 <     * toArray(a) is nulled at position 0
396 >     * toArray(Integer array) returns its argument with the first
397 >     * element (if present) nulled out
398       */
399      public void testToArray2()      { testToArray2(false); }
400      public void testToArray2_fair() { testToArray2(true); }
401      public void testToArray2(boolean fair) {
402 <        final SynchronousQueue q = new SynchronousQueue(fair);
403 <        Integer[] ints = new Integer[1];
404 <        assertNull(ints[0]);
402 >        final SynchronousQueue<Integer> q
403 >            = new SynchronousQueue<Integer>(fair);
404 >        Integer[] a;
405 >
406 >        a = new Integer[0];
407 >        assertSame(a, q.toArray(a));
408 >
409 >        a = new Integer[3];
410 >        Arrays.fill(a, 42);
411 >        assertSame(a, q.toArray(a));
412 >        assertNull(a[0]);
413 >        for (int i = 1; i < a.length; i++)
414 >            assertEquals(42, (int) a[i]);
415      }
416  
417      /**
# Line 579 | Line 523 | public class SynchronousQueueTest extend
523      /**
524       * a deserialized serialized queue is usable
525       */
526 <    public void testSerialization()      { testSerialization(false); }
527 <    public void testSerialization_fair() { testSerialization(true); }
528 <    public void testSerialization(boolean fair) {
529 <        final SynchronousQueue q = new SynchronousQueue(fair);
530 <        final SynchronousQueue r = serialClone(q);
531 <        assertTrue(q != r);
532 <        assertEquals(q.size(), r.size());
533 <        while (!q.isEmpty())
534 <            assertEquals(q.remove(), r.remove());
535 <    }
536 <
537 <    /**
538 <     * drainTo(null) throws NPE
539 <     */
540 <    public void testDrainToNull()      { testDrainToNull(false); }
541 <    public void testDrainToNull_fair() { testDrainToNull(true); }
598 <    public void testDrainToNull(boolean fair) {
599 <        final SynchronousQueue q = new SynchronousQueue(fair);
600 <        try {
601 <            q.drainTo(null);
602 <            shouldThrow();
603 <        } catch (NullPointerException success) {}
604 <    }
605 <
606 <    /**
607 <     * drainTo(this) throws IAE
608 <     */
609 <    public void testDrainToSelf()      { testDrainToSelf(false); }
610 <    public void testDrainToSelf_fair() { testDrainToSelf(true); }
611 <    public void testDrainToSelf(boolean fair) {
612 <        final SynchronousQueue q = new SynchronousQueue(fair);
613 <        try {
614 <            q.drainTo(q);
615 <            shouldThrow();
616 <        } catch (IllegalArgumentException success) {}
526 >    public void testSerialization() {
527 >        final SynchronousQueue x = new SynchronousQueue();
528 >        final SynchronousQueue y = new SynchronousQueue(false);
529 >        final SynchronousQueue z = new SynchronousQueue(true);
530 >        assertSerialEquals(x, y);
531 >        assertNotSerialEquals(x, z);
532 >        SynchronousQueue[] qs = { x, y, z };
533 >        for (SynchronousQueue q : qs) {
534 >            SynchronousQueue clone = serialClone(q);
535 >            assertNotSame(q, clone);
536 >            assertSerialEquals(q, clone);
537 >            assertTrue(clone.isEmpty());
538 >            assertEquals(0, clone.size());
539 >            assertEquals(0, clone.remainingCapacity());
540 >            assertFalse(clone.offer(zero));
541 >        }
542      }
543  
544      /**
# Line 625 | Line 550 | public class SynchronousQueueTest extend
550          final SynchronousQueue q = new SynchronousQueue(fair);
551          ArrayList l = new ArrayList();
552          q.drainTo(l);
553 <        assertEquals(q.size(), 0);
554 <        assertEquals(l.size(), 0);
553 >        assertEquals(0, q.size());
554 >        assertEquals(0, l.size());
555      }
556  
557      /**
# Line 655 | Line 580 | public class SynchronousQueueTest extend
580      }
581  
582      /**
658 –     * drainTo(null, n) throws NullPointerException
659 –     */
660 –    public void testDrainToNullN()      { testDrainToNullN(false); }
661 –    public void testDrainToNullN_fair() { testDrainToNullN(true); }
662 –    public void testDrainToNullN(boolean fair) {
663 –        final SynchronousQueue q = new SynchronousQueue(fair);
664 –        try {
665 –            q.drainTo(null, 0);
666 –            shouldThrow();
667 –        } catch (NullPointerException success) {}
668 –    }
669 –
670 –    /**
671 –     * drainTo(this, n) throws IllegalArgumentException
672 –     */
673 –    public void testDrainToSelfN()      { testDrainToSelfN(false); }
674 –    public void testDrainToSelfN_fair() { testDrainToSelfN(true); }
675 –    public void testDrainToSelfN(boolean fair) {
676 –        final SynchronousQueue q = new SynchronousQueue(fair);
677 –        try {
678 –            q.drainTo(q, 0);
679 –            shouldThrow();
680 –        } catch (IllegalArgumentException success) {}
681 –    }
682 –
683 –    /**
583       * drainTo(c, n) empties up to n elements of queue into c
584       */
585      public void testDrainToN() throws InterruptedException {

Diff Legend

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