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

Comparing jsr166/src/test/tck/DelayQueueTest.java (file contents):
Revision 1.63 by jsr166, Sun Nov 23 22:27:06 2014 UTC vs.
Revision 1.67 by jsr166, Fri Jan 2 03:52:53 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
10 < import java.util.Arrays;
9 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 >
11   import java.util.ArrayList;
12 + import java.util.Arrays;
13   import java.util.Collection;
14   import java.util.Iterator;
15   import java.util.NoSuchElementException;
# Line 19 | Line 20 | import java.util.concurrent.DelayQueue;
20   import java.util.concurrent.Executors;
21   import java.util.concurrent.ExecutorService;
22   import java.util.concurrent.TimeUnit;
23 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
23 >
24 > import junit.framework.Test;
25  
26   public class DelayQueueTest extends JSR166TestCase {
27  
# Line 124 | Line 126 | public class DelayQueueTest extends JSR1
126      private DelayQueue<PDelay> populatedQueue(int n) {
127          DelayQueue<PDelay> q = new DelayQueue<PDelay>();
128          assertTrue(q.isEmpty());
129 <        for (int i = n-1; i >= 0; i-=2)
129 >        for (int i = n-1; i >= 0; i -= 2)
130              assertTrue(q.offer(new PDelay(i)));
131 <        for (int i = (n & 1); i < n; i+=2)
131 >        for (int i = (n & 1); i < n; i += 2)
132              assertTrue(q.offer(new PDelay(i)));
133          assertFalse(q.isEmpty());
134          assertEquals(NOCAP, q.remainingCapacity());
# Line 287 | Line 289 | public class DelayQueueTest extends JSR1
289      public void testPut() {
290          DelayQueue q = new DelayQueue();
291          for (int i = 0; i < SIZE; ++i) {
292 <            PDelay I = new PDelay(i);
293 <            q.put(I);
294 <            assertTrue(q.contains(I));
292 >            PDelay x = new PDelay(i);
293 >            q.put(x);
294 >            assertTrue(q.contains(x));
295          }
296          assertEquals(SIZE, q.size());
297      }
# Line 333 | Line 335 | public class DelayQueueTest extends JSR1
335      public void testTake() throws InterruptedException {
336          DelayQueue q = populatedQueue(SIZE);
337          for (int i = 0; i < SIZE; ++i) {
338 <            assertEquals(new PDelay(i), ((PDelay)q.take()));
338 >            assertEquals(new PDelay(i), q.take());
339          }
340      }
341  
# Line 376 | Line 378 | public class DelayQueueTest extends JSR1
378      public void testPoll() {
379          DelayQueue q = populatedQueue(SIZE);
380          for (int i = 0; i < SIZE; ++i) {
381 <            assertEquals(new PDelay(i), ((PDelay)q.poll()));
381 >            assertEquals(new PDelay(i), q.poll());
382          }
383          assertNull(q.poll());
384      }
# Line 387 | Line 389 | public class DelayQueueTest extends JSR1
389      public void testTimedPoll0() throws InterruptedException {
390          DelayQueue q = populatedQueue(SIZE);
391          for (int i = 0; i < SIZE; ++i) {
392 <            assertEquals(new PDelay(i), ((PDelay)q.poll(0, MILLISECONDS)));
392 >            assertEquals(new PDelay(i), q.poll(0, MILLISECONDS));
393          }
394          assertNull(q.poll(0, MILLISECONDS));
395      }
# Line 399 | Line 401 | public class DelayQueueTest extends JSR1
401          DelayQueue q = populatedQueue(SIZE);
402          for (int i = 0; i < SIZE; ++i) {
403              long startTime = System.nanoTime();
404 <            assertEquals(new PDelay(i), ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
404 >            assertEquals(new PDelay(i), q.poll(LONG_DELAY_MS, MILLISECONDS));
405              assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
406          }
407          long startTime = System.nanoTime();
# Line 448 | Line 450 | public class DelayQueueTest extends JSR1
450      public void testPeek() {
451          DelayQueue q = populatedQueue(SIZE);
452          for (int i = 0; i < SIZE; ++i) {
453 <            assertEquals(new PDelay(i), ((PDelay)q.peek()));
454 <            assertEquals(new PDelay(i), ((PDelay)q.poll()));
453 >            assertEquals(new PDelay(i), q.peek());
454 >            assertEquals(new PDelay(i), q.poll());
455              if (q.isEmpty())
456                  assertNull(q.peek());
457              else
# Line 464 | Line 466 | public class DelayQueueTest extends JSR1
466      public void testElement() {
467          DelayQueue q = populatedQueue(SIZE);
468          for (int i = 0; i < SIZE; ++i) {
469 <            assertEquals(new PDelay(i), ((PDelay)q.element()));
469 >            assertEquals(new PDelay(i), q.element());
470              q.poll();
471          }
472          try {
# Line 479 | Line 481 | public class DelayQueueTest extends JSR1
481      public void testRemove() {
482          DelayQueue q = populatedQueue(SIZE);
483          for (int i = 0; i < SIZE; ++i) {
484 <            assertEquals(new PDelay(i), ((PDelay)q.remove()));
484 >            assertEquals(new PDelay(i), q.remove());
485          }
486          try {
487              q.remove();
# Line 559 | Line 561 | public class DelayQueueTest extends JSR1
561              assertTrue(q.removeAll(p));
562              assertEquals(SIZE-i, q.size());
563              for (int j = 0; j < i; ++j) {
564 <                PDelay I = (PDelay)(p.remove());
565 <                assertFalse(q.contains(I));
564 >                PDelay x = (PDelay)(p.remove());
565 >                assertFalse(q.contains(x));
566              }
567          }
568      }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines