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.75 by jsr166, Sat Nov 5 23:38:21 2016 UTC vs.
Revision 1.90 by jsr166, Sun May 14 04:14:09 2017 UTC

# Line 11 | Line 11 | import static java.util.concurrent.TimeU
11   import java.util.ArrayList;
12   import java.util.Arrays;
13   import java.util.Collection;
14 + import java.util.Collections;
15   import java.util.Iterator;
16   import java.util.NoSuchElementException;
17   import java.util.Queue;
# Line 25 | Line 26 | import junit.framework.Test;
26  
27   public class ArrayBlockingQueueTest extends JSR166TestCase {
28  
28 –    public static class Fair extends BlockingQueueTest {
29 –        protected BlockingQueue emptyCollection() {
30 –            return populatedQueue(0, SIZE, 2 * SIZE, true);
31 –        }
32 –    }
33 –
34 –    public static class NonFair extends BlockingQueueTest {
35 –        protected BlockingQueue emptyCollection() {
36 –            return populatedQueue(0, SIZE, 2 * SIZE, false);
37 –        }
38 –    }
39 –
29      public static void main(String[] args) {
30          main(suite(), args);
31      }
# Line 52 | Line 41 | public class ArrayBlockingQueueTest exte
41              public boolean isConcurrent() { return true; }
42              public boolean permitsNulls() { return false; }
43          }
44 <        return newTestSuite(ArrayBlockingQueueTest.class,
45 <                            new Fair().testSuite(),
46 <                            new NonFair().testSuite(),
47 <                            CollectionTest.testSuite(new Implementation()));
44 >
45 >        return newTestSuite(
46 >            ArrayBlockingQueueTest.class,
47 >            new Fair().testSuite(),
48 >            new NonFair().testSuite(),
49 >            CollectionTest.testSuite(new Implementation()));
50 >    }
51 >
52 >    public static class Fair extends BlockingQueueTest {
53 >        protected BlockingQueue emptyCollection() {
54 >            return populatedQueue(0, SIZE, 2 * SIZE, true);
55 >        }
56 >    }
57 >
58 >    public static class NonFair extends BlockingQueueTest {
59 >        protected BlockingQueue emptyCollection() {
60 >            return populatedQueue(0, SIZE, 2 * SIZE, false);
61 >        }
62      }
63  
64      /**
# Line 102 | Line 105 | public class ArrayBlockingQueueTest exte
105      /**
106       * Constructor throws IAE if capacity argument nonpositive
107       */
108 <    public void testConstructor2() {
109 <        try {
110 <            new ArrayBlockingQueue(0);
111 <            shouldThrow();
112 <        } catch (IllegalArgumentException success) {}
108 >    public void testConstructor_nonPositiveCapacity() {
109 >        for (int i : new int[] { 0, -1, Integer.MIN_VALUE }) {
110 >            try {
111 >                new ArrayBlockingQueue(i);
112 >                shouldThrow();
113 >            } catch (IllegalArgumentException success) {}
114 >            for (boolean fair : new boolean[] { true, false }) {
115 >                try {
116 >                    new ArrayBlockingQueue(i, fair);
117 >                    shouldThrow();
118 >                } catch (IllegalArgumentException success) {}
119 >            }
120 >        }
121      }
122  
123      /**
124       * Initializing from null Collection throws NPE
125       */
126 <    public void testConstructor3() {
126 >    public void testConstructor_nullCollection() {
127          try {
128              new ArrayBlockingQueue(1, true, null);
129              shouldThrow();
# Line 147 | Line 158 | public class ArrayBlockingQueueTest exte
158      /**
159       * Initializing from too large collection throws IAE
160       */
161 <    public void testConstructor6() {
162 <        Integer[] ints = new Integer[SIZE];
163 <        for (int i = 0; i < SIZE; ++i)
164 <            ints[i] = i;
154 <        Collection<Integer> elements = Arrays.asList(ints);
161 >    public void testConstructor_collectionTooLarge() {
162 >        // just barely fits - succeeds
163 >        new ArrayBlockingQueue(SIZE, false,
164 >                               Collections.nCopies(SIZE, ""));
165          try {
166 <            new ArrayBlockingQueue(SIZE - 1, false, elements);
166 >            new ArrayBlockingQueue(SIZE - 1, false,
167 >                                   Collections.nCopies(SIZE, ""));
168              shouldThrow();
169          } catch (IllegalArgumentException success) {}
170      }
# Line 175 | Line 186 | public class ArrayBlockingQueueTest exte
186       * Queue transitions from empty to full when elements added
187       */
188      public void testEmptyFull() {
189 <        ArrayBlockingQueue q = new ArrayBlockingQueue(2);
189 >        BlockingQueue q = populatedQueue(0, 2, 2, false);
190          assertTrue(q.isEmpty());
191          assertEquals(2, q.remainingCapacity());
192          q.add(one);
193          assertFalse(q.isEmpty());
194 <        q.add(two);
194 >        assertTrue(q.offer(two));
195          assertFalse(q.isEmpty());
196          assertEquals(0, q.remainingCapacity());
197          assertFalse(q.offer(three));
# Line 190 | Line 201 | public class ArrayBlockingQueueTest exte
201       * remainingCapacity decreases on add, increases on remove
202       */
203      public void testRemainingCapacity() {
204 <        BlockingQueue q = populatedQueue(SIZE);
205 <        for (int i = 0; i < SIZE; ++i) {
206 <            assertEquals(i, q.remainingCapacity());
207 <            assertEquals(SIZE, q.size() + q.remainingCapacity());
204 >        int size = ThreadLocalRandom.current().nextInt(1, SIZE);
205 >        BlockingQueue q = populatedQueue(size, size, 2 * size, false);
206 >        int spare = q.remainingCapacity();
207 >        int capacity = spare + size;
208 >        for (int i = 0; i < size; i++) {
209 >            assertEquals(spare + i, q.remainingCapacity());
210 >            assertEquals(capacity, q.size() + q.remainingCapacity());
211              assertEquals(i, q.remove());
212          }
213 <        for (int i = 0; i < SIZE; ++i) {
214 <            assertEquals(SIZE - i, q.remainingCapacity());
215 <            assertEquals(SIZE, q.size() + q.remainingCapacity());
213 >        for (int i = 0; i < size; i++) {
214 >            assertEquals(capacity - i, q.remainingCapacity());
215 >            assertEquals(capacity, q.size() + q.remainingCapacity());
216              assertTrue(q.add(i));
217          }
218      }
# Line 217 | Line 231 | public class ArrayBlockingQueueTest exte
231       */
232      public void testAdd() {
233          ArrayBlockingQueue q = new ArrayBlockingQueue(SIZE);
234 <        for (int i = 0; i < SIZE; ++i) {
221 <            assertTrue(q.add(new Integer(i)));
222 <        }
234 >        for (int i = 0; i < SIZE; i++) assertTrue(q.add((Integer) i));
235          assertEquals(0, q.remainingCapacity());
236          try {
237 <            q.add(new Integer(SIZE));
237 >            q.add((Integer) SIZE);
238              shouldThrow();
239          } catch (IllegalStateException success) {}
240      }
# Line 256 | Line 268 | public class ArrayBlockingQueueTest exte
268      /**
269       * addAll throws ISE if not enough room
270       */
271 <    public void testAddAll4() {
272 <        ArrayBlockingQueue q = new ArrayBlockingQueue(1);
273 <        Integer[] ints = new Integer[SIZE];
274 <        for (int i = 0; i < SIZE; ++i)
275 <            ints[i] = new Integer(i);
271 >    public void testAddAll_insufficientSpace() {
272 >        int size = ThreadLocalRandom.current().nextInt(1, SIZE);
273 >        ArrayBlockingQueue q = populatedQueue(0, size, size, false);
274 >        // Just fits:
275 >        q.addAll(populatedQueue(size, size, 2 * size, false));
276 >        assertEquals(0, q.remainingCapacity());
277 >        assertEquals(size, q.size());
278 >        assertEquals(0, q.peek());
279          try {
280 <            q.addAll(Arrays.asList(ints));
280 >            q = populatedQueue(0, size, size, false);
281 >            q.addAll(Collections.nCopies(size + 1, 42));
282              shouldThrow();
283          } catch (IllegalStateException success) {}
284      }
# Line 324 | Line 340 | public class ArrayBlockingQueueTest exte
340              }});
341  
342          await(pleaseInterrupt);
343 <        assertThreadStaysAlive(t);
343 >        assertThreadBlocks(t, Thread.State.WAITING);
344          t.interrupt();
345          awaitTermination(t);
346          assertEquals(SIZE, q.size());
# Line 346 | Line 362 | public class ArrayBlockingQueueTest exte
362                  pleaseTake.countDown();
363                  q.put(86);
364  
365 +                Thread.currentThread().interrupt();
366 +                try {
367 +                    q.put(99);
368 +                    shouldThrow();
369 +                } catch (InterruptedException success) {}
370 +                assertFalse(Thread.interrupted());
371 +
372                  pleaseInterrupt.countDown();
373                  try {
374                      q.put(99);
# Line 359 | Line 382 | public class ArrayBlockingQueueTest exte
382          assertEquals(0, q.take());
383  
384          await(pleaseInterrupt);
385 <        assertThreadStaysAlive(t);
385 >        assertThreadBlocks(t, Thread.State.WAITING);
386          t.interrupt();
387          awaitTermination(t);
388          assertEquals(0, q.remainingCapacity());
# Line 368 | Line 391 | public class ArrayBlockingQueueTest exte
391      /**
392       * timed offer times out if full and elements not taken
393       */
394 <    public void testTimedOffer() throws InterruptedException {
394 >    public void testTimedOffer() {
395          final ArrayBlockingQueue q = new ArrayBlockingQueue(2);
396          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
397          Thread t = newStartedThread(new CheckedRunnable() {
# Line 378 | Line 401 | public class ArrayBlockingQueueTest exte
401                  long startTime = System.nanoTime();
402                  assertFalse(q.offer(new Object(), timeoutMillis(), MILLISECONDS));
403                  assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
404 +
405 +                Thread.currentThread().interrupt();
406 +                try {
407 +                    q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
408 +                    shouldThrow();
409 +                } catch (InterruptedException success) {}
410 +                assertFalse(Thread.interrupted());
411 +
412                  pleaseInterrupt.countDown();
413                  try {
414                      q.offer(new Object(), 2 * LONG_DELAY_MS, MILLISECONDS);
415                      shouldThrow();
416                  } catch (InterruptedException success) {}
417 +                assertFalse(Thread.interrupted());
418              }});
419  
420          await(pleaseInterrupt);
421 <        assertThreadStaysAlive(t);
421 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
422          t.interrupt();
423          awaitTermination(t);
424      }
# Line 409 | Line 441 | public class ArrayBlockingQueueTest exte
441          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
442          Thread t = newStartedThread(new CheckedRunnable() {
443              public void realRun() throws InterruptedException {
444 <                for (int i = 0; i < SIZE; ++i) {
413 <                    assertEquals(i, q.take());
414 <                }
444 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
445  
446                  Thread.currentThread().interrupt();
447                  try {
# Line 429 | Line 459 | public class ArrayBlockingQueueTest exte
459              }});
460  
461          await(pleaseInterrupt);
462 <        assertThreadStaysAlive(t);
462 >        assertThreadBlocks(t, Thread.State.WAITING);
463          t.interrupt();
464          awaitTermination(t);
465      }
# Line 479 | Line 509 | public class ArrayBlockingQueueTest exte
509       */
510      public void testInterruptedTimedPoll() throws InterruptedException {
511          final BlockingQueue<Integer> q = populatedQueue(SIZE);
512 <        final CountDownLatch aboutToWait = new CountDownLatch(1);
512 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
513          Thread t = newStartedThread(new CheckedRunnable() {
514              public void realRun() throws InterruptedException {
515                  long startTime = System.nanoTime();
516 <                for (int i = 0; i < SIZE; ++i) {
516 >                for (int i = 0; i < SIZE; i++)
517                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
518 <                }
519 <                aboutToWait.countDown();
518 >
519 >                Thread.currentThread().interrupt();
520 >                try {
521 >                    q.poll(LONG_DELAY_MS, MILLISECONDS);
522 >                    shouldThrow();
523 >                } catch (InterruptedException success) {}
524 >                assertFalse(Thread.interrupted());
525 >
526 >                pleaseInterrupt.countDown();
527                  try {
528                      q.poll(LONG_DELAY_MS, MILLISECONDS);
529                      shouldThrow();
530 <                } catch (InterruptedException success) {
531 <                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
532 <                }
530 >                } catch (InterruptedException success) {}
531 >                assertFalse(Thread.interrupted());
532 >
533 >                assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
534              }});
535  
536 <        await(aboutToWait);
537 <        waitForThreadToEnterWaitState(t);
536 >        await(pleaseInterrupt);
537 >        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
538          t.interrupt();
539          awaitTermination(t);
540          checkEmpty(q);
# Line 549 | Line 587 | public class ArrayBlockingQueueTest exte
587       * contains(x) reports true when elements added but not yet removed
588       */
589      public void testContains() {
590 <        ArrayBlockingQueue q = populatedQueue(SIZE);
591 <        for (int i = 0; i < SIZE; ++i) {
590 >        int size = ThreadLocalRandom.current().nextInt(1, SIZE);
591 >        ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
592 >        assertFalse(q.contains(null));
593 >        for (int i = 0; i < size; ++i) {
594              assertTrue(q.contains(new Integer(i)));
595              assertEquals(i, q.poll());
596              assertFalse(q.contains(new Integer(i)));
# Line 561 | Line 601 | public class ArrayBlockingQueueTest exte
601       * clear removes all elements
602       */
603      public void testClear() {
604 <        ArrayBlockingQueue q = populatedQueue(SIZE);
604 >        int size = ThreadLocalRandom.current().nextInt(1, 5);
605 >        ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
606 >        int capacity = size + q.remainingCapacity();
607          q.clear();
608          assertTrue(q.isEmpty());
609          assertEquals(0, q.size());
610 <        assertEquals(SIZE, q.remainingCapacity());
610 >        assertEquals(capacity, q.remainingCapacity());
611          q.add(one);
612          assertFalse(q.isEmpty());
613          assertTrue(q.contains(one));
# Line 919 | Line 961 | public class ArrayBlockingQueueTest exte
961       */
962      public void testNeverContainsNull() {
963          Collection<?>[] qs = {
964 <            new ArrayBlockingQueue<Object>(10),
965 <            populatedQueue(2),
964 >            populatedQueue(0, 1, 10, false),
965 >            populatedQueue(2, 2, 10, true),
966          };
967  
968          for (Collection<?> q : qs) {

Diff Legend

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