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

Comparing jsr166/src/test/tck/ReentrantLockTest.java (file contents):
Revision 1.48 by jsr166, Sat May 21 06:24:33 2011 UTC vs.
Revision 1.63 by jsr166, Fri Jul 3 05:48:30 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 – import junit.framework.*;
10 – import java.util.concurrent.locks.*;
11 – import java.util.concurrent.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.util.*;
11 < import java.io.*;
10 >
11 > import java.util.Arrays;
12 > import java.util.Collection;
13 > import java.util.HashSet;
14 > import java.util.concurrent.CountDownLatch;
15 > import java.util.concurrent.CyclicBarrier;
16 > import java.util.concurrent.locks.Condition;
17 > import java.util.concurrent.locks.ReentrantLock;
18 >
19 > import junit.framework.AssertionFailedError;
20 > import junit.framework.Test;
21 > import junit.framework.TestSuite;
22  
23   public class ReentrantLockTest extends JSR166TestCase {
24      public static void main(String[] args) {
25 <        junit.textui.TestRunner.run(suite());
25 >        main(suite(), args);
26      }
27      public static Test suite() {
28          return new TestSuite(ReentrantLockTest.class);
29      }
30  
31      /**
32 <     * A runnable calling lockInterruptibly
32 >     * A checked runnable calling lockInterruptibly
33       */
34      class InterruptibleLockRunnable extends CheckedRunnable {
35          final ReentrantLock lock;
36 <        InterruptibleLockRunnable(ReentrantLock l) { lock = l; }
36 >        InterruptibleLockRunnable(ReentrantLock lock) { this.lock = lock; }
37          public void realRun() throws InterruptedException {
38              lock.lockInterruptibly();
39          }
40      }
41  
42      /**
43 <     * A runnable calling lockInterruptibly that expects to be
43 >     * A checked runnable calling lockInterruptibly that expects to be
44       * interrupted
45       */
46      class InterruptedLockRunnable extends CheckedInterruptedRunnable {
47          final ReentrantLock lock;
48 <        InterruptedLockRunnable(ReentrantLock l) { lock = l; }
48 >        InterruptedLockRunnable(ReentrantLock lock) { this.lock = lock; }
49          public void realRun() throws InterruptedException {
50              lock.lockInterruptibly();
51          }
# Line 82 | Line 89 | public class ReentrantLockTest extends J
89              Thread.yield();
90          }
91          assertTrue(t.isAlive());
92 <        assertTrue(lock.getOwner() != t);
92 >        assertNotSame(t, lock.getOwner());
93      }
94  
95      /**
# Line 136 | Line 143 | public class ReentrantLockTest extends J
143          lock.unlock();
144      }
145  
146 <    enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil };
146 >    enum AwaitMethod { await, awaitTimed, awaitNanos, awaitUntil }
147  
148      /**
149 <     * Awaits condition using the specified AwaitMethod.
149 >     * Awaits condition "indefinitely" using the specified AwaitMethod.
150       */
151      void await(Condition c, AwaitMethod awaitMethod)
152              throws InterruptedException {
# Line 152 | Line 159 | public class ReentrantLockTest extends J
159              assertTrue(c.await(timeoutMillis, MILLISECONDS));
160              break;
161          case awaitNanos:
162 <            long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
163 <            long nanosRemaining = c.awaitNanos(nanosTimeout);
164 <            assertTrue(nanosRemaining > 0);
162 >            long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
163 >            long nanosRemaining = c.awaitNanos(timeoutNanos);
164 >            assertTrue(nanosRemaining > timeoutNanos / 2);
165 >            assertTrue(nanosRemaining <= timeoutNanos);
166              break;
167          case awaitUntil:
168              assertTrue(c.awaitUntil(delayedDate(timeoutMillis)));
169              break;
170 +        default:
171 +            throw new AssertionError();
172          }
173      }
174  
# Line 286 | Line 296 | public class ReentrantLockTest extends J
296      }
297  
298      /**
299 <     * hasQueuedThread reports whether a thread is queued.
299 >     * hasQueuedThread reports whether a thread is queued
300       */
301      public void testHasQueuedThread()      { testHasQueuedThread(false); }
302      public void testHasQueuedThread_fair() { testHasQueuedThread(true); }
# Line 347 | Line 357 | public class ReentrantLockTest extends J
357      }
358  
359      /**
360 <     * timed tryLock is interruptible.
360 >     * timed tryLock is interruptible
361       */
362      public void testTryLock_Interruptible()      { testTryLock_Interruptible(false); }
363      public void testTryLock_Interruptible_fair() { testTryLock_Interruptible(true); }
# Line 415 | Line 425 | public class ReentrantLockTest extends J
425          }
426          for (int i = SIZE; i > 0; i--) {
427              lock.unlock();
428 <            assertEquals(i-1, lock.getHoldCount());
428 >            assertEquals(i - 1, lock.getHoldCount());
429          }
430      }
431  
# Line 451 | Line 461 | public class ReentrantLockTest extends J
461              barrier.await();
462              awaitTermination(t);
463              assertFalse(lock.isLocked());
464 <        } catch (Exception e) {
455 <            threadUnexpectedException(e);
456 <        }
464 >        } catch (Exception fail) { threadUnexpectedException(fail); }
465      }
466  
467      /**
# Line 465 | Line 473 | public class ReentrantLockTest extends J
473          final PublicReentrantLock lock = new PublicReentrantLock(fair);
474          try {
475              lock.lockInterruptibly();
476 <        } catch (InterruptedException ie) {
469 <            threadUnexpectedException(ie);
470 <        }
476 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
477          assertLockedByMoi(lock);
478          Thread t = newStartedThread(new InterruptedLockRunnable(lock));
479          waitForQueuedThread(lock, t);
# Line 528 | Line 534 | public class ReentrantLockTest extends J
534              assertTrue(nanosRemaining <= 0);
535              assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
536              lock.unlock();
537 <        } catch (InterruptedException e) {
532 <            threadUnexpectedException(e);
533 <        }
537 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
538      }
539  
540      /**
# Line 548 | Line 552 | public class ReentrantLockTest extends J
552              assertFalse(c.await(timeoutMillis, MILLISECONDS));
553              assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
554              lock.unlock();
555 <        } catch (InterruptedException e) {
552 <            threadUnexpectedException(e);
553 <        }
555 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
556      }
557  
558      /**
# Line 563 | Line 565 | public class ReentrantLockTest extends J
565              final ReentrantLock lock = new ReentrantLock(fair);
566              final Condition c = lock.newCondition();
567              lock.lock();
568 <            long startTime = System.nanoTime();
569 <            long timeoutMillis = 10;
570 <            java.util.Date d = new java.util.Date();
571 <            assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
572 <            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
568 >            // We shouldn't assume that nanoTime and currentTimeMillis
569 >            // use the same time source, so don't use nanoTime here.
570 >            java.util.Date delayedDate = delayedDate(timeoutMillis());
571 >            assertFalse(c.awaitUntil(delayedDate));
572 >            assertTrue(new java.util.Date().getTime() >= delayedDate.getTime());
573              lock.unlock();
574 <        } catch (InterruptedException e) {
573 <            threadUnexpectedException(e);
574 <        }
574 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
575      }
576  
577      /**
# Line 735 | Line 735 | public class ReentrantLockTest extends J
735      public void testHasWaiters(boolean fair) {
736          final PublicReentrantLock lock = new PublicReentrantLock(fair);
737          final Condition c = lock.newCondition();
738 <        final CountDownLatch locked = new CountDownLatch(1);
738 >        final CountDownLatch pleaseSignal = new CountDownLatch(1);
739          Thread t = newStartedThread(new CheckedRunnable() {
740              public void realRun() throws InterruptedException {
741                  lock.lock();
742                  assertHasNoWaiters(lock, c);
743                  assertFalse(lock.hasWaiters(c));
744 <                locked.countDown();
744 >                pleaseSignal.countDown();
745                  c.await();
746                  assertHasNoWaiters(lock, c);
747                  assertFalse(lock.hasWaiters(c));
748                  lock.unlock();
749              }});
750  
751 <        await(locked);
751 >        await(pleaseSignal);
752          lock.lock();
753          assertHasWaiters(lock, c, t);
754          assertTrue(lock.hasWaiters(c));
# Line 879 | Line 879 | public class ReentrantLockTest extends J
879      }
880  
881      /**
882 <     * awaitUninterruptibly doesn't abort on interrupt
882 >     * awaitUninterruptibly is uninterruptible
883       */
884      public void testAwaitUninterruptibly()      { testAwaitUninterruptibly(false); }
885      public void testAwaitUninterruptibly_fair() { testAwaitUninterruptibly(true); }
886      public void testAwaitUninterruptibly(boolean fair) {
887          final ReentrantLock lock = new ReentrantLock(fair);
888          final Condition c = lock.newCondition();
889 <        final CountDownLatch locked = new CountDownLatch(1);
890 <        Thread t = newStartedThread(new CheckedRunnable() {
889 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(2);
890 >
891 >        Thread t1 = newStartedThread(new CheckedRunnable() {
892              public void realRun() {
893 +                // Interrupt before awaitUninterruptibly
894                  lock.lock();
895 <                locked.countDown();
895 >                pleaseInterrupt.countDown();
896 >                Thread.currentThread().interrupt();
897                  c.awaitUninterruptibly();
898                  assertTrue(Thread.interrupted());
899                  lock.unlock();
900              }});
901  
902 <        await(locked);
902 >        Thread t2 = newStartedThread(new CheckedRunnable() {
903 >            public void realRun() {
904 >                // Interrupt during awaitUninterruptibly
905 >                lock.lock();
906 >                pleaseInterrupt.countDown();
907 >                c.awaitUninterruptibly();
908 >                assertTrue(Thread.interrupted());
909 >                lock.unlock();
910 >            }});
911 >
912 >        await(pleaseInterrupt);
913          lock.lock();
914          lock.unlock();
915 <        t.interrupt();
916 <        long timeoutMillis = 10;
917 <        assertThreadStaysAlive(t, timeoutMillis);
915 >        t2.interrupt();
916 >
917 >        assertThreadStaysAlive(t1);
918 >        assertTrue(t2.isAlive());
919 >
920          lock.lock();
921 <        c.signal();
921 >        c.signalAll();
922          lock.unlock();
923 <        awaitTermination(t);
923 >
924 >        awaitTermination(t1);
925 >        awaitTermination(t2);
926      }
927  
928      /**
# Line 923 | Line 940 | public class ReentrantLockTest extends J
940          final PublicReentrantLock lock =
941              new PublicReentrantLock(fair);
942          final Condition c = lock.newCondition();
943 <        final CountDownLatch locked = new CountDownLatch(1);
943 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
944          Thread t = newStartedThread(new CheckedInterruptedRunnable() {
945              public void realRun() throws InterruptedException {
946                  lock.lock();
947                  assertLockedByMoi(lock);
948                  assertHasNoWaiters(lock, c);
949 <                locked.countDown();
949 >                pleaseInterrupt.countDown();
950                  try {
951                      await(c, awaitMethod);
952                  } finally {
# Line 940 | Line 957 | public class ReentrantLockTest extends J
957                  }
958              }});
959  
960 <        await(locked);
960 >        await(pleaseInterrupt);
961          assertHasWaiters(lock, c, t);
962          t.interrupt();
963          awaitTermination(t);
# Line 961 | Line 978 | public class ReentrantLockTest extends J
978      public void testSignalAll(boolean fair, final AwaitMethod awaitMethod) {
979          final PublicReentrantLock lock = new PublicReentrantLock(fair);
980          final Condition c = lock.newCondition();
981 <        final CountDownLatch locked = new CountDownLatch(2);
981 >        final CountDownLatch pleaseSignal = new CountDownLatch(2);
982          class Awaiter extends CheckedRunnable {
983              public void realRun() throws InterruptedException {
984                  lock.lock();
985 <                locked.countDown();
985 >                pleaseSignal.countDown();
986                  await(c, awaitMethod);
987                  lock.unlock();
988              }
# Line 974 | Line 991 | public class ReentrantLockTest extends J
991          Thread t1 = newStartedThread(new Awaiter());
992          Thread t2 = newStartedThread(new Awaiter());
993  
994 <        await(locked);
994 >        await(pleaseSignal);
995          lock.lock();
996          assertHasWaiters(lock, c, t1, t2);
997          c.signalAll();
# Line 985 | Line 1002 | public class ReentrantLockTest extends J
1002      }
1003  
1004      /**
1005 <     * signal wakes up waiting threads in FIFO order.
1005 >     * signal wakes up waiting threads in FIFO order
1006       */
1007      public void testSignalWakesFifo()      { testSignalWakesFifo(false); }
1008      public void testSignalWakesFifo_fair() { testSignalWakesFifo(true); }
# Line 1039 | Line 1056 | public class ReentrantLockTest extends J
1056      public void testAwaitLockCount(boolean fair) {
1057          final PublicReentrantLock lock = new PublicReentrantLock(fair);
1058          final Condition c = lock.newCondition();
1059 <        final CountDownLatch locked = new CountDownLatch(2);
1059 >        final CountDownLatch pleaseSignal = new CountDownLatch(2);
1060          Thread t1 = newStartedThread(new CheckedRunnable() {
1061              public void realRun() throws InterruptedException {
1062                  lock.lock();
1063                  assertLockedByMoi(lock);
1064                  assertEquals(1, lock.getHoldCount());
1065 <                locked.countDown();
1065 >                pleaseSignal.countDown();
1066                  c.await();
1067                  assertLockedByMoi(lock);
1068                  assertEquals(1, lock.getHoldCount());
# Line 1058 | Line 1075 | public class ReentrantLockTest extends J
1075                  lock.lock();
1076                  assertLockedByMoi(lock);
1077                  assertEquals(2, lock.getHoldCount());
1078 <                locked.countDown();
1078 >                pleaseSignal.countDown();
1079                  c.await();
1080                  assertLockedByMoi(lock);
1081                  assertEquals(2, lock.getHoldCount());
# Line 1066 | Line 1083 | public class ReentrantLockTest extends J
1083                  lock.unlock();
1084              }});
1085  
1086 <        await(locked);
1086 >        await(pleaseSignal);
1087          lock.lock();
1088          assertHasWaiters(lock, c, t1, t2);
1089          assertEquals(1, lock.getHoldCount());
# Line 1110 | Line 1127 | public class ReentrantLockTest extends J
1127      public void testToString_fair() { testToString(true); }
1128      public void testToString(boolean fair) {
1129          ReentrantLock lock = new ReentrantLock(fair);
1130 <        String us = lock.toString();
1114 <        assertTrue(us.indexOf("Unlocked") >= 0);
1130 >        assertTrue(lock.toString().contains("Unlocked"));
1131          lock.lock();
1132 <        String ls = lock.toString();
1133 <        assertTrue(ls.indexOf("Locked") >= 0);
1132 >        assertTrue(lock.toString().contains("Locked"));
1133 >        lock.unlock();
1134 >        assertTrue(lock.toString().contains("Unlocked"));
1135      }
1136   }

Diff Legend

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