| 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 |
< |
public class PriorityQueueTest extends JSR166TestCase { |
| 17 |
> |
import junit.framework.Test; |
| 18 |
> |
import junit.framework.TestSuite; |
| 19 |
|
|
| 20 |
+ |
public class PriorityQueueTest extends JSR166TestCase { |
| 21 |
|
public static void main(String[] args) { |
| 22 |
< |
junit.textui.TestRunner.run (suite()); |
| 22 |
> |
junit.textui.TestRunner.run(suite()); |
| 23 |
|
} |
| 18 |
– |
|
| 24 |
|
public static Test suite() { |
| 25 |
< |
return new TestSuite(PriorityQueueTest.class); |
| 25 |
> |
return new TestSuite(PriorityQueueTest.class); |
| 26 |
|
} |
| 27 |
|
|
| 28 |
< |
static class MyReverseComparator implements Comparator { |
| 28 |
> |
static class MyReverseComparator implements Comparator { |
| 29 |
|
public int compare(Object x, Object y) { |
| 30 |
< |
int i = ((Integer)x).intValue(); |
| 26 |
< |
int j = ((Integer)y).intValue(); |
| 27 |
< |
if (i < j) return 1; |
| 28 |
< |
if (i > j) return -1; |
| 29 |
< |
return 0; |
| 30 |
> |
return ((Comparable)y).compareTo(x); |
| 31 |
|
} |
| 32 |
|
} |
| 33 |
|
|
| 33 |
– |
|
| 34 |
|
/** |
| 35 |
< |
* Create a queue of given size containing consecutive |
| 35 |
> |
* Returns a new queue of given size containing consecutive |
| 36 |
|
* Integers 0 ... n. |
| 37 |
|
*/ |
| 38 |
< |
private PriorityQueue populatedQueue(int n) { |
| 39 |
< |
PriorityQueue q = new PriorityQueue(n); |
| 38 |
> |
private PriorityQueue<Integer> populatedQueue(int n) { |
| 39 |
> |
PriorityQueue<Integer> q = new PriorityQueue<Integer>(n); |
| 40 |
|
assertTrue(q.isEmpty()); |
| 41 |
< |
for(int i = n-1; i >= 0; i-=2) |
| 42 |
< |
assertTrue(q.offer(new Integer(i))); |
| 43 |
< |
for(int i = (n & 1); i < n; i+=2) |
| 44 |
< |
assertTrue(q.offer(new Integer(i))); |
| 41 |
> |
for (int i = n-1; i >= 0; i -= 2) |
| 42 |
> |
assertTrue(q.offer(new Integer(i))); |
| 43 |
> |
for (int i = (n & 1); i < n; i += 2) |
| 44 |
> |
assertTrue(q.offer(new Integer(i))); |
| 45 |
|
assertFalse(q.isEmpty()); |
| 46 |
< |
assertEquals(n, q.size()); |
| 46 |
> |
assertEquals(n, q.size()); |
| 47 |
|
return q; |
| 48 |
|
} |
| 49 |
< |
|
| 49 |
> |
|
| 50 |
|
/** |
| 51 |
< |
* |
| 51 |
> |
* A new queue has unbounded capacity |
| 52 |
|
*/ |
| 53 |
|
public void testConstructor1() { |
| 54 |
|
assertEquals(0, new PriorityQueue(SIZE).size()); |
| 55 |
|
} |
| 56 |
|
|
| 57 |
|
/** |
| 58 |
< |
* |
| 58 |
> |
* Constructor throws IAE if capacity argument nonpositive |
| 59 |
|
*/ |
| 60 |
|
public void testConstructor2() { |
| 61 |
|
try { |
| 62 |
< |
PriorityQueue q = new PriorityQueue(0); |
| 62 |
> |
new PriorityQueue(0); |
| 63 |
|
shouldThrow(); |
| 64 |
< |
} |
| 65 |
< |
catch (IllegalArgumentException success) {} |
| 64 |
> |
} catch (IllegalArgumentException success) {} |
| 65 |
|
} |
| 66 |
|
|
| 67 |
|
/** |
| 68 |
< |
* |
| 68 |
> |
* Initializing from null Collection throws NPE |
| 69 |
|
*/ |
| 70 |
|
public void testConstructor3() { |
| 72 |
– |
|
| 71 |
|
try { |
| 72 |
< |
PriorityQueue q = new PriorityQueue((Collection)null); |
| 72 |
> |
new PriorityQueue((Collection)null); |
| 73 |
|
shouldThrow(); |
| 74 |
< |
} |
| 77 |
< |
catch (NullPointerException success) {} |
| 74 |
> |
} catch (NullPointerException success) {} |
| 75 |
|
} |
| 76 |
|
|
| 77 |
|
/** |
| 78 |
< |
* |
| 78 |
> |
* Initializing from Collection of null elements throws NPE |
| 79 |
|
*/ |
| 80 |
|
public void testConstructor4() { |
| 81 |
|
try { |
| 82 |
|
Integer[] ints = new Integer[SIZE]; |
| 83 |
< |
PriorityQueue q = new PriorityQueue(Arrays.asList(ints)); |
| 83 |
> |
new PriorityQueue(Arrays.asList(ints)); |
| 84 |
|
shouldThrow(); |
| 85 |
< |
} |
| 89 |
< |
catch (NullPointerException success) {} |
| 85 |
> |
} catch (NullPointerException success) {} |
| 86 |
|
} |
| 87 |
|
|
| 88 |
|
/** |
| 89 |
< |
* |
| 89 |
> |
* Initializing from Collection with some null elements throws NPE |
| 90 |
|
*/ |
| 91 |
|
public void testConstructor5() { |
| 92 |
|
try { |
| 93 |
|
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)); |
| 96 |
> |
new PriorityQueue(Arrays.asList(ints)); |
| 97 |
|
shouldThrow(); |
| 98 |
< |
} |
| 103 |
< |
catch (NullPointerException success) {} |
| 98 |
> |
} catch (NullPointerException success) {} |
| 99 |
|
} |
| 100 |
|
|
| 101 |
|
/** |
| 102 |
< |
* |
| 102 |
> |
* Queue contains all elements of collection used to initialize |
| 103 |
|
*/ |
| 104 |
|
public void testConstructor6() { |
| 105 |
< |
try { |
| 106 |
< |
Integer[] ints = new Integer[SIZE]; |
| 107 |
< |
for (int i = 0; i < SIZE; ++i) |
| 108 |
< |
ints[i] = new Integer(i); |
| 109 |
< |
PriorityQueue q = new PriorityQueue(Arrays.asList(ints)); |
| 110 |
< |
for (int i = 0; i < SIZE; ++i) |
| 116 |
< |
assertEquals(ints[i], q.poll()); |
| 117 |
< |
} |
| 118 |
< |
finally {} |
| 105 |
> |
Integer[] ints = new Integer[SIZE]; |
| 106 |
> |
for (int i = 0; i < SIZE; ++i) |
| 107 |
> |
ints[i] = new Integer(i); |
| 108 |
> |
PriorityQueue q = new PriorityQueue(Arrays.asList(ints)); |
| 109 |
> |
for (int i = 0; i < SIZE; ++i) |
| 110 |
> |
assertEquals(ints[i], q.poll()); |
| 111 |
|
} |
| 112 |
|
|
| 113 |
|
/** |
| 114 |
< |
* |
| 114 |
> |
* The comparator used in constructor is used |
| 115 |
|
*/ |
| 116 |
|
public void testConstructor7() { |
| 117 |
< |
try { |
| 118 |
< |
MyReverseComparator cmp = new MyReverseComparator(); |
| 119 |
< |
PriorityQueue q = new PriorityQueue(SIZE, cmp); |
| 120 |
< |
assertEquals(cmp, q.comparator()); |
| 121 |
< |
Integer[] ints = new Integer[SIZE]; |
| 122 |
< |
for (int i = 0; i < SIZE; ++i) |
| 123 |
< |
ints[i] = new Integer(i); |
| 124 |
< |
q.addAll(Arrays.asList(ints)); |
| 125 |
< |
for (int i = SIZE-1; i >= 0; --i) |
| 134 |
< |
assertEquals(ints[i], q.poll()); |
| 135 |
< |
} |
| 136 |
< |
finally {} |
| 117 |
> |
MyReverseComparator cmp = new MyReverseComparator(); |
| 118 |
> |
PriorityQueue q = new PriorityQueue(SIZE, cmp); |
| 119 |
> |
assertEquals(cmp, q.comparator()); |
| 120 |
> |
Integer[] ints = new Integer[SIZE]; |
| 121 |
> |
for (int i = 0; i < SIZE; ++i) |
| 122 |
> |
ints[i] = new Integer(i); |
| 123 |
> |
q.addAll(Arrays.asList(ints)); |
| 124 |
> |
for (int i = SIZE-1; i >= 0; --i) |
| 125 |
> |
assertEquals(ints[i], q.poll()); |
| 126 |
|
} |
| 127 |
|
|
| 128 |
|
/** |
| 129 |
< |
* |
| 129 |
> |
* isEmpty is true before add, false after |
| 130 |
|
*/ |
| 131 |
|
public void testEmpty() { |
| 132 |
|
PriorityQueue q = new PriorityQueue(2); |
| 140 |
|
} |
| 141 |
|
|
| 142 |
|
/** |
| 143 |
< |
* |
| 143 |
> |
* size changes when elements added and removed |
| 144 |
|
*/ |
| 145 |
|
public void testSize() { |
| 146 |
|
PriorityQueue q = populatedQueue(SIZE); |
| 155 |
|
} |
| 156 |
|
|
| 157 |
|
/** |
| 158 |
< |
* |
| 158 |
> |
* offer(null) throws NPE |
| 159 |
|
*/ |
| 160 |
|
public void testOfferNull() { |
| 161 |
< |
try { |
| 161 |
> |
try { |
| 162 |
|
PriorityQueue q = new PriorityQueue(1); |
| 163 |
|
q.offer(null); |
| 164 |
|
shouldThrow(); |
| 165 |
< |
} catch (NullPointerException success) { } |
| 165 |
> |
} catch (NullPointerException success) {} |
| 166 |
> |
} |
| 167 |
> |
|
| 168 |
> |
/** |
| 169 |
> |
* add(null) throws NPE |
| 170 |
> |
*/ |
| 171 |
> |
public void testAddNull() { |
| 172 |
> |
try { |
| 173 |
> |
PriorityQueue q = new PriorityQueue(1); |
| 174 |
> |
q.add(null); |
| 175 |
> |
shouldThrow(); |
| 176 |
> |
} catch (NullPointerException success) {} |
| 177 |
|
} |
| 178 |
|
|
| 179 |
|
/** |
| 180 |
< |
* |
| 180 |
> |
* Offer of comparable element succeeds |
| 181 |
|
*/ |
| 182 |
|
public void testOffer() { |
| 183 |
|
PriorityQueue q = new PriorityQueue(1); |
| 184 |
< |
assertTrue(q.offer(new Integer(0))); |
| 185 |
< |
assertTrue(q.offer(new Integer(1))); |
| 184 |
> |
assertTrue(q.offer(zero)); |
| 185 |
> |
assertTrue(q.offer(one)); |
| 186 |
|
} |
| 187 |
|
|
| 188 |
|
/** |
| 189 |
< |
* |
| 189 |
> |
* Offer of non-Comparable throws CCE |
| 190 |
|
*/ |
| 191 |
|
public void testOfferNonComparable() { |
| 192 |
|
try { |
| 195 |
|
q.offer(new Object()); |
| 196 |
|
q.offer(new Object()); |
| 197 |
|
shouldThrow(); |
| 198 |
< |
} |
| 199 |
< |
catch(ClassCastException success) {} |
| 198 |
> |
} catch (ClassCastException success) {} |
| 199 |
|
} |
| 200 |
|
|
| 201 |
|
/** |
| 202 |
< |
* |
| 202 |
> |
* add of comparable succeeds |
| 203 |
|
*/ |
| 204 |
|
public void testAdd() { |
| 205 |
|
PriorityQueue q = new PriorityQueue(SIZE); |
| 210 |
|
} |
| 211 |
|
|
| 212 |
|
/** |
| 213 |
< |
* |
| 213 |
> |
* addAll(null) throws NPE |
| 214 |
|
*/ |
| 215 |
|
public void testAddAll1() { |
| 216 |
|
try { |
| 217 |
|
PriorityQueue q = new PriorityQueue(1); |
| 218 |
|
q.addAll(null); |
| 219 |
|
shouldThrow(); |
| 220 |
< |
} |
| 222 |
< |
catch (NullPointerException success) {} |
| 220 |
> |
} catch (NullPointerException success) {} |
| 221 |
|
} |
| 222 |
+ |
|
| 223 |
|
/** |
| 224 |
< |
* |
| 224 |
> |
* addAll of a collection with null elements throws NPE |
| 225 |
|
*/ |
| 226 |
|
public void testAddAll2() { |
| 227 |
|
try { |
| 229 |
|
Integer[] ints = new Integer[SIZE]; |
| 230 |
|
q.addAll(Arrays.asList(ints)); |
| 231 |
|
shouldThrow(); |
| 232 |
< |
} |
| 234 |
< |
catch (NullPointerException success) {} |
| 232 |
> |
} catch (NullPointerException success) {} |
| 233 |
|
} |
| 234 |
+ |
|
| 235 |
|
/** |
| 236 |
< |
* |
| 236 |
> |
* addAll of a collection with any null elements throws NPE after |
| 237 |
> |
* possibly adding some elements |
| 238 |
|
*/ |
| 239 |
|
public void testAddAll3() { |
| 240 |
|
try { |
| 244 |
|
ints[i] = new Integer(i); |
| 245 |
|
q.addAll(Arrays.asList(ints)); |
| 246 |
|
shouldThrow(); |
| 247 |
< |
} |
| 248 |
< |
catch (NullPointerException success) {} |
| 247 |
> |
} catch (NullPointerException success) {} |
| 248 |
|
} |
| 249 |
|
|
| 250 |
|
/** |
| 251 |
< |
* |
| 251 |
> |
* Queue contains all elements of successful addAll |
| 252 |
|
*/ |
| 253 |
|
public void testAddAll5() { |
| 254 |
< |
try { |
| 255 |
< |
Integer[] empty = new Integer[0]; |
| 256 |
< |
Integer[] ints = new Integer[SIZE]; |
| 257 |
< |
for (int i = 0; i < SIZE; ++i) |
| 258 |
< |
ints[i] = new Integer(SIZE-1-i); |
| 259 |
< |
PriorityQueue q = new PriorityQueue(SIZE); |
| 260 |
< |
assertFalse(q.addAll(Arrays.asList(empty))); |
| 261 |
< |
assertTrue(q.addAll(Arrays.asList(ints))); |
| 262 |
< |
for (int i = 0; i < SIZE; ++i) |
| 264 |
< |
assertEquals(new Integer(i), q.poll()); |
| 265 |
< |
} |
| 266 |
< |
finally {} |
| 254 |
> |
Integer[] empty = new Integer[0]; |
| 255 |
> |
Integer[] ints = new Integer[SIZE]; |
| 256 |
> |
for (int i = 0; i < SIZE; ++i) |
| 257 |
> |
ints[i] = new Integer(SIZE-1-i); |
| 258 |
> |
PriorityQueue q = new PriorityQueue(SIZE); |
| 259 |
> |
assertFalse(q.addAll(Arrays.asList(empty))); |
| 260 |
> |
assertTrue(q.addAll(Arrays.asList(ints))); |
| 261 |
> |
for (int i = 0; i < SIZE; ++i) |
| 262 |
> |
assertEquals(new Integer(i), q.poll()); |
| 263 |
|
} |
| 264 |
|
|
| 265 |
|
/** |
| 266 |
< |
* |
| 266 |
> |
* poll succeeds unless empty |
| 267 |
|
*/ |
| 268 |
|
public void testPoll() { |
| 269 |
|
PriorityQueue q = populatedQueue(SIZE); |
| 270 |
|
for (int i = 0; i < SIZE; ++i) { |
| 271 |
< |
assertEquals(i, ((Integer)q.poll()).intValue()); |
| 271 |
> |
assertEquals(i, q.poll()); |
| 272 |
|
} |
| 273 |
< |
assertNull(q.poll()); |
| 273 |
> |
assertNull(q.poll()); |
| 274 |
|
} |
| 275 |
|
|
| 276 |
|
/** |
| 277 |
< |
* |
| 277 |
> |
* peek returns next element, or null if empty |
| 278 |
|
*/ |
| 279 |
|
public void testPeek() { |
| 280 |
|
PriorityQueue q = populatedQueue(SIZE); |
| 281 |
|
for (int i = 0; i < SIZE; ++i) { |
| 282 |
< |
assertEquals(i, ((Integer)q.peek()).intValue()); |
| 283 |
< |
q.poll(); |
| 282 |
> |
assertEquals(i, q.peek()); |
| 283 |
> |
assertEquals(i, q.poll()); |
| 284 |
|
assertTrue(q.peek() == null || |
| 285 |
< |
i != ((Integer)q.peek()).intValue()); |
| 285 |
> |
!q.peek().equals(i)); |
| 286 |
|
} |
| 287 |
< |
assertNull(q.peek()); |
| 287 |
> |
assertNull(q.peek()); |
| 288 |
|
} |
| 289 |
|
|
| 290 |
|
/** |
| 291 |
< |
* |
| 291 |
> |
* element returns next element, or throws NSEE if empty |
| 292 |
|
*/ |
| 293 |
|
public void testElement() { |
| 294 |
|
PriorityQueue q = populatedQueue(SIZE); |
| 295 |
|
for (int i = 0; i < SIZE; ++i) { |
| 296 |
< |
assertEquals(i, ((Integer)q.element()).intValue()); |
| 297 |
< |
q.poll(); |
| 296 |
> |
assertEquals(i, q.element()); |
| 297 |
> |
assertEquals(i, q.poll()); |
| 298 |
|
} |
| 299 |
|
try { |
| 300 |
|
q.element(); |
| 301 |
|
shouldThrow(); |
| 302 |
< |
} |
| 307 |
< |
catch (NoSuchElementException success) {} |
| 302 |
> |
} catch (NoSuchElementException success) {} |
| 303 |
|
} |
| 304 |
|
|
| 305 |
|
/** |
| 306 |
< |
* |
| 306 |
> |
* remove removes next element, or throws NSEE if empty |
| 307 |
|
*/ |
| 308 |
|
public void testRemove() { |
| 309 |
|
PriorityQueue q = populatedQueue(SIZE); |
| 310 |
|
for (int i = 0; i < SIZE; ++i) { |
| 311 |
< |
assertEquals(i, ((Integer)q.remove()).intValue()); |
| 311 |
> |
assertEquals(i, q.remove()); |
| 312 |
|
} |
| 313 |
|
try { |
| 314 |
|
q.remove(); |
| 315 |
|
shouldThrow(); |
| 316 |
< |
} catch (NoSuchElementException success){ |
| 322 |
< |
} |
| 316 |
> |
} catch (NoSuchElementException success) {} |
| 317 |
|
} |
| 318 |
|
|
| 319 |
|
/** |
| 320 |
< |
* |
| 320 |
> |
* remove(x) removes x and returns true if present |
| 321 |
|
*/ |
| 322 |
|
public void testRemoveElement() { |
| 323 |
|
PriorityQueue q = populatedQueue(SIZE); |
| 324 |
< |
for (int i = 1; i < SIZE; i+=2) { |
| 325 |
< |
assertTrue(q.remove(new Integer(i))); |
| 326 |
< |
} |
| 327 |
< |
for (int i = 0; i < SIZE; i+=2) { |
| 328 |
< |
assertTrue(q.remove(new Integer(i))); |
| 329 |
< |
assertFalse(q.remove(new Integer(i+1))); |
| 324 |
> |
for (int i = 1; i < SIZE; i += 2) { |
| 325 |
> |
assertTrue(q.contains(i)); |
| 326 |
> |
assertTrue(q.remove(i)); |
| 327 |
> |
assertFalse(q.contains(i)); |
| 328 |
> |
assertTrue(q.contains(i-1)); |
| 329 |
> |
} |
| 330 |
> |
for (int i = 0; i < SIZE; i += 2) { |
| 331 |
> |
assertTrue(q.contains(i)); |
| 332 |
> |
assertTrue(q.remove(i)); |
| 333 |
> |
assertFalse(q.contains(i)); |
| 334 |
> |
assertFalse(q.remove(i+1)); |
| 335 |
> |
assertFalse(q.contains(i+1)); |
| 336 |
|
} |
| 337 |
|
assertTrue(q.isEmpty()); |
| 338 |
|
} |
| 339 |
< |
|
| 339 |
> |
|
| 340 |
|
/** |
| 341 |
< |
* |
| 341 |
> |
* contains(x) reports true when elements added but not yet removed |
| 342 |
|
*/ |
| 343 |
|
public void testContains() { |
| 344 |
|
PriorityQueue q = populatedQueue(SIZE); |
| 350 |
|
} |
| 351 |
|
|
| 352 |
|
/** |
| 353 |
< |
* |
| 353 |
> |
* clear removes all elements |
| 354 |
|
*/ |
| 355 |
|
public void testClear() { |
| 356 |
|
PriorityQueue q = populatedQueue(SIZE); |
| 364 |
|
} |
| 365 |
|
|
| 366 |
|
/** |
| 367 |
< |
* |
| 367 |
> |
* containsAll(c) is true when c contains a subset of elements |
| 368 |
|
*/ |
| 369 |
|
public void testContainsAll() { |
| 370 |
|
PriorityQueue q = populatedQueue(SIZE); |
| 378 |
|
} |
| 379 |
|
|
| 380 |
|
/** |
| 381 |
< |
* |
| 381 |
> |
* retainAll(c) retains only those elements of c and reports true if changed |
| 382 |
|
*/ |
| 383 |
|
public void testRetainAll() { |
| 384 |
|
PriorityQueue q = populatedQueue(SIZE); |
| 397 |
|
} |
| 398 |
|
|
| 399 |
|
/** |
| 400 |
< |
* |
| 400 |
> |
* removeAll(c) removes only those elements of c and reports true if changed |
| 401 |
|
*/ |
| 402 |
|
public void testRemoveAll() { |
| 403 |
|
for (int i = 1; i < SIZE; ++i) { |
| 406 |
|
assertTrue(q.removeAll(p)); |
| 407 |
|
assertEquals(SIZE-i, q.size()); |
| 408 |
|
for (int j = 0; j < i; ++j) { |
| 409 |
< |
Integer I = (Integer)(p.remove()); |
| 410 |
< |
assertFalse(q.contains(I)); |
| 409 |
> |
Integer x = (Integer)(p.remove()); |
| 410 |
> |
assertFalse(q.contains(x)); |
| 411 |
|
} |
| 412 |
|
} |
| 413 |
|
} |
| 414 |
|
|
| 415 |
|
/** |
| 416 |
< |
* |
| 416 |
> |
* toArray contains all elements |
| 417 |
|
*/ |
| 418 |
|
public void testToArray() { |
| 419 |
|
PriorityQueue q = populatedQueue(SIZE); |
| 420 |
< |
Object[] o = q.toArray(); |
| 420 |
> |
Object[] o = q.toArray(); |
| 421 |
|
Arrays.sort(o); |
| 422 |
< |
for(int i = 0; i < o.length; i++) |
| 423 |
< |
assertEquals(o[i], q.poll()); |
| 422 |
> |
for (int i = 0; i < o.length; i++) |
| 423 |
> |
assertSame(o[i], q.poll()); |
| 424 |
|
} |
| 425 |
|
|
| 426 |
|
/** |
| 427 |
< |
* |
| 427 |
> |
* toArray(a) contains all elements |
| 428 |
|
*/ |
| 429 |
|
public void testToArray2() { |
| 430 |
< |
PriorityQueue q = populatedQueue(SIZE); |
| 431 |
< |
Integer[] ints = new Integer[SIZE]; |
| 432 |
< |
ints = (Integer[])q.toArray(ints); |
| 430 |
> |
PriorityQueue<Integer> q = populatedQueue(SIZE); |
| 431 |
> |
Integer[] ints = new Integer[SIZE]; |
| 432 |
> |
Integer[] array = q.toArray(ints); |
| 433 |
> |
assertSame(ints, array); |
| 434 |
|
Arrays.sort(ints); |
| 435 |
< |
for(int i = 0; i < ints.length; i++) |
| 436 |
< |
assertEquals(ints[i], q.poll()); |
| 435 |
> |
for (int i = 0; i < ints.length; i++) |
| 436 |
> |
assertSame(ints[i], q.poll()); |
| 437 |
|
} |
| 438 |
< |
|
| 438 |
> |
|
| 439 |
|
/** |
| 440 |
< |
* |
| 440 |
> |
* iterator iterates through all elements |
| 441 |
|
*/ |
| 442 |
|
public void testIterator() { |
| 443 |
|
PriorityQueue q = populatedQueue(SIZE); |
| 444 |
< |
int i = 0; |
| 445 |
< |
Iterator it = q.iterator(); |
| 446 |
< |
while(it.hasNext()) { |
| 444 |
> |
Iterator it = q.iterator(); |
| 445 |
> |
int i; |
| 446 |
> |
for (i = 0; it.hasNext(); i++) |
| 447 |
|
assertTrue(q.contains(it.next())); |
| 447 |
– |
++i; |
| 448 |
– |
} |
| 448 |
|
assertEquals(i, SIZE); |
| 449 |
+ |
assertIteratorExhausted(it); |
| 450 |
+ |
} |
| 451 |
+ |
|
| 452 |
+ |
/** |
| 453 |
+ |
* iterator of empty collection has no elements |
| 454 |
+ |
*/ |
| 455 |
+ |
public void testEmptyIterator() { |
| 456 |
+ |
assertIteratorExhausted(new PriorityQueue().iterator()); |
| 457 |
|
} |
| 458 |
|
|
| 459 |
|
/** |
| 460 |
< |
* |
| 460 |
> |
* iterator.remove removes current element |
| 461 |
|
*/ |
| 462 |
< |
public void testIteratorRemove () { |
| 462 |
> |
public void testIteratorRemove() { |
| 463 |
|
final PriorityQueue q = new PriorityQueue(3); |
| 464 |
|
q.add(new Integer(2)); |
| 465 |
|
q.add(new Integer(1)); |
| 475 |
|
assertFalse(it.hasNext()); |
| 476 |
|
} |
| 477 |
|
|
| 471 |
– |
|
| 478 |
|
/** |
| 479 |
< |
* |
| 479 |
> |
* toString contains toStrings of elements |
| 480 |
|
*/ |
| 481 |
|
public void testToString() { |
| 482 |
|
PriorityQueue q = populatedQueue(SIZE); |
| 483 |
|
String s = q.toString(); |
| 484 |
|
for (int i = 0; i < SIZE; ++i) { |
| 485 |
< |
assertTrue(s.indexOf(String.valueOf(i)) >= 0); |
| 485 |
> |
assertTrue(s.contains(String.valueOf(i))); |
| 486 |
|
} |
| 487 |
< |
} |
| 487 |
> |
} |
| 488 |
|
|
| 489 |
|
/** |
| 490 |
< |
* |
| 490 |
> |
* A deserialized serialized queue has same elements |
| 491 |
|
*/ |
| 492 |
< |
public void testSerialization() { |
| 493 |
< |
PriorityQueue q = populatedQueue(SIZE); |
| 494 |
< |
try { |
| 489 |
< |
ByteArrayOutputStream bout = new ByteArrayOutputStream(10000); |
| 490 |
< |
ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout)); |
| 491 |
< |
out.writeObject(q); |
| 492 |
< |
out.close(); |
| 492 |
> |
public void testSerialization() throws Exception { |
| 493 |
> |
Queue x = populatedQueue(SIZE); |
| 494 |
> |
Queue y = serialClone(x); |
| 495 |
|
|
| 496 |
< |
ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray()); |
| 497 |
< |
ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin)); |
| 498 |
< |
PriorityQueue r = (PriorityQueue)in.readObject(); |
| 499 |
< |
assertEquals(q.size(), r.size()); |
| 500 |
< |
while (!q.isEmpty()) |
| 499 |
< |
assertEquals(q.remove(), r.remove()); |
| 500 |
< |
} catch(Exception e){ |
| 501 |
< |
unexpectedException(); |
| 496 |
> |
assertNotSame(x, y); |
| 497 |
> |
assertEquals(x.size(), y.size()); |
| 498 |
> |
while (!x.isEmpty()) { |
| 499 |
> |
assertFalse(y.isEmpty()); |
| 500 |
> |
assertEquals(x.remove(), y.remove()); |
| 501 |
|
} |
| 502 |
+ |
assertTrue(y.isEmpty()); |
| 503 |
|
} |
| 504 |
|
} |
