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.50 by jsr166, Sat Nov 26 05:19:17 2011 UTC vs.
Revision 1.54 by jsr166, Wed Dec 31 16:44:02 2014 UTC

# Line 19 | Line 19 | 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  
23   @SuppressWarnings({"unchecked", "rawtypes"})
24   public class LinkedTransferQueueTest extends JSR166TestCase {
# Line 177 | 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 625 | Line 624 | public class LinkedTransferQueueTest ext
624          Queue x = populatedQueue(SIZE);
625          Queue y = serialClone(x);
626  
627 <        assertTrue(x != y);
627 >        assertNotSame(y, x);
628          assertEquals(x.size(), y.size());
629          assertEquals(x.toString(), y.toString());
630          assertTrue(Arrays.equals(x.toArray(), y.toArray()));
# Line 646 | Line 645 | public class LinkedTransferQueueTest ext
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 658 | Line 657 | public class LinkedTransferQueueTest ext
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 674 | 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);
679 <        }
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 693 | 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);
700 <            }
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 1015 | 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