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

Comparing jsr166/src/test/tck/LinkedBlockingQueueTest.java (file contents):
Revision 1.57 by jsr166, Sat Jan 17 22:55:06 2015 UTC vs.
Revision 1.60 by jsr166, Sat May 23 00:53:08 2015 UTC

# Line 37 | Line 37 | public class LinkedBlockingQueueTest ext
37      }
38  
39      public static void main(String[] args) {
40 <        junit.textui.TestRunner.run(suite());
40 >        main(suite(), args);
41      }
42  
43      public static Test suite() {
# Line 108 | Line 108 | public class LinkedBlockingQueueTest ext
108       */
109      public void testConstructor5() {
110          Integer[] ints = new Integer[SIZE];
111 <        for (int i = 0; i < SIZE-1; ++i)
111 >        for (int i = 0; i < SIZE - 1; ++i)
112              ints[i] = new Integer(i);
113          Collection<Integer> elements = Arrays.asList(ints);
114          try {
# Line 148 | Line 148 | public class LinkedBlockingQueueTest ext
148       * remainingCapacity decreases on add, increases on remove
149       */
150      public void testRemainingCapacity() {
151 <        LinkedBlockingQueue q = populatedQueue(SIZE);
151 >        BlockingQueue q = populatedQueue(SIZE);
152          for (int i = 0; i < SIZE; ++i) {
153              assertEquals(i, q.remainingCapacity());
154 <            assertEquals(SIZE-i, q.size());
155 <            q.remove();
154 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
155 >            assertEquals(i, q.remove());
156          }
157          for (int i = 0; i < SIZE; ++i) {
158 <            assertEquals(SIZE-i, q.remainingCapacity());
159 <            assertEquals(i, q.size());
160 <            q.add(new Integer(i));
158 >            assertEquals(SIZE - i, q.remainingCapacity());
159 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
160 >            assertTrue(q.add(i));
161          }
162      }
163  
# Line 202 | Line 202 | public class LinkedBlockingQueueTest ext
202      public void testAddAll3() {
203          LinkedBlockingQueue q = new LinkedBlockingQueue(SIZE);
204          Integer[] ints = new Integer[SIZE];
205 <        for (int i = 0; i < SIZE-1; ++i)
205 >        for (int i = 0; i < SIZE - 1; ++i)
206              ints[i] = new Integer(i);
207          Collection<Integer> elements = Arrays.asList(ints);
208          try {
# Line 574 | Line 574 | public class LinkedBlockingQueueTest ext
574                  assertTrue(changed);
575  
576              assertTrue(q.containsAll(p));
577 <            assertEquals(SIZE-i, q.size());
577 >            assertEquals(SIZE - i, q.size());
578              p.remove();
579          }
580      }
# Line 587 | Line 587 | public class LinkedBlockingQueueTest ext
587              LinkedBlockingQueue q = populatedQueue(SIZE);
588              LinkedBlockingQueue p = populatedQueue(i);
589              assertTrue(q.removeAll(p));
590 <            assertEquals(SIZE-i, q.size());
590 >            assertEquals(SIZE - i, q.size());
591              for (int j = 0; j < i; ++j) {
592                  Integer x = (Integer)(p.remove());
593                  assertFalse(q.contains(x));
# Line 814 | Line 814 | public class LinkedBlockingQueueTest ext
814          final LinkedBlockingQueue q = populatedQueue(SIZE);
815          Thread t = new Thread(new CheckedRunnable() {
816              public void realRun() throws InterruptedException {
817 <                q.put(new Integer(SIZE+1));
817 >                q.put(new Integer(SIZE + 1));
818              }});
819  
820          t.start();
# Line 839 | Line 839 | public class LinkedBlockingQueueTest ext
839              q.drainTo(l, i);
840              int k = (i < SIZE) ? i : SIZE;
841              assertEquals(k, l.size());
842 <            assertEquals(SIZE-k, q.size());
842 >            assertEquals(SIZE - k, q.size());
843              for (int j = 0; j < k; ++j)
844                  assertEquals(l.get(j), new Integer(j));
845              do {} while (q.poll() != null);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines