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); |
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(); |
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(); |
79 |
|
*/ |
80 |
|
public void testRemoveS() { |
81 |
|
Succeed q = new Succeed(); |
82 |
< |
q.remove(); |
82 |
> |
assertSame(one, q.remove()); |
83 |
|
} |
84 |
|
|
85 |
|
/** |
113 |
|
} |
114 |
|
|
115 |
|
/** |
116 |
< |
* addAll(null) throws NPE |
116 |
> |
* addAll(null) throws NullPointerException |
117 |
|
*/ |
118 |
|
public void testAddAll1() { |
119 |
|
Succeed q = new Succeed(); |
124 |
|
} |
125 |
|
|
126 |
|
/** |
127 |
< |
* addAll(this) throws IAE |
127 |
> |
* addAll(this) throws IllegalArgumentException |
128 |
|
*/ |
129 |
|
public void testAddAllSelf() { |
130 |
|
Succeed q = new Succeed(); |
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(); |
153 |
|
public void testAddAll3() { |
154 |
|
Succeed q = new Succeed(); |
155 |
|
Integer[] ints = new Integer[SIZE]; |
156 |
< |
for (int i = 0; i < SIZE-1; ++i) |
156 |
> |
for (int i = 0; i < SIZE - 1; ++i) |
157 |
|
ints[i] = new Integer(i); |
158 |
|
try { |
159 |
|
q.addAll(Arrays.asList(ints)); |
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 { |
169 |
– |
Fail q = new Fail(); |
170 |
– |
Integer[] ints = new Integer[SIZE]; |
171 |
– |
for (int i = 0; i < SIZE; ++i) |
172 |
– |
ints[i] = new Integer(i); |
173 |
|
q.addAll(Arrays.asList(ints)); |
174 |
|
shouldThrow(); |
175 |
|
} catch (IllegalStateException success) {} |