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

Comparing jsr166/src/test/tck/AbstractQueueTest.java (file contents):
Revision 1.8 by jsr166, Fri May 27 19:07:06 2011 UTC vs.
Revision 1.17 by jsr166, Wed Jan 10 16:46:21 2018 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
10 < import java.util.*;
11 < import java.util.concurrent.*;
12 < import java.util.concurrent.locks.*;
13 < import java.io.*;
9 > import java.util.AbstractQueue;
10 > import java.util.Arrays;
11 > import java.util.Iterator;
12 > import java.util.NoSuchElementException;
13 >
14 > import junit.framework.Test;
15 > import junit.framework.TestSuite;
16  
17   public class AbstractQueueTest extends JSR166TestCase {
18      public static void main(String[] args) {
19 <        junit.textui.TestRunner.run(suite());
19 >        main(suite(), args);
20      }
21      public static Test suite() {
22          return new TestSuite(AbstractQueueTest.class);
# Line 51 | Line 53 | public class AbstractQueueTest extends J
53      }
54  
55      /**
56 <     * add throws ISE true if offer fails
56 >     * add throws IllegalStateException if offer fails
57       */
58      public void testAddF() {
59          Fail q = new Fail();
# Line 62 | Line 64 | public class AbstractQueueTest extends J
64      }
65  
66      /**
67 <     * add throws NPE if offer does
67 >     * add throws NullPointerException if offer does
68       */
69      public void testAddNPE() {
70          Succeed q = new Succeed();
# Line 77 | Line 79 | public class AbstractQueueTest extends J
79       */
80      public void testRemoveS() {
81          Succeed q = new Succeed();
82 <        q.remove();
82 >        assertSame(one, q.remove());
83      }
84  
85      /**
# Line 111 | Line 113 | public class AbstractQueueTest extends J
113      }
114  
115      /**
116 <     * addAll(null) throws NPE
116 >     * addAll(null) throws NullPointerException
117       */
118      public void testAddAll1() {
119 +        Succeed q = new Succeed();
120          try {
118            Succeed q = new Succeed();
121              q.addAll(null);
122              shouldThrow();
123          } catch (NullPointerException success) {}
124      }
125  
126      /**
127 <     * addAll(this) throws IAE
127 >     * addAll(this) throws IllegalArgumentException
128       */
129      public void testAddAllSelf() {
130 +        Succeed q = new Succeed();
131          try {
129            Succeed q = new Succeed();
132              q.addAll(q);
133              shouldThrow();
134          } catch (IllegalArgumentException success) {}
135      }
136  
137      /**
138 <     * addAll of a collection with null elements throws NPE
138 >     * addAll of a collection with null elements throws NullPointerException
139       */
140      public void testAddAll2() {
141 +        Succeed q = new Succeed();
142 +        Integer[] ints = new Integer[SIZE];
143          try {
140            Succeed q = new Succeed();
141            Integer[] ints = new Integer[SIZE];
144              q.addAll(Arrays.asList(ints));
145              shouldThrow();
146          } catch (NullPointerException success) {}
# Line 149 | Line 151 | public class AbstractQueueTest extends J
151       * possibly adding some elements
152       */
153      public void testAddAll3() {
154 +        Succeed q = new Succeed();
155 +        Integer[] ints = new Integer[SIZE];
156 +        for (int i = 0; i < SIZE - 1; ++i)
157 +            ints[i] = new Integer(i);
158          try {
153            Succeed q = new Succeed();
154            Integer[] ints = new Integer[SIZE];
155            for (int i = 0; i < SIZE-1; ++i)
156                ints[i] = new Integer(i);
159              q.addAll(Arrays.asList(ints));
160              shouldThrow();
161          } catch (NullPointerException success) {}
162      }
163  
164      /**
165 <     * addAll throws ISE if an add fails
165 >     * addAll throws IllegalStateException if an add fails
166       */
167      public void testAddAll4() {
168 +        Fail q = new Fail();
169 +        Integer[] ints = new Integer[SIZE];
170 +        for (int i = 0; i < SIZE; ++i)
171 +            ints[i] = new Integer(i);
172          try {
167            Fail q = new Fail();
168            Integer[] ints = new Integer[SIZE];
169            for (int i = 0; i < SIZE; ++i)
170                ints[i] = new Integer(i);
173              q.addAll(Arrays.asList(ints));
174              shouldThrow();
175          } catch (IllegalStateException success) {}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines