1 |
|
/* |
2 |
< |
* Written by members of JCP JSR-166 Expert Group and released to the |
3 |
< |
* public domain. Use, modify, and redistribute this code in any way |
4 |
< |
* without acknowledgement. Other contributors include Andrew Wright, |
5 |
< |
* Jeffrey Hayes, Pat Fischer, Mike Judd. |
2 |
> |
* Written by Doug Lea with assistance from members of JCP JSR-166 |
3 |
> |
* Expert Group and released to the public domain, as explained at |
4 |
> |
* http://creativecommons.org/publicdomain/zero/1.0/ |
5 |
> |
* Other contributors include Andrew Wright, Jeffrey Hayes, |
6 |
> |
* Pat Fisher, Mike Judd. |
7 |
|
*/ |
8 |
|
|
9 |
< |
import junit.framework.*; |
10 |
< |
import java.util.*; |
11 |
< |
import java.util.concurrent.*; |
12 |
< |
import java.io.*; |
9 |
> |
import java.util.Arrays; |
10 |
> |
import java.util.Collection; |
11 |
> |
import java.util.Comparator; |
12 |
> |
import java.util.Iterator; |
13 |
> |
import java.util.NoSuchElementException; |
14 |
> |
import java.util.PriorityQueue; |
15 |
> |
import java.util.Queue; |
16 |
> |
|
17 |
> |
import junit.framework.Test; |
18 |
|
|
19 |
|
public class PriorityQueueTest extends JSR166TestCase { |
20 |
|
public static void main(String[] args) { |
21 |
< |
junit.textui.TestRunner.run (suite()); |
21 |
> |
main(suite(), args); |
22 |
|
} |
23 |
|
public static Test suite() { |
24 |
< |
return new TestSuite(PriorityQueueTest.class); |
24 |
> |
class Implementation implements CollectionImplementation { |
25 |
> |
public Class<?> klazz() { return PriorityQueue.class; } |
26 |
> |
public Collection emptyCollection() { return new PriorityQueue(); } |
27 |
> |
public Object makeElement(int i) { return i; } |
28 |
> |
public boolean isConcurrent() { return false; } |
29 |
> |
public boolean permitsNulls() { return false; } |
30 |
> |
} |
31 |
> |
return newTestSuite(PriorityQueueTest.class, |
32 |
> |
CollectionTest.testSuite(new Implementation())); |
33 |
|
} |
34 |
|
|
35 |
< |
static class MyReverseComparator implements Comparator { |
35 |
> |
static class MyReverseComparator implements Comparator { |
36 |
|
public int compare(Object x, Object y) { |
37 |
< |
int i = ((Integer)x).intValue(); |
24 |
< |
int j = ((Integer)y).intValue(); |
25 |
< |
if (i < j) return 1; |
26 |
< |
if (i > j) return -1; |
27 |
< |
return 0; |
37 |
> |
return ((Comparable)y).compareTo(x); |
38 |
|
} |
39 |
|
} |
40 |
|
|
41 |
|
/** |
42 |
< |
* Create a queue of given size containing consecutive |
43 |
< |
* Integers 0 ... n. |
42 |
> |
* Returns a new queue of given size containing consecutive |
43 |
> |
* Integers 0 ... n - 1. |
44 |
|
*/ |
45 |
< |
private PriorityQueue populatedQueue(int n) { |
46 |
< |
PriorityQueue q = new PriorityQueue(n); |
45 |
> |
private static PriorityQueue<Integer> populatedQueue(int n) { |
46 |
> |
PriorityQueue<Integer> q = new PriorityQueue<>(n); |
47 |
|
assertTrue(q.isEmpty()); |
48 |
< |
for(int i = n-1; i >= 0; i-=2) |
49 |
< |
assertTrue(q.offer(new Integer(i))); |
50 |
< |
for(int i = (n & 1); i < n; i+=2) |
51 |
< |
assertTrue(q.offer(new Integer(i))); |
48 |
> |
for (int i = n - 1; i >= 0; i -= 2) |
49 |
> |
assertTrue(q.offer(new Integer(i))); |
50 |
> |
for (int i = (n & 1); i < n; i += 2) |
51 |
> |
assertTrue(q.offer(new Integer(i))); |
52 |
|
assertFalse(q.isEmpty()); |
53 |
< |
assertEquals(n, q.size()); |
53 |
> |
assertEquals(n, q.size()); |
54 |
> |
assertEquals((Integer) 0, q.peek()); |
55 |
|
return q; |
56 |
|
} |
57 |
< |
|
57 |
> |
|
58 |
|
/** |
59 |
|
* A new queue has unbounded capacity |
60 |
|
*/ |
63 |
|
} |
64 |
|
|
65 |
|
/** |
66 |
< |
* Constructor throws IAE if capacity argument nonpositive |
66 |
> |
* Constructor throws IllegalArgumentException if capacity argument nonpositive |
67 |
|
*/ |
68 |
|
public void testConstructor2() { |
69 |
|
try { |
70 |
< |
PriorityQueue q = new PriorityQueue(0); |
70 |
> |
new PriorityQueue(0); |
71 |
|
shouldThrow(); |
72 |
< |
} |
62 |
< |
catch (IllegalArgumentException success) {} |
72 |
> |
} catch (IllegalArgumentException success) {} |
73 |
|
} |
74 |
|
|
75 |
|
/** |
77 |
|
*/ |
78 |
|
public void testConstructor3() { |
79 |
|
try { |
80 |
< |
PriorityQueue q = new PriorityQueue((Collection)null); |
80 |
> |
new PriorityQueue((Collection)null); |
81 |
|
shouldThrow(); |
82 |
< |
} |
73 |
< |
catch (NullPointerException success) {} |
82 |
> |
} catch (NullPointerException success) {} |
83 |
|
} |
84 |
|
|
85 |
|
/** |
87 |
|
*/ |
88 |
|
public void testConstructor4() { |
89 |
|
try { |
90 |
< |
Integer[] ints = new Integer[SIZE]; |
82 |
< |
PriorityQueue q = new PriorityQueue(Arrays.asList(ints)); |
90 |
> |
new PriorityQueue(Arrays.asList(new Integer[SIZE])); |
91 |
|
shouldThrow(); |
92 |
< |
} |
85 |
< |
catch (NullPointerException success) {} |
92 |
> |
} catch (NullPointerException success) {} |
93 |
|
} |
94 |
|
|
95 |
|
/** |
96 |
|
* Initializing from Collection with some null elements throws NPE |
97 |
|
*/ |
98 |
|
public void testConstructor5() { |
99 |
+ |
Integer[] ints = new Integer[SIZE]; |
100 |
+ |
for (int i = 0; i < SIZE - 1; ++i) |
101 |
+ |
ints[i] = new Integer(i); |
102 |
|
try { |
103 |
< |
Integer[] ints = new Integer[SIZE]; |
94 |
< |
for (int i = 0; i < SIZE-1; ++i) |
95 |
< |
ints[i] = new Integer(i); |
96 |
< |
PriorityQueue q = new PriorityQueue(Arrays.asList(ints)); |
103 |
> |
new PriorityQueue(Arrays.asList(ints)); |
104 |
|
shouldThrow(); |
105 |
< |
} |
99 |
< |
catch (NullPointerException success) {} |
105 |
> |
} catch (NullPointerException success) {} |
106 |
|
} |
107 |
|
|
108 |
|
/** |
109 |
|
* Queue contains all elements of collection used to initialize |
110 |
|
*/ |
111 |
|
public void testConstructor6() { |
112 |
< |
try { |
113 |
< |
Integer[] ints = new Integer[SIZE]; |
114 |
< |
for (int i = 0; i < SIZE; ++i) |
115 |
< |
ints[i] = new Integer(i); |
116 |
< |
PriorityQueue q = new PriorityQueue(Arrays.asList(ints)); |
117 |
< |
for (int i = 0; i < SIZE; ++i) |
112 |
< |
assertEquals(ints[i], q.poll()); |
113 |
< |
} |
114 |
< |
finally {} |
112 |
> |
Integer[] ints = new Integer[SIZE]; |
113 |
> |
for (int i = 0; i < SIZE; ++i) |
114 |
> |
ints[i] = new Integer(i); |
115 |
> |
PriorityQueue q = new PriorityQueue(Arrays.asList(ints)); |
116 |
> |
for (int i = 0; i < SIZE; ++i) |
117 |
> |
assertEquals(ints[i], q.poll()); |
118 |
|
} |
119 |
|
|
120 |
|
/** |
121 |
|
* The comparator used in constructor is used |
122 |
|
*/ |
123 |
|
public void testConstructor7() { |
124 |
< |
try { |
125 |
< |
MyReverseComparator cmp = new MyReverseComparator(); |
126 |
< |
PriorityQueue q = new PriorityQueue(SIZE, cmp); |
127 |
< |
assertEquals(cmp, q.comparator()); |
128 |
< |
Integer[] ints = new Integer[SIZE]; |
129 |
< |
for (int i = 0; i < SIZE; ++i) |
130 |
< |
ints[i] = new Integer(i); |
131 |
< |
q.addAll(Arrays.asList(ints)); |
132 |
< |
for (int i = SIZE-1; i >= 0; --i) |
130 |
< |
assertEquals(ints[i], q.poll()); |
131 |
< |
} |
132 |
< |
finally {} |
124 |
> |
MyReverseComparator cmp = new MyReverseComparator(); |
125 |
> |
PriorityQueue q = new PriorityQueue(SIZE, cmp); |
126 |
> |
assertEquals(cmp, q.comparator()); |
127 |
> |
Integer[] ints = new Integer[SIZE]; |
128 |
> |
for (int i = 0; i < SIZE; ++i) |
129 |
> |
ints[i] = new Integer(i); |
130 |
> |
q.addAll(Arrays.asList(ints)); |
131 |
> |
for (int i = SIZE - 1; i >= 0; --i) |
132 |
> |
assertEquals(ints[i], q.poll()); |
133 |
|
} |
134 |
|
|
135 |
|
/** |
152 |
|
public void testSize() { |
153 |
|
PriorityQueue q = populatedQueue(SIZE); |
154 |
|
for (int i = 0; i < SIZE; ++i) { |
155 |
< |
assertEquals(SIZE-i, q.size()); |
155 |
> |
assertEquals(SIZE - i, q.size()); |
156 |
|
q.remove(); |
157 |
|
} |
158 |
|
for (int i = 0; i < SIZE; ++i) { |
165 |
|
* offer(null) throws NPE |
166 |
|
*/ |
167 |
|
public void testOfferNull() { |
168 |
< |
try { |
169 |
< |
PriorityQueue q = new PriorityQueue(1); |
168 |
> |
PriorityQueue q = new PriorityQueue(1); |
169 |
> |
try { |
170 |
|
q.offer(null); |
171 |
|
shouldThrow(); |
172 |
< |
} catch (NullPointerException success) { } |
172 |
> |
} catch (NullPointerException success) {} |
173 |
|
} |
174 |
|
|
175 |
|
/** |
176 |
|
* add(null) throws NPE |
177 |
|
*/ |
178 |
|
public void testAddNull() { |
179 |
< |
try { |
180 |
< |
PriorityQueue q = new PriorityQueue(1); |
179 |
> |
PriorityQueue q = new PriorityQueue(1); |
180 |
> |
try { |
181 |
|
q.add(null); |
182 |
|
shouldThrow(); |
183 |
< |
} catch (NullPointerException success) { } |
183 |
> |
} catch (NullPointerException success) {} |
184 |
|
} |
185 |
|
|
186 |
|
/** |
196 |
|
* Offer of non-Comparable throws CCE |
197 |
|
*/ |
198 |
|
public void testOfferNonComparable() { |
199 |
+ |
PriorityQueue q = new PriorityQueue(1); |
200 |
|
try { |
200 |
– |
PriorityQueue q = new PriorityQueue(1); |
201 |
– |
q.offer(new Object()); |
202 |
– |
q.offer(new Object()); |
201 |
|
q.offer(new Object()); |
202 |
|
shouldThrow(); |
203 |
+ |
} catch (ClassCastException success) { |
204 |
+ |
assertTrue(q.isEmpty()); |
205 |
+ |
assertEquals(0, q.size()); |
206 |
+ |
assertNull(q.poll()); |
207 |
|
} |
206 |
– |
catch(ClassCastException success) {} |
208 |
|
} |
209 |
|
|
210 |
|
/** |
222 |
|
* addAll(null) throws NPE |
223 |
|
*/ |
224 |
|
public void testAddAll1() { |
225 |
+ |
PriorityQueue q = new PriorityQueue(1); |
226 |
|
try { |
225 |
– |
PriorityQueue q = new PriorityQueue(1); |
227 |
|
q.addAll(null); |
228 |
|
shouldThrow(); |
229 |
< |
} |
229 |
< |
catch (NullPointerException success) {} |
229 |
> |
} catch (NullPointerException success) {} |
230 |
|
} |
231 |
+ |
|
232 |
|
/** |
233 |
|
* addAll of a collection with null elements throws NPE |
234 |
|
*/ |
235 |
|
public void testAddAll2() { |
236 |
+ |
PriorityQueue q = new PriorityQueue(SIZE); |
237 |
|
try { |
238 |
< |
PriorityQueue q = new PriorityQueue(SIZE); |
237 |
< |
Integer[] ints = new Integer[SIZE]; |
238 |
< |
q.addAll(Arrays.asList(ints)); |
238 |
> |
q.addAll(Arrays.asList(new Integer[SIZE])); |
239 |
|
shouldThrow(); |
240 |
< |
} |
241 |
< |
catch (NullPointerException success) {} |
240 |
> |
} catch (NullPointerException success) {} |
241 |
|
} |
242 |
+ |
|
243 |
|
/** |
244 |
|
* addAll of a collection with any null elements throws NPE after |
245 |
|
* possibly adding some elements |
246 |
|
*/ |
247 |
|
public void testAddAll3() { |
248 |
+ |
PriorityQueue q = new PriorityQueue(SIZE); |
249 |
+ |
Integer[] ints = new Integer[SIZE]; |
250 |
+ |
for (int i = 0; i < SIZE - 1; ++i) |
251 |
+ |
ints[i] = new Integer(i); |
252 |
|
try { |
249 |
– |
PriorityQueue q = new PriorityQueue(SIZE); |
250 |
– |
Integer[] ints = new Integer[SIZE]; |
251 |
– |
for (int i = 0; i < SIZE-1; ++i) |
252 |
– |
ints[i] = new Integer(i); |
253 |
|
q.addAll(Arrays.asList(ints)); |
254 |
|
shouldThrow(); |
255 |
< |
} |
256 |
< |
catch (NullPointerException success) {} |
255 |
> |
} catch (NullPointerException success) {} |
256 |
|
} |
257 |
|
|
258 |
|
/** |
259 |
|
* Queue contains all elements of successful addAll |
260 |
|
*/ |
261 |
|
public void testAddAll5() { |
262 |
< |
try { |
263 |
< |
Integer[] empty = new Integer[0]; |
264 |
< |
Integer[] ints = new Integer[SIZE]; |
265 |
< |
for (int i = 0; i < SIZE; ++i) |
266 |
< |
ints[i] = new Integer(SIZE-1-i); |
267 |
< |
PriorityQueue q = new PriorityQueue(SIZE); |
268 |
< |
assertFalse(q.addAll(Arrays.asList(empty))); |
269 |
< |
assertTrue(q.addAll(Arrays.asList(ints))); |
270 |
< |
for (int i = 0; i < SIZE; ++i) |
272 |
< |
assertEquals(new Integer(i), q.poll()); |
273 |
< |
} |
274 |
< |
finally {} |
262 |
> |
Integer[] empty = new Integer[0]; |
263 |
> |
Integer[] ints = new Integer[SIZE]; |
264 |
> |
for (int i = 0; i < SIZE; ++i) |
265 |
> |
ints[i] = new Integer(SIZE - 1 - i); |
266 |
> |
PriorityQueue q = new PriorityQueue(SIZE); |
267 |
> |
assertFalse(q.addAll(Arrays.asList(empty))); |
268 |
> |
assertTrue(q.addAll(Arrays.asList(ints))); |
269 |
> |
for (int i = 0; i < SIZE; ++i) |
270 |
> |
assertEquals(new Integer(i), q.poll()); |
271 |
|
} |
272 |
|
|
273 |
|
/** |
276 |
|
public void testPoll() { |
277 |
|
PriorityQueue q = populatedQueue(SIZE); |
278 |
|
for (int i = 0; i < SIZE; ++i) { |
279 |
< |
assertEquals(i, ((Integer)q.poll()).intValue()); |
279 |
> |
assertEquals(i, q.poll()); |
280 |
|
} |
281 |
< |
assertNull(q.poll()); |
281 |
> |
assertNull(q.poll()); |
282 |
|
} |
283 |
|
|
284 |
|
/** |
287 |
|
public void testPeek() { |
288 |
|
PriorityQueue q = populatedQueue(SIZE); |
289 |
|
for (int i = 0; i < SIZE; ++i) { |
290 |
< |
assertEquals(i, ((Integer)q.peek()).intValue()); |
291 |
< |
q.poll(); |
290 |
> |
assertEquals(i, q.peek()); |
291 |
> |
assertEquals(i, q.poll()); |
292 |
|
assertTrue(q.peek() == null || |
293 |
< |
i != ((Integer)q.peek()).intValue()); |
293 |
> |
!q.peek().equals(i)); |
294 |
|
} |
295 |
< |
assertNull(q.peek()); |
295 |
> |
assertNull(q.peek()); |
296 |
|
} |
297 |
|
|
298 |
|
/** |
301 |
|
public void testElement() { |
302 |
|
PriorityQueue q = populatedQueue(SIZE); |
303 |
|
for (int i = 0; i < SIZE; ++i) { |
304 |
< |
assertEquals(i, ((Integer)q.element()).intValue()); |
305 |
< |
q.poll(); |
304 |
> |
assertEquals(i, q.element()); |
305 |
> |
assertEquals(i, q.poll()); |
306 |
|
} |
307 |
|
try { |
308 |
|
q.element(); |
309 |
|
shouldThrow(); |
310 |
< |
} |
315 |
< |
catch (NoSuchElementException success) {} |
310 |
> |
} catch (NoSuchElementException success) {} |
311 |
|
} |
312 |
|
|
313 |
|
/** |
316 |
|
public void testRemove() { |
317 |
|
PriorityQueue q = populatedQueue(SIZE); |
318 |
|
for (int i = 0; i < SIZE; ++i) { |
319 |
< |
assertEquals(i, ((Integer)q.remove()).intValue()); |
319 |
> |
assertEquals(i, q.remove()); |
320 |
|
} |
321 |
|
try { |
322 |
|
q.remove(); |
323 |
|
shouldThrow(); |
324 |
< |
} catch (NoSuchElementException success){ |
330 |
< |
} |
324 |
> |
} catch (NoSuchElementException success) {} |
325 |
|
} |
326 |
|
|
327 |
|
/** |
329 |
|
*/ |
330 |
|
public void testRemoveElement() { |
331 |
|
PriorityQueue q = populatedQueue(SIZE); |
332 |
< |
for (int i = 1; i < SIZE; i+=2) { |
333 |
< |
assertTrue(q.remove(new Integer(i))); |
334 |
< |
} |
335 |
< |
for (int i = 0; i < SIZE; i+=2) { |
336 |
< |
assertTrue(q.remove(new Integer(i))); |
337 |
< |
assertFalse(q.remove(new Integer(i+1))); |
332 |
> |
for (int i = 1; i < SIZE; i += 2) { |
333 |
> |
assertTrue(q.contains(i)); |
334 |
> |
assertTrue(q.remove(i)); |
335 |
> |
assertFalse(q.contains(i)); |
336 |
> |
assertTrue(q.contains(i - 1)); |
337 |
> |
} |
338 |
> |
for (int i = 0; i < SIZE; i += 2) { |
339 |
> |
assertTrue(q.contains(i)); |
340 |
> |
assertTrue(q.remove(i)); |
341 |
> |
assertFalse(q.contains(i)); |
342 |
> |
assertFalse(q.remove(i + 1)); |
343 |
> |
assertFalse(q.contains(i + 1)); |
344 |
|
} |
345 |
|
assertTrue(q.isEmpty()); |
346 |
|
} |
347 |
< |
|
347 |
> |
|
348 |
|
/** |
349 |
|
* contains(x) reports true when elements added but not yet removed |
350 |
|
*/ |
399 |
|
assertTrue(changed); |
400 |
|
|
401 |
|
assertTrue(q.containsAll(p)); |
402 |
< |
assertEquals(SIZE-i, q.size()); |
402 |
> |
assertEquals(SIZE - i, q.size()); |
403 |
|
p.remove(); |
404 |
|
} |
405 |
|
} |
412 |
|
PriorityQueue q = populatedQueue(SIZE); |
413 |
|
PriorityQueue p = populatedQueue(i); |
414 |
|
assertTrue(q.removeAll(p)); |
415 |
< |
assertEquals(SIZE-i, q.size()); |
415 |
> |
assertEquals(SIZE - i, q.size()); |
416 |
|
for (int j = 0; j < i; ++j) { |
417 |
< |
Integer I = (Integer)(p.remove()); |
418 |
< |
assertFalse(q.contains(I)); |
417 |
> |
Integer x = (Integer)(p.remove()); |
418 |
> |
assertFalse(q.contains(x)); |
419 |
|
} |
420 |
|
} |
421 |
|
} |
425 |
|
*/ |
426 |
|
public void testToArray() { |
427 |
|
PriorityQueue q = populatedQueue(SIZE); |
428 |
< |
Object[] o = q.toArray(); |
428 |
> |
Object[] o = q.toArray(); |
429 |
|
Arrays.sort(o); |
430 |
< |
for(int i = 0; i < o.length; i++) |
431 |
< |
assertEquals(o[i], q.poll()); |
430 |
> |
for (int i = 0; i < o.length; i++) |
431 |
> |
assertSame(o[i], q.poll()); |
432 |
|
} |
433 |
|
|
434 |
|
/** |
435 |
|
* toArray(a) contains all elements |
436 |
|
*/ |
437 |
|
public void testToArray2() { |
438 |
< |
PriorityQueue q = populatedQueue(SIZE); |
439 |
< |
Integer[] ints = new Integer[SIZE]; |
440 |
< |
ints = (Integer[])q.toArray(ints); |
438 |
> |
PriorityQueue<Integer> q = populatedQueue(SIZE); |
439 |
> |
Integer[] ints = new Integer[SIZE]; |
440 |
> |
Integer[] array = q.toArray(ints); |
441 |
> |
assertSame(ints, array); |
442 |
|
Arrays.sort(ints); |
443 |
< |
for(int i = 0; i < ints.length; i++) |
444 |
< |
assertEquals(ints[i], q.poll()); |
443 |
> |
for (int i = 0; i < ints.length; i++) |
444 |
> |
assertSame(ints[i], q.poll()); |
445 |
|
} |
446 |
< |
|
446 |
> |
|
447 |
|
/** |
448 |
|
* iterator iterates through all elements |
449 |
|
*/ |
450 |
|
public void testIterator() { |
451 |
|
PriorityQueue q = populatedQueue(SIZE); |
452 |
< |
int i = 0; |
453 |
< |
Iterator it = q.iterator(); |
454 |
< |
while(it.hasNext()) { |
452 |
> |
Iterator it = q.iterator(); |
453 |
> |
int i; |
454 |
> |
for (i = 0; it.hasNext(); i++) |
455 |
|
assertTrue(q.contains(it.next())); |
455 |
– |
++i; |
456 |
– |
} |
456 |
|
assertEquals(i, SIZE); |
457 |
+ |
assertIteratorExhausted(it); |
458 |
+ |
} |
459 |
+ |
|
460 |
+ |
/** |
461 |
+ |
* iterator of empty collection has no elements |
462 |
+ |
*/ |
463 |
+ |
public void testEmptyIterator() { |
464 |
+ |
assertIteratorExhausted(new PriorityQueue().iterator()); |
465 |
|
} |
466 |
|
|
467 |
|
/** |
468 |
|
* iterator.remove removes current element |
469 |
|
*/ |
470 |
< |
public void testIteratorRemove () { |
470 |
> |
public void testIteratorRemove() { |
471 |
|
final PriorityQueue q = new PriorityQueue(3); |
472 |
|
q.add(new Integer(2)); |
473 |
|
q.add(new Integer(1)); |
483 |
|
assertFalse(it.hasNext()); |
484 |
|
} |
485 |
|
|
479 |
– |
|
486 |
|
/** |
487 |
|
* toString contains toStrings of elements |
488 |
|
*/ |
490 |
|
PriorityQueue q = populatedQueue(SIZE); |
491 |
|
String s = q.toString(); |
492 |
|
for (int i = 0; i < SIZE; ++i) { |
493 |
< |
assertTrue(s.indexOf(String.valueOf(i)) >= 0); |
493 |
> |
assertTrue(s.contains(String.valueOf(i))); |
494 |
|
} |
495 |
< |
} |
495 |
> |
} |
496 |
|
|
497 |
|
/** |
498 |
< |
* A deserialized serialized queue has same elements |
498 |
> |
* A deserialized/reserialized queue has same elements |
499 |
|
*/ |
500 |
< |
public void testSerialization() { |
501 |
< |
PriorityQueue q = populatedQueue(SIZE); |
502 |
< |
try { |
497 |
< |
ByteArrayOutputStream bout = new ByteArrayOutputStream(10000); |
498 |
< |
ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout)); |
499 |
< |
out.writeObject(q); |
500 |
< |
out.close(); |
500 |
> |
public void testSerialization() throws Exception { |
501 |
> |
Queue x = populatedQueue(SIZE); |
502 |
> |
Queue y = serialClone(x); |
503 |
|
|
504 |
< |
ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); |
505 |
< |
ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin)); |
506 |
< |
PriorityQueue r = (PriorityQueue)in.readObject(); |
507 |
< |
assertEquals(q.size(), r.size()); |
508 |
< |
while (!q.isEmpty()) |
507 |
< |
assertEquals(q.remove(), r.remove()); |
508 |
< |
} catch(Exception e){ |
509 |
< |
unexpectedException(); |
504 |
> |
assertNotSame(x, y); |
505 |
> |
assertEquals(x.size(), y.size()); |
506 |
> |
while (!x.isEmpty()) { |
507 |
> |
assertFalse(y.isEmpty()); |
508 |
> |
assertEquals(x.remove(), y.remove()); |
509 |
|
} |
510 |
+ |
assertTrue(y.isEmpty()); |
511 |
|
} |
512 |
|
} |