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.74 by jsr166, Sun Oct 30 21:07:27 2016 UTC vs.
Revision 1.83 by jsr166, Sat May 13 21:52:59 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 new ArrayBlockingQueue(SIZE, true);
31 –        }
32 –    }
33 –
34 –    public static class NonFair extends BlockingQueueTest {
35 –        protected BlockingQueue emptyCollection() {
36 –            return new ArrayBlockingQueue(SIZE, false);
37 –        }
38 –    }
39 –
29      public static void main(String[] args) {
30          main(suite(), args);
31      }
# Line 44 | Line 33 | public class ArrayBlockingQueueTest exte
33      public static Test suite() {
34          class Implementation implements CollectionImplementation {
35              public Class<?> klazz() { return ArrayBlockingQueue.class; }
36 <            public Collection emptyCollection() { return new ArrayBlockingQueue(SIZE, false); }
36 >            public Collection emptyCollection() {
37 >                boolean fair = ThreadLocalRandom.current().nextBoolean();
38 >                return populatedQueue(0, SIZE, 2 * SIZE, fair);
39 >            }
40              public Object makeElement(int i) { return i; }
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      /**
65       * Returns a new queue of given size containing consecutive
66       * Integers 0 ... n - 1.
67       */
68 <    private ArrayBlockingQueue<Integer> populatedQueue(int n) {
69 <        ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<Integer>(n);
68 >    static ArrayBlockingQueue<Integer> populatedQueue(int n) {
69 >        return populatedQueue(n, n, n, false);
70 >    }
71 >
72 >    /**
73 >     * Returns a new queue of given size containing consecutive
74 >     * Integers 0 ... n - 1, with given capacity range and fairness.
75 >     */
76 >    static ArrayBlockingQueue<Integer> populatedQueue(
77 >        int size, int minCapacity, int maxCapacity, boolean fair) {
78 >        ThreadLocalRandom rnd = ThreadLocalRandom.current();
79 >        int capacity = rnd.nextInt(minCapacity, maxCapacity + 1);
80 >        ArrayBlockingQueue<Integer> q = new ArrayBlockingQueue<>(capacity);
81          assertTrue(q.isEmpty());
82 <        for (int i = 0; i < n; i++)
83 <            assertTrue(q.offer(new Integer(i)));
84 <        assertFalse(q.isEmpty());
85 <        assertEquals(0, q.remainingCapacity());
86 <        assertEquals(n, q.size());
87 <        assertEquals((Integer) 0, q.peek());
82 >        // shuffle circular array elements so they wrap
83 >        {
84 >            int n = rnd.nextInt(capacity);
85 >            for (int i = 0; i < n; i++) q.add(42);
86 >            for (int i = 0; i < n; i++) q.remove();
87 >        }
88 >        for (int i = 0; i < size; i++)
89 >            assertTrue(q.offer((Integer) i));
90 >        assertEquals(size == 0, q.isEmpty());
91 >        assertEquals(capacity - size, q.remainingCapacity());
92 >        assertEquals(size, q.size());
93 >        if (size > 0)
94 >            assertEquals((Integer) 0, q.peek());
95          return q;
96      }
97  
# Line 81 | 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 126 | 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;
133 <        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 154 | 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 169 | 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 196 | 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) {
200 <            assertTrue(q.add(new Integer(i)));
201 <        }
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 235 | 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 338 | Line 375 | public class ArrayBlockingQueueTest exte
375          assertEquals(0, q.take());
376  
377          await(pleaseInterrupt);
378 <        assertThreadStaysAlive(t);
378 >        assertThreadBlocks(t, Thread.State.WAITING);
379          t.interrupt();
380          awaitTermination(t);
381          assertEquals(0, q.remainingCapacity());
# Line 388 | Line 425 | public class ArrayBlockingQueueTest exte
425          final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
426          Thread t = newStartedThread(new CheckedRunnable() {
427              public void realRun() throws InterruptedException {
428 <                for (int i = 0; i < SIZE; ++i) {
392 <                    assertEquals(i, q.take());
393 <                }
428 >                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
429  
430                  Thread.currentThread().interrupt();
431                  try {
# Line 408 | Line 443 | public class ArrayBlockingQueueTest exte
443              }});
444  
445          await(pleaseInterrupt);
446 <        assertThreadStaysAlive(t);
446 >        assertThreadBlocks(t, Thread.State.WAITING);
447          t.interrupt();
448          awaitTermination(t);
449      }
# Line 528 | Line 563 | public class ArrayBlockingQueueTest exte
563       * contains(x) reports true when elements added but not yet removed
564       */
565      public void testContains() {
566 <        ArrayBlockingQueue q = populatedQueue(SIZE);
567 <        for (int i = 0; i < SIZE; ++i) {
566 >        int size = ThreadLocalRandom.current().nextInt(1, SIZE);
567 >        ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
568 >        assertFalse(q.contains(null));
569 >        for (int i = 0; i < size; ++i) {
570              assertTrue(q.contains(new Integer(i)));
571              assertEquals(i, q.poll());
572              assertFalse(q.contains(new Integer(i)));
# Line 540 | Line 577 | public class ArrayBlockingQueueTest exte
577       * clear removes all elements
578       */
579      public void testClear() {
580 <        ArrayBlockingQueue q = populatedQueue(SIZE);
580 >        int size = ThreadLocalRandom.current().nextInt(1, 5);
581 >        ArrayBlockingQueue q = populatedQueue(size, size, 2 * size, false);
582 >        int capacity = size + q.remainingCapacity();
583          q.clear();
584          assertTrue(q.isEmpty());
585          assertEquals(0, q.size());
586 <        assertEquals(SIZE, q.remainingCapacity());
586 >        assertEquals(capacity, q.remainingCapacity());
587          q.add(one);
588          assertFalse(q.isEmpty());
589          assertTrue(q.contains(one));
# Line 898 | Line 937 | public class ArrayBlockingQueueTest exte
937       */
938      public void testNeverContainsNull() {
939          Collection<?>[] qs = {
940 <            new ArrayBlockingQueue<Object>(10),
941 <            populatedQueue(2),
940 >            populatedQueue(0, 1, 10, false),
941 >            populatedQueue(2, 2, 10, true),
942          };
943  
944          for (Collection<?> q : qs) {

Diff Legend

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