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.72 by jsr166, Fri May 15 18:21:19 2015 UTC vs.
Revision 1.75 by jsr166, Sun Oct 4 18:49:02 2015 UTC

# Line 124 | Line 124 | public class DelayQueueTest extends JSR1
124      private DelayQueue<PDelay> populatedQueue(int n) {
125          DelayQueue<PDelay> q = new DelayQueue<PDelay>();
126          assertTrue(q.isEmpty());
127 <        for (int i = n-1; i >= 0; i -= 2)
127 >        for (int i = n - 1; i >= 0; i -= 2)
128              assertTrue(q.offer(new PDelay(i)));
129          for (int i = (n & 1); i < n; i += 2)
130              assertTrue(q.offer(new PDelay(i)));
# Line 166 | Line 166 | public class DelayQueueTest extends JSR1
166       */
167      public void testConstructor5() {
168          PDelay[] a = new PDelay[SIZE];
169 <        for (int i = 0; i < SIZE-1; ++i)
169 >        for (int i = 0; i < SIZE - 1; ++i)
170              a[i] = new PDelay(i);
171          try {
172              new DelayQueue(Arrays.asList(a));
# Line 208 | Line 208 | public class DelayQueueTest extends JSR1
208          BlockingQueue q = populatedQueue(SIZE);
209          for (int i = 0; i < SIZE; ++i) {
210              assertEquals(Integer.MAX_VALUE, q.remainingCapacity());
211 <            assertEquals(SIZE-i, q.size());
211 >            assertEquals(SIZE - i, q.size());
212              assertTrue(q.remove() instanceof PDelay);
213          }
214          for (int i = 0; i < SIZE; ++i) {
# Line 256 | Line 256 | public class DelayQueueTest extends JSR1
256      public void testAddAll3() {
257          DelayQueue q = new DelayQueue();
258          PDelay[] a = new PDelay[SIZE];
259 <        for (int i = 0; i < SIZE-1; ++i)
259 >        for (int i = 0; i < SIZE - 1; ++i)
260              a[i] = new PDelay(i);
261          try {
262              q.addAll(Arrays.asList(a));
# Line 270 | Line 270 | public class DelayQueueTest extends JSR1
270      public void testAddAll5() {
271          PDelay[] empty = new PDelay[0];
272          PDelay[] ints = new PDelay[SIZE];
273 <        for (int i = SIZE-1; i >= 0; --i)
273 >        for (int i = SIZE - 1; i >= 0; --i)
274              ints[i] = new PDelay(i);
275          DelayQueue q = new DelayQueue();
276          assertFalse(q.addAll(Arrays.asList(empty)));
# Line 542 | Line 542 | public class DelayQueueTest extends JSR1
542                  assertTrue(changed);
543  
544              assertTrue(q.containsAll(p));
545 <            assertEquals(SIZE-i, q.size());
545 >            assertEquals(SIZE - i, q.size());
546              p.remove();
547          }
548      }
# Line 555 | Line 555 | public class DelayQueueTest extends JSR1
555              DelayQueue q = populatedQueue(SIZE);
556              DelayQueue p = populatedQueue(i);
557              assertTrue(q.removeAll(p));
558 <            assertEquals(SIZE-i, q.size());
558 >            assertEquals(SIZE - i, q.size());
559              for (int j = 0; j < i; ++j) {
560                  PDelay x = (PDelay)(p.remove());
561                  assertFalse(q.contains(x));
# Line 653 | Line 653 | public class DelayQueueTest extends JSR1
653      public void testPollInExecutor() {
654          final DelayQueue q = new DelayQueue();
655          final CheckedBarrier threadsStarted = new CheckedBarrier(2);
656 <        ExecutorService executor = Executors.newFixedThreadPool(2);
657 <        executor.execute(new CheckedRunnable() {
658 <            public void realRun() throws InterruptedException {
659 <                assertNull(q.poll());
660 <                threadsStarted.await();
661 <                assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
662 <                checkEmpty(q);
663 <            }});
664 <
665 <        executor.execute(new CheckedRunnable() {
666 <            public void realRun() throws InterruptedException {
667 <                threadsStarted.await();
668 <                q.put(new PDelay(1));
669 <            }});
670 <
671 <        joinPool(executor);
656 >        final ExecutorService executor = Executors.newFixedThreadPool(2);
657 >        try (PoolCleaner cleaner = cleaner(executor)) {
658 >            executor.execute(new CheckedRunnable() {
659 >                public void realRun() throws InterruptedException {
660 >                    assertNull(q.poll());
661 >                    threadsStarted.await();
662 >                    assertNotNull(q.poll(LONG_DELAY_MS, MILLISECONDS));
663 >                    checkEmpty(q);
664 >                }});
665 >
666 >            executor.execute(new CheckedRunnable() {
667 >                public void realRun() throws InterruptedException {
668 >                    threadsStarted.await();
669 >                    q.put(new PDelay(1));
670 >                }});
671 >        }
672      }
673  
674      /**
# Line 753 | Line 753 | public class DelayQueueTest extends JSR1
753          final DelayQueue q = populatedQueue(SIZE);
754          Thread t = new Thread(new CheckedRunnable() {
755              public void realRun() {
756 <                q.put(new PDelay(SIZE+1));
756 >                q.put(new PDelay(SIZE + 1));
757              }});
758  
759          t.start();
# Line 773 | Line 773 | public class DelayQueueTest extends JSR1
773              ArrayList l = new ArrayList();
774              q.drainTo(l, i);
775              int k = (i < SIZE) ? i : SIZE;
776 <            assertEquals(SIZE-k, q.size());
776 >            assertEquals(SIZE - k, q.size());
777              assertEquals(k, l.size());
778          }
779      }

Diff Legend

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