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

Comparing jsr166/src/test/tck/ConcurrentLinkedQueueTest.java (file contents):
Revision 1.39 by jsr166, Sat May 23 00:53:08 2015 UTC vs.
Revision 1.45 by jsr166, Sat Mar 11 18:20:46 2017 UTC

# Line 14 | Line 14 | import java.util.Queue;
14   import java.util.concurrent.ConcurrentLinkedQueue;
15  
16   import junit.framework.Test;
17 – import junit.framework.TestSuite;
17  
18   public class ConcurrentLinkedQueueTest extends JSR166TestCase {
19  
# Line 23 | Line 22 | public class ConcurrentLinkedQueueTest e
22      }
23  
24      public static Test suite() {
25 <        return new TestSuite(ConcurrentLinkedQueueTest.class);
25 >        class Implementation implements CollectionImplementation {
26 >            public Class<?> klazz() { return ConcurrentLinkedQueue.class; }
27 >            public Collection emptyCollection() { return new ConcurrentLinkedQueue(); }
28 >            public Object makeElement(int i) { return i; }
29 >            public boolean isConcurrent() { return true; }
30 >            public boolean permitsNulls() { return false; }
31 >        }
32 >        return newTestSuite(ConcurrentLinkedQueueTest.class,
33 >                            CollectionTest.testSuite(new Implementation()));
34      }
35  
36      /**
37       * Returns a new queue of given size containing consecutive
38 <     * Integers 0 ... n.
38 >     * Integers 0 ... n - 1.
39       */
40 <    private ConcurrentLinkedQueue<Integer> populatedQueue(int n) {
41 <        ConcurrentLinkedQueue<Integer> q = new ConcurrentLinkedQueue<Integer>();
40 >    private static ConcurrentLinkedQueue<Integer> populatedQueue(int n) {
41 >        ConcurrentLinkedQueue<Integer> q = new ConcurrentLinkedQueue<>();
42          assertTrue(q.isEmpty());
43          for (int i = 0; i < n; ++i)
44              assertTrue(q.offer(new Integer(i)));
45          assertFalse(q.isEmpty());
46          assertEquals(n, q.size());
47 +        assertEquals((Integer) 0, q.peek());
48          return q;
49      }
50  
# Line 289 | Line 297 | public class ConcurrentLinkedQueueTest e
297              assertTrue(q.contains(i));
298              assertTrue(q.remove(i));
299              assertFalse(q.contains(i));
300 <            assertTrue(q.contains(i-1));
300 >            assertTrue(q.contains(i - 1));
301          }
302          for (int i = 0; i < SIZE; i += 2) {
303              assertTrue(q.contains(i));
304              assertTrue(q.remove(i));
305              assertFalse(q.contains(i));
306 <            assertFalse(q.remove(i+1));
307 <            assertFalse(q.contains(i+1));
306 >            assertFalse(q.remove(i + 1));
307 >            assertFalse(q.contains(i + 1));
308          }
309          assertTrue(q.isEmpty());
310      }

Diff Legend

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