550 |
|
} |
551 |
|
|
552 |
|
/** |
553 |
< |
* toArray() contains all elements |
553 |
> |
* toArray() contains all elements in FIFO order |
554 |
|
*/ |
555 |
< |
public void testToArray() throws InterruptedException { |
555 |
> |
public void testToArray() { |
556 |
|
LinkedTransferQueue q = populatedQueue(SIZE); |
557 |
|
Object[] o = q.toArray(); |
558 |
|
for (int i = 0; i < o.length; i++) { |
559 |
< |
assertEquals(o[i], q.take()); |
559 |
> |
assertSame(o[i], q.poll()); |
560 |
|
} |
561 |
|
} |
562 |
|
|
563 |
|
/** |
564 |
< |
* toArray(a) contains all elements |
564 |
> |
* toArray(a) contains all elements in FIFO order |
565 |
|
*/ |
566 |
< |
public void testToArray2() throws InterruptedException { |
566 |
> |
public void testToArray2() { |
567 |
|
LinkedTransferQueue<Integer> q = populatedQueue(SIZE); |
568 |
|
Integer[] ints = new Integer[SIZE]; |
569 |
< |
ints = q.toArray(ints); |
569 |
> |
Integer[] array = q.toArray(ints); |
570 |
> |
assertSame(ints, array); |
571 |
|
for (int i = 0; i < ints.length; i++) { |
572 |
< |
assertEquals(ints[i], q.take()); |
572 |
> |
assertSame(ints[i], q.poll()); |
573 |
|
} |
574 |
|
} |
575 |
|
|
576 |
|
/** |
577 |
|
* toArray(null) throws NullPointerException |
578 |
|
*/ |
579 |
< |
public void testToArray_BadArg() { |
579 |
> |
public void testToArray_NullArg() { |
580 |
|
LinkedTransferQueue q = populatedQueue(SIZE); |
581 |
|
try { |
582 |
< |
Object o[] = q.toArray(null); |
582 |
> |
q.toArray(null); |
583 |
|
shouldThrow(); |
584 |
|
} catch (NullPointerException success) {} |
585 |
|
} |
1072 |
|
} |
1073 |
|
|
1074 |
|
/** |
1075 |
< |
* tryTransfer waits the amount given if interrupted, and |
1076 |
< |
* throws interrupted exception |
1075 |
> |
* tryTransfer waits the amount given, and throws |
1076 |
> |
* InterruptedException when interrupted. |
1077 |
|
*/ |
1078 |
|
public void testTryTransfer5() throws InterruptedException { |
1079 |
|
final LinkedTransferQueue q = new LinkedTransferQueue(); |
1080 |
|
final CountDownLatch threadStarted = new CountDownLatch(1); |
1081 |
+ |
assertTrue(q.isEmpty()); |
1082 |
|
|
1083 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
1084 |
|
public void realRun() throws InterruptedException { |
1089 |
|
shouldThrow(); |
1090 |
|
} catch (InterruptedException success) {} |
1091 |
|
assertTrue(millisElapsedSince(t0) >= SHORT_DELAY_MS); |
1092 |
+ |
assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS); |
1093 |
|
}}); |
1094 |
|
|
1095 |
|
threadStarted.await(); |
1096 |
+ |
while (q.isEmpty()) |
1097 |
+ |
Thread.yield(); |
1098 |
|
Thread.sleep(SHORT_DELAY_MS); |
1099 |
|
t.interrupt(); |
1100 |
|
awaitTermination(t, MEDIUM_DELAY_MS); |