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

Comparing jsr166/src/test/tck/ArrayDeque8Test.java (file contents):
Revision 1.1 by jsr166, Tue Oct 25 01:32:55 2016 UTC vs.
Revision 1.6 by jsr166, Wed Jan 27 01:57:24 2021 UTC

# Line 10 | Line 10 | import java.util.Collections;
10   import java.util.Spliterator;
11  
12   import junit.framework.Test;
13 import junit.framework.TestSuite;
13  
14   public class ArrayDeque8Test extends JSR166TestCase {
15      public static void main(String[] args) {
# Line 26 | Line 25 | public class ArrayDeque8Test extends JSR
25       */
26      public void testSpliterator_getComparator() {
27          assertThrows(IllegalStateException.class,
28 <                     () -> new ArrayDeque().spliterator().getComparator());
28 >                     () -> new ArrayDeque<Item>().spliterator().getComparator());
29      }
30  
31      /**
32       * Spliterator characteristics are as advertised
33       */
34      public void testSpliterator_characteristics() {
35 <        ArrayDeque q = new ArrayDeque();
36 <        Spliterator s = q.spliterator();
35 >        ArrayDeque<Item> q = new ArrayDeque<>();
36 >        Spliterator<Item> s = q.spliterator();
37          int characteristics = s.characteristics();
38          int required = Spliterator.NONNULL
39              | Spliterator.ORDERED
40              | Spliterator.SIZED
41              | Spliterator.SUBSIZED;
42 <        assertEquals(required, characteristics & required);
42 >        mustEqual(required, characteristics & required);
43          assertTrue(s.hasCharacteristics(required));
44 <        assertEquals(0, characteristics
44 >        mustEqual(0, characteristics
45                       & (Spliterator.CONCURRENT
46                          | Spliterator.DISTINCT
47                          | Spliterator.IMMUTABLE
# Line 51 | Line 50 | public class ArrayDeque8Test extends JSR
50  
51      /**
52       * Handle capacities near Integer.MAX_VALUE.
53 <     * ant -Dvmoptions='-Xms28g -Xmx28g' -Djsr166.testImplementationDetails=true -Djsr166.expensiveTests=true -Djsr166.tckTestClass=ArrayDequeTest -Djsr166.methodFilter=testHuge tck
53 >     * ant -Dvmoptions='-Xms28g -Xmx28g' -Djsr166.expensiveTests=true -Djsr166.tckTestClass=ArrayDeque8Test -Djsr166.methodFilter=testHugeCapacity tck
54       */
55 <    public void testHuge() {
55 >    public void testHugeCapacity() {
56          if (! (testImplementationDetails
57                 && expensiveTests
58                 && Runtime.getRuntime().maxMemory() > 24L * (1 << 30)))
59              return;
60  
61 <        ArrayDeque q;
62 <        Integer e = 42;
64 <        final int maxSize = Integer.MAX_VALUE - 8;
61 >        final Item e = fortytwo;
62 >        final int maxArraySize = Integer.MAX_VALUE - 8;
63  
64          assertThrows(OutOfMemoryError.class,
65 <                     () -> new ArrayDeque<>(Integer.MAX_VALUE));
65 >                     () -> new ArrayDeque<Item>(Integer.MAX_VALUE));
66  
67          {
68 <            q = new ArrayDeque<>(maxSize);
69 <            assertEquals(0, q.size());
68 >            ArrayDeque<Object> q = new ArrayDeque<>(maxArraySize - 1);
69 >            mustEqual(0, q.size());
70              assertTrue(q.isEmpty());
71              q = null;
72          }
73  
74          {
75 <            q = new ArrayDeque();
76 <            assertTrue(q.addAll(Collections.nCopies(maxSize - 2, e)));
77 <            assertEquals(e, q.peekFirst());
78 <            assertEquals(e, q.peekLast());
79 <            assertEquals(maxSize - 2, q.size());
80 <            q.addFirst((Integer) 0);
81 <            q.addLast((Integer) 1);
82 <            assertEquals((Integer) 0, q.peekFirst());
83 <            assertEquals((Integer) 1, q.peekLast());
84 <            assertEquals(maxSize, q.size());
85 <
86 <            ArrayDeque qq = q;
87 <            ArrayDeque smallish = new ArrayDeque(
90 <                Collections.nCopies(Integer.MAX_VALUE - maxSize + 1, e));
75 >            ArrayDeque<Object> q = new ArrayDeque<>();
76 >            assertTrue(q.addAll(Collections.nCopies(maxArraySize - 3, e)));
77 >            mustEqual(e, q.peekFirst());
78 >            mustEqual(e, q.peekLast());
79 >            mustEqual(maxArraySize - 3, q.size());
80 >            q.addFirst(zero);
81 >            q.addLast(one);
82 >            mustEqual(zero, q.peekFirst());
83 >            mustEqual(one, q.peekLast());
84 >            mustEqual(maxArraySize - 1, q.size());
85 >
86 >            ArrayDeque<Object> smallish = new ArrayDeque<>(
87 >                Collections.nCopies(Integer.MAX_VALUE - q.size() + 1, e));
88              assertThrows(
89                  IllegalStateException.class,
90 <                () -> qq.addAll(qq),
91 <                () -> qq.addAll(smallish),
92 <                () -> smallish.addAll(qq));
90 >                () -> q.addAll(q),
91 >                () -> q.addAll(smallish),
92 >                () -> smallish.addAll(q));
93          }
94      }
95  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines