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

Comparing jsr166/src/test/tck/LinkedBlockingDequeTest.java (file contents):
Revision 1.40 by jsr166, Mon May 30 22:43:20 2011 UTC vs.
Revision 1.47 by jsr166, Tue Feb 21 02:04:17 2012 UTC

# Line 10 | Line 10 | import java.util.ArrayList;
10   import java.util.Collection;
11   import java.util.Iterator;
12   import java.util.NoSuchElementException;
13 + import java.util.Queue;
14   import java.util.concurrent.BlockingDeque;
15   import java.util.concurrent.BlockingQueue;
16   import java.util.concurrent.CountDownLatch;
# Line 17 | Line 18 | import java.util.concurrent.Executors;
18   import java.util.concurrent.ExecutorService;
19   import java.util.concurrent.LinkedBlockingDeque;
20   import static java.util.concurrent.TimeUnit.MILLISECONDS;
20 – import java.io.*;
21  
22   public class LinkedBlockingDequeTest extends JSR166TestCase {
23  
# Line 29 | Line 29 | public class LinkedBlockingDequeTest ext
29  
30      public static class Bounded extends BlockingQueueTest {
31          protected BlockingQueue emptyCollection() {
32 <            return new LinkedBlockingDeque(20);
32 >            return new LinkedBlockingDeque(SIZE);
33          }
34      }
35  
# Line 44 | Line 44 | public class LinkedBlockingDequeTest ext
44      }
45  
46      /**
47 <     * Create a deque of given size containing consecutive
47 >     * Returns a new deque of given size containing consecutive
48       * Integers 0 ... n.
49       */
50      private LinkedBlockingDeque<Integer> populatedDeque(int n) {
# Line 622 | Line 622 | public class LinkedBlockingDequeTest ext
622              }});
623  
624          await(pleaseTake);
625 <        assertEquals(q.remainingCapacity(), 0);
625 >        assertEquals(0, q.remainingCapacity());
626          assertEquals(0, q.take());
627  
628          await(pleaseInterrupt);
629          assertThreadStaysAlive(t);
630          t.interrupt();
631          awaitTermination(t);
632 <        assertEquals(q.remainingCapacity(), 0);
632 >        assertEquals(0, q.remainingCapacity());
633      }
634  
635      /**
# Line 854 | Line 854 | public class LinkedBlockingDequeTest ext
854              }});
855  
856          await(pleaseTake);
857 <        assertEquals(q.remainingCapacity(), 0);
857 >        assertEquals(0, q.remainingCapacity());
858          assertEquals(capacity - 1, q.take());
859  
860          await(pleaseInterrupt);
861          assertThreadStaysAlive(t);
862          t.interrupt();
863          awaitTermination(t);
864 <        assertEquals(q.remainingCapacity(), 0);
864 >        assertEquals(0, q.remainingCapacity());
865      }
866  
867      /**
# Line 1201 | Line 1201 | public class LinkedBlockingDequeTest ext
1201              }});
1202  
1203          await(pleaseTake);
1204 <        assertEquals(q.remainingCapacity(), 0);
1204 >        assertEquals(0, q.remainingCapacity());
1205          assertEquals(0, q.take());
1206  
1207          await(pleaseInterrupt);
1208          assertThreadStaysAlive(t);
1209          t.interrupt();
1210          awaitTermination(t);
1211 <        assertEquals(q.remainingCapacity(), 0);
1211 >        assertEquals(0, q.remainingCapacity());
1212      }
1213  
1214      /**
# Line 1400 | Line 1400 | public class LinkedBlockingDequeTest ext
1400      }
1401  
1402      /**
1403 –     * remove(x) removes x and returns true if present
1404 –     */
1405 –    public void testRemoveElement() {
1406 –        LinkedBlockingDeque q = populatedDeque(SIZE);
1407 –        for (int i = 1; i < SIZE; i+=2) {
1408 –            assertTrue(q.contains(i));
1409 –            assertTrue(q.remove(i));
1410 –            assertFalse(q.contains(i));
1411 –            assertTrue(q.contains(i-1));
1412 –        }
1413 –        for (int i = 0; i < SIZE; i+=2) {
1414 –            assertTrue(q.contains(i));
1415 –            assertTrue(q.remove(i));
1416 –            assertFalse(q.contains(i));
1417 –            assertFalse(q.remove(i+1));
1418 –            assertFalse(q.contains(i+1));
1419 –        }
1420 –        assertTrue(q.isEmpty());
1421 –    }
1422 –
1423 –    /**
1403       * contains(x) reports true when elements added but not yet removed
1404       */
1405      public void testContains() {
# Line 1500 | Line 1479 | public class LinkedBlockingDequeTest ext
1479      /**
1480       * toArray contains all elements in FIFO order
1481       */
1482 <    public void testToArray() throws InterruptedException{
1482 >    public void testToArray() throws InterruptedException {
1483          LinkedBlockingDeque q = populatedDeque(SIZE);
1484          Object[] o = q.toArray();
1485          for (int i = 0; i < o.length; i++)
# Line 1718 | Line 1697 | public class LinkedBlockingDequeTest ext
1697       * A deserialized serialized deque has same elements in same order
1698       */
1699      public void testSerialization() throws Exception {
1700 <        LinkedBlockingDeque q = populatedDeque(SIZE);
1700 >        Queue x = populatedDeque(SIZE);
1701 >        Queue y = serialClone(x);
1702  
1703 <        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
1704 <        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
1705 <        out.writeObject(q);
1706 <        out.close();
1707 <
1708 <        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
1709 <        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
1710 <        LinkedBlockingDeque r = (LinkedBlockingDeque)in.readObject();
1711 <        assertEquals(q.size(), r.size());
1732 <        while (!q.isEmpty())
1733 <            assertEquals(q.remove(), r.remove());
1703 >        assertTrue(x != y);
1704 >        assertEquals(x.size(), y.size());
1705 >        assertEquals(x.toString(), y.toString());
1706 >        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
1707 >        while (!x.isEmpty()) {
1708 >            assertFalse(y.isEmpty());
1709 >            assertEquals(x.remove(), y.remove());
1710 >        }
1711 >        assertTrue(y.isEmpty());
1712      }
1713  
1714      /**
# Line 1740 | Line 1718 | public class LinkedBlockingDequeTest ext
1718          LinkedBlockingDeque q = populatedDeque(SIZE);
1719          ArrayList l = new ArrayList();
1720          q.drainTo(l);
1721 <        assertEquals(q.size(), 0);
1722 <        assertEquals(l.size(), SIZE);
1721 >        assertEquals(0, q.size());
1722 >        assertEquals(SIZE, l.size());
1723          for (int i = 0; i < SIZE; ++i)
1724              assertEquals(l.get(i), new Integer(i));
1725          q.add(zero);
# Line 1751 | Line 1729 | public class LinkedBlockingDequeTest ext
1729          assertTrue(q.contains(one));
1730          l.clear();
1731          q.drainTo(l);
1732 <        assertEquals(q.size(), 0);
1733 <        assertEquals(l.size(), 2);
1732 >        assertEquals(0, q.size());
1733 >        assertEquals(2, l.size());
1734          for (int i = 0; i < 2; ++i)
1735              assertEquals(l.get(i), new Integer(i));
1736      }
# Line 1788 | Line 1766 | public class LinkedBlockingDequeTest ext
1766              ArrayList l = new ArrayList();
1767              q.drainTo(l, i);
1768              int k = (i < SIZE) ? i : SIZE;
1769 <            assertEquals(l.size(), k);
1770 <            assertEquals(q.size(), SIZE-k);
1769 >            assertEquals(k, l.size());
1770 >            assertEquals(SIZE-k, q.size());
1771              for (int j = 0; j < k; ++j)
1772                  assertEquals(l.get(j), new Integer(j));
1773              while (q.poll() != null) ;

Diff Legend

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