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

Comparing jsr166/src/test/tck/LinkedTransferQueueTest.java (file contents):
Revision 1.33 by jsr166, Fri Oct 29 06:22:12 2010 UTC vs.
Revision 1.37 by jsr166, Wed Nov 3 16:46:34 2010 UTC

# Line 354 | Line 354 | public class LinkedTransferQueueTest ext
354                  for (int i = 0; i < SIZE; ++i) {
355                      long t0 = System.nanoTime();
356                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
357 <                    assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
357 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
358                  }
359 +                long t0 = System.nanoTime();
360                  aboutToWait.countDown();
361                  try {
362                      q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
363                      shouldThrow();
364 <                } catch (InterruptedException success) {}
364 >                } catch (InterruptedException success) {
365 >                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
366 >                }
367              }});
368  
369          aboutToWait.await();
# Line 382 | Line 385 | public class LinkedTransferQueueTest ext
385                  for (int i = 0; i < SIZE; ++i) {
386                      long t0 = System.nanoTime();
387                      assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
388 <                    assertTrue(millisElapsedSince(t0) < SHORT_DELAY_MS);
388 >                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
389                  }
390                  try {
391                      q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
# Line 572 | Line 575 | public class LinkedTransferQueueTest ext
575      /**
576       * toArray(null) throws NullPointerException
577       */
578 <    public void testToArray_BadArg() {
578 >    public void testToArray_NullArg() {
579          LinkedTransferQueue q = populatedQueue(SIZE);
580          try {
581 <            Object o[] = q.toArray(null);
581 >            q.toArray(null);
582              shouldThrow();
583          } catch (NullPointerException success) {}
584      }
585  
586      /**
587 <     * toArray(incompatible array type) throws CCE
587 >     * toArray(incompatible array type) throws ArrayStoreException
588       */
589      public void testToArray1_BadArg() {
590          LinkedTransferQueue q = populatedQueue(SIZE);
591          try {
592 <            Object o[] = q.toArray(new String[10]);
592 >            q.toArray(new String[10]);
593              shouldThrow();
594          } catch (ArrayStoreException success) {}
595      }
# Line 910 | Line 913 | public class LinkedTransferQueueTest ext
913          Thread t = newStartedThread(new CheckedRunnable() {
914              public void realRun() throws InterruptedException {
915                  threadStarted.countDown();
916 <                q.transfer(SIZE);
916 >                q.transfer(five);
917                  checkEmpty(q);
918              }});
919  
920          threadStarted.await();
921          waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
919 –        assertTrue(t.isAlive());
922          assertEquals(1, q.size());
923 <        assertEquals(SIZE, (int) q.poll());
923 >        assertSame(five, q.poll());
924          checkEmpty(q);
925          awaitTermination(t, MEDIUM_DELAY_MS);
926      }

Diff Legend

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