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

Comparing jsr166/src/test/tck/ArrayBlockingQueueTest.java (file contents):
Revision 1.57 by jsr166, Sun Nov 23 22:27:06 2014 UTC vs.
Revision 1.64 by jsr166, Sat Feb 28 19:59:23 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
10 < import java.util.Arrays;
9 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 >
11   import java.util.ArrayList;
12 + import java.util.Arrays;
13   import java.util.Collection;
14   import java.util.Iterator;
15   import java.util.NoSuchElementException;
# Line 18 | Line 19 | import java.util.concurrent.BlockingQueu
19   import java.util.concurrent.CountDownLatch;
20   import java.util.concurrent.Executors;
21   import java.util.concurrent.ExecutorService;
22 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
22 >
23 > import junit.framework.Test;
24  
25   public class ArrayBlockingQueueTest extends JSR166TestCase {
26  
# Line 106 | Line 108 | public class ArrayBlockingQueueTest exte
108              ints[i] = i;
109          Collection<Integer> elements = Arrays.asList(ints);
110          try {
111 <            new ArrayBlockingQueue(SIZE, false, Arrays.asList(ints));
111 >            new ArrayBlockingQueue(SIZE, false, elements);
112              shouldThrow();
113          } catch (NullPointerException success) {}
114      }
# Line 157 | Line 159 | public class ArrayBlockingQueueTest exte
159       * remainingCapacity decreases on add, increases on remove
160       */
161      public void testRemainingCapacity() {
162 <        ArrayBlockingQueue q = populatedQueue(SIZE);
162 >        BlockingQueue q = populatedQueue(SIZE);
163          for (int i = 0; i < SIZE; ++i) {
164              assertEquals(i, q.remainingCapacity());
165 <            assertEquals(SIZE-i, q.size());
166 <            q.remove();
165 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
166 >            assertEquals(i, q.remove());
167          }
168          for (int i = 0; i < SIZE; ++i) {
169              assertEquals(SIZE-i, q.remainingCapacity());
170 <            assertEquals(i, q.size());
171 <            q.add(new Integer(i));
170 >            assertEquals(SIZE, q.size() + q.remainingCapacity());
171 >            assertTrue(q.add(i));
172          }
173      }
174  
# Line 183 | Line 185 | public class ArrayBlockingQueueTest exte
185       * add succeeds if not full; throws ISE if full
186       */
187      public void testAdd() {
188 +        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
189 +        for (int i = 0; i < SIZE; ++i) {
190 +            assertTrue(q.add(new Integer(i)));
191 +        }
192 +        assertEquals(0, q.remainingCapacity());
193          try {
187 –            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
188 –            for (int i = 0; i < SIZE; ++i) {
189 –                assertTrue(q.add(new Integer(i)));
190 –            }
191 –            assertEquals(0, q.remainingCapacity());
194              q.add(new Integer(SIZE));
195              shouldThrow();
196          } catch (IllegalStateException success) {}
# Line 198 | Line 200 | public class ArrayBlockingQueueTest exte
200       * addAll(this) throws IAE
201       */
202      public void testAddAllSelf() {
203 +        ArrayBlockingQueue q = populatedQueue(SIZE);
204          try {
202 –            ArrayBlockingQueue q = populatedQueue(SIZE);
205              q.addAll(q);
206              shouldThrow();
207          } catch (IllegalArgumentException success) {}
# Line 210 | Line 212 | public class ArrayBlockingQueueTest exte
212       * possibly adding some elements
213       */
214      public void testAddAll3() {
215 +        ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
216 +        Integer[] ints = new Integer[SIZE];
217 +        for (int i = 0; i < SIZE-1; ++i)
218 +            ints[i] = new Integer(i);
219          try {
214 –            ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
215 –            Integer[] ints = new Integer[SIZE];
216 –            for (int i = 0; i < SIZE-1; ++i)
217 –                ints[i] = new Integer(i);
220              q.addAll(Arrays.asList(ints));
221              shouldThrow();
222          } catch (NullPointerException success) {}
# Line 224 | Line 226 | public class ArrayBlockingQueueTest exte
226       * addAll throws ISE if not enough room
227       */
228      public void testAddAll4() {
229 +        ArrayBlockingQueue q = new ArrayBlockingQueue(1);
230 +        Integer[] ints = new Integer[SIZE];
231 +        for (int i = 0; i < SIZE; ++i)
232 +            ints[i] = new Integer(i);
233          try {
228 –            ArrayBlockingQueue q = new ArrayBlockingQueue(1);
229 –            Integer[] ints = new Integer[SIZE];
230 –            for (int i = 0; i < SIZE; ++i)
231 –                ints[i] = new Integer(i);
234              q.addAll(Arrays.asList(ints));
235              shouldThrow();
236          } catch (IllegalStateException success) {}
# Line 255 | Line 257 | public class ArrayBlockingQueueTest exte
257      public void testPut() throws InterruptedException {
258          ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
259          for (int i = 0; i < SIZE; ++i) {
260 <            Integer I = new Integer(i);
261 <            q.put(I);
262 <            assertTrue(q.contains(I));
260 >            Integer x = new Integer(i);
261 >            q.put(x);
262 >            assertTrue(q.contains(x));
263          }
264          assertEquals(0, q.remainingCapacity());
265      }
# Line 585 | Line 587 | public class ArrayBlockingQueueTest exte
587              assertTrue(q.removeAll(p));
588              assertEquals(SIZE-i, q.size());
589              for (int j = 0; j < i; ++j) {
590 <                Integer I = (Integer)(p.remove());
591 <                assertFalse(q.contains(I));
590 >                Integer x = (Integer)(p.remove());
591 >                assertFalse(q.contains(x));
592              }
593          }
594      }
# Line 696 | Line 698 | public class ArrayBlockingQueueTest exte
698      public void testIterator() throws InterruptedException {
699          ArrayBlockingQueue q = populatedQueue(SIZE);
700          Iterator it = q.iterator();
701 <        while (it.hasNext()) {
701 >        int i;
702 >        for (i = 0; it.hasNext(); i++)
703 >            assertTrue(q.contains(it.next()));
704 >        assertEquals(i, SIZE);
705 >        assertIteratorExhausted(it);
706 >
707 >        it = q.iterator();
708 >        for (i = 0; it.hasNext(); i++)
709              assertEquals(it.next(), q.take());
710 <        }
710 >        assertEquals(i, SIZE);
711 >        assertIteratorExhausted(it);
712 >    }
713 >
714 >    /**
715 >     * iterator of empty collection has no elements
716 >     */
717 >    public void testEmptyIterator() {
718 >        assertIteratorExhausted(new ArrayBlockingQueue(SIZE).iterator());
719      }
720  
721      /**
# Line 892 | Line 909 | public class ArrayBlockingQueueTest exte
909              assertEquals(SIZE-k, q.size());
910              for (int j = 0; j < k; ++j)
911                  assertEquals(l.get(j), new Integer(j));
912 <            while (q.poll() != null) ;
912 >            do {} while (q.poll() != null);
913          }
914      }
915  

Diff Legend

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