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.19 by dl, Sun Jan 25 13:25:28 2004 UTC vs.
Revision 1.26 by jsr166, Mon Nov 2 20:28:31 2009 UTC

# Line 2 | Line 2
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4   * http://creativecommons.org/licenses/publicdomain
5 < * Other contributors include Andrew Wright, Jeffrey Hayes,
6 < * Pat Fisher, Mike Judd.
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9   import junit.framework.*;
# Line 14 | Line 14 | import java.io.*;
14  
15   public class ReentrantLockTest extends JSR166TestCase {
16      public static void main(String[] args) {
17 <        junit.textui.TestRunner.run (suite());  
17 >        junit.textui.TestRunner.run (suite());
18      }
19      public static Test suite() {
20          return new TestSuite(ReentrantLockTest.class);
# Line 54 | Line 54 | public class ReentrantLockTest extends J
54       */
55      static class PublicReentrantLock extends ReentrantLock {
56          PublicReentrantLock() { super(); }
57 <        public Collection<Thread> getQueuedThreads() {
58 <            return super.getQueuedThreads();
57 >        public Collection<Thread> getQueuedThreads() {
58 >            return super.getQueuedThreads();
59          }
60 <        public Collection<Thread> getWaitingThreads(Condition c) {
61 <            return super.getWaitingThreads(c);
60 >        public Collection<Thread> getWaitingThreads(Condition c) {
61 >            return super.getWaitingThreads(c);
62          }
63  
64  
# Line 67 | Line 67 | public class ReentrantLockTest extends J
67      /**
68       * Constructor sets given fairness
69       */
70 <    public void testConstructor() {
70 >    public void testConstructor() {
71          ReentrantLock rl = new ReentrantLock();
72          assertFalse(rl.isFair());
73          ReentrantLock r2 = new ReentrantLock(true);
# Line 77 | Line 77 | public class ReentrantLockTest extends J
77      /**
78       * locking an unlocked lock succeeds
79       */
80 <    public void testLock() {
80 >    public void testLock() {
81          ReentrantLock rl = new ReentrantLock();
82          rl.lock();
83          assertTrue(rl.isLocked());
# Line 87 | Line 87 | public class ReentrantLockTest extends J
87      /**
88       * locking an unlocked fair lock succeeds
89       */
90 <    public void testFairLock() {
90 >    public void testFairLock() {
91          ReentrantLock rl = new ReentrantLock(true);
92          rl.lock();
93          assertTrue(rl.isLocked());
# Line 97 | Line 97 | public class ReentrantLockTest extends J
97      /**
98       * Unlocking an unlocked lock throws IllegalMonitorStateException
99       */
100 <    public void testUnlock_IllegalMonitorStateException() {
100 >    public void testUnlock_IllegalMonitorStateException() {
101          ReentrantLock rl = new ReentrantLock();
102          try {
103              rl.unlock();
# Line 109 | Line 109 | public class ReentrantLockTest extends J
109      /**
110       * tryLock on an unlocked lock succeeds
111       */
112 <    public void testTryLock() {
112 >    public void testTryLock() {
113          ReentrantLock rl = new ReentrantLock();
114          assertTrue(rl.tryLock());
115          assertTrue(rl.isLocked());
# Line 120 | Line 120 | public class ReentrantLockTest extends J
120      /**
121       * hasQueuedThreads reports whether there are waiting threads
122       */
123 <    public void testhasQueuedThreads() {
123 >    public void testhasQueuedThreads() {
124          final ReentrantLock lock = new ReentrantLock();
125          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
126          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
# Line 144 | Line 144 | public class ReentrantLockTest extends J
144          } catch(Exception e){
145              unexpectedException();
146          }
147 <    }
147 >    }
148  
149      /**
150       * getQueueLength reports number of waiting threads
151       */
152 <    public void testGetQueueLength() {
152 >    public void testGetQueueLength() {
153          final ReentrantLock lock = new ReentrantLock();
154          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
155          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
# Line 173 | Line 173 | public class ReentrantLockTest extends J
173          } catch(Exception e){
174              unexpectedException();
175          }
176 <    }
176 >    }
177  
178      /**
179       * getQueueLength reports number of waiting threads
180       */
181 <    public void testGetQueueLength_fair() {
181 >    public void testGetQueueLength_fair() {
182          final ReentrantLock lock = new ReentrantLock(true);
183          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
184          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
# Line 202 | Line 202 | public class ReentrantLockTest extends J
202          } catch(Exception e){
203              unexpectedException();
204          }
205 <    }
205 >    }
206  
207      /**
208       * hasQueuedThread(null) throws NPE
209       */
210 <    public void testHasQueuedThreadNPE() {
210 >    public void testHasQueuedThreadNPE() {
211          final ReentrantLock sync = new ReentrantLock();
212          try {
213              sync.hasQueuedThread(null);
# Line 219 | Line 219 | public class ReentrantLockTest extends J
219      /**
220       * hasQueuedThread reports whether a thread is queued.
221       */
222 <    public void testHasQueuedThread() {
222 >    public void testHasQueuedThread() {
223          final ReentrantLock sync = new ReentrantLock();
224          Thread t1 = new Thread(new InterruptedLockRunnable(sync));
225          Thread t2 = new Thread(new InterruptibleLockRunnable(sync));
# Line 248 | Line 248 | public class ReentrantLockTest extends J
248          } catch(Exception e){
249              unexpectedException();
250          }
251 <    }
251 >    }
252  
253  
254      /**
255       * getQueuedThreads includes waiting threads
256       */
257 <    public void testGetQueuedThreads() {
257 >    public void testGetQueuedThreads() {
258          final PublicReentrantLock lock = new PublicReentrantLock();
259          Thread t1 = new Thread(new InterruptedLockRunnable(lock));
260          Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
# Line 281 | Line 281 | public class ReentrantLockTest extends J
281          } catch(Exception e){
282              unexpectedException();
283          }
284 <    }
284 >    }
285  
286  
287      /**
288       * timed tryLock is interruptible.
289       */
290 <    public void testInterruptedException2() {
290 >    public void testInterruptedException2() {
291          final ReentrantLock lock = new ReentrantLock();
292          lock.lock();
293          Thread t = new Thread(new Runnable() {
# Line 310 | Line 310 | public class ReentrantLockTest extends J
310      /**
311       * TryLock on a locked lock fails
312       */
313 <    public void testTryLockWhenLocked() {
313 >    public void testTryLockWhenLocked() {
314          final ReentrantLock lock = new ReentrantLock();
315          lock.lock();
316          Thread t = new Thread(new Runnable() {
# Line 325 | Line 325 | public class ReentrantLockTest extends J
325          } catch(Exception e){
326              unexpectedException();
327          }
328 <    }
328 >    }
329  
330      /**
331       * Timed tryLock on a locked lock times out
332       */
333 <    public void testTryLock_Timeout() {
333 >    public void testTryLock_Timeout() {
334          final ReentrantLock lock = new ReentrantLock();
335          lock.lock();
336          Thread t = new Thread(new Runnable() {
# Line 349 | Line 349 | public class ReentrantLockTest extends J
349          } catch(Exception e){
350              unexpectedException();
351          }
352 <    }
353 <    
352 >    }
353 >
354      /**
355       * getHoldCount returns number of recursive holds
356       */
# Line 365 | Line 365 | public class ReentrantLockTest extends J
365              assertEquals(i-1,lock.getHoldCount());
366          }
367      }
368 <    
369 <  
368 >
369 >
370      /**
371       * isLocked is true when locked and false when not
372       */
# Line 376 | Line 376 | public class ReentrantLockTest extends J
376          assertTrue(lock.isLocked());
377          lock.unlock();
378          assertFalse(lock.isLocked());
379 <        Thread t = new Thread(new Runnable() {
379 >        Thread t = new Thread(new Runnable() {
380                  public void run() {
381                      lock.lock();
382                      try {
# Line 403 | Line 403 | public class ReentrantLockTest extends J
403      /**
404       * lockInterruptibly is interruptible.
405       */
406 <    public void testLockInterruptibly1() {
406 >    public void testLockInterruptibly1() {
407          final ReentrantLock lock = new ReentrantLock();
408          lock.lock();
409          Thread t = new Thread(new InterruptedLockRunnable(lock));
410          try {
411              t.start();
412 +            Thread.sleep(SHORT_DELAY_MS);
413              t.interrupt();
414 +            Thread.sleep(SHORT_DELAY_MS);
415              lock.unlock();
416              t.join();
417          } catch(Exception e){
418              unexpectedException();
419          }
420 <    }
420 >    }
421  
422      /**
423       * lockInterruptibly succeeds when unlocked, else is interruptible
424       */
425      public void testLockInterruptibly2() {
426 <        final ReentrantLock lock = new ReentrantLock();
426 >        final ReentrantLock lock = new ReentrantLock();
427          try {
428              lock.lockInterruptibly();
429          } catch(Exception e) {
# Line 443 | Line 445 | public class ReentrantLockTest extends J
445       * Calling await without holding lock throws IllegalMonitorStateException
446       */
447      public void testAwait_IllegalMonitor() {
448 <        final ReentrantLock lock = new ReentrantLock();
448 >        final ReentrantLock lock = new ReentrantLock();
449          final Condition c = lock.newCondition();
450          try {
451              c.await();
# Line 460 | Line 462 | public class ReentrantLockTest extends J
462       * Calling signal without holding lock throws IllegalMonitorStateException
463       */
464      public void testSignal_IllegalMonitor() {
465 <        final ReentrantLock lock = new ReentrantLock();
465 >        final ReentrantLock lock = new ReentrantLock();
466          final Condition c = lock.newCondition();
467          try {
468              c.signal();
# Line 477 | Line 479 | public class ReentrantLockTest extends J
479       * awaitNanos without a signal times out
480       */
481      public void testAwaitNanos_Timeout() {
482 <        final ReentrantLock lock = new ReentrantLock();
482 >        final ReentrantLock lock = new ReentrantLock();
483          final Condition c = lock.newCondition();
484          try {
485              lock.lock();
# Line 494 | Line 496 | public class ReentrantLockTest extends J
496       *  timed await without a signal times out
497       */
498      public void testAwait_Timeout() {
499 <        final ReentrantLock lock = new ReentrantLock();
499 >        final ReentrantLock lock = new ReentrantLock();
500          final Condition c = lock.newCondition();
501          try {
502              lock.lock();
503 <            assertFalse(c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
503 >            c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
504              lock.unlock();
505          }
506          catch (Exception ex) {
# Line 510 | Line 512 | public class ReentrantLockTest extends J
512       * awaitUntil without a signal times out
513       */
514      public void testAwaitUntil_Timeout() {
515 <        final ReentrantLock lock = new ReentrantLock();
515 >        final ReentrantLock lock = new ReentrantLock();
516          final Condition c = lock.newCondition();
517          try {
518              lock.lock();
519              java.util.Date d = new java.util.Date();
520 <            assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
520 >            c.awaitUntil(new java.util.Date(d.getTime() + 10));
521              lock.unlock();
522          }
523          catch (Exception ex) {
# Line 527 | Line 529 | public class ReentrantLockTest extends J
529       * await returns when signalled
530       */
531      public void testAwait() {
532 <        final ReentrantLock lock = new ReentrantLock();
532 >        final ReentrantLock lock = new ReentrantLock();
533          final Condition c = lock.newCondition();
534 <        Thread t = new Thread(new Runnable() {
534 >        Thread t = new Thread(new Runnable() {
535                  public void run() {
536                      try {
537                          lock.lock();
# Line 668 | Line 670 | public class ReentrantLockTest extends J
670       * getWaitingThreads throws IAE if not owned
671       */
672      public void testGetWaitingThreadsIAE() {
673 <        final PublicReentrantLock lock = new PublicReentrantLock();    
673 >        final PublicReentrantLock lock = new PublicReentrantLock();
674          final Condition c = (lock.newCondition());
675 <        final PublicReentrantLock lock2 = new PublicReentrantLock();    
675 >        final PublicReentrantLock lock2 = new PublicReentrantLock();
676          try {
677              lock2.getWaitingThreads(c);
678              shouldThrow();
# Line 684 | Line 686 | public class ReentrantLockTest extends J
686       * getWaitingThreads throws IMSE if not locked
687       */
688      public void testGetWaitingThreadsIMSE() {
689 <        final PublicReentrantLock lock = new PublicReentrantLock();    
689 >        final PublicReentrantLock lock = new PublicReentrantLock();
690          final Condition c = (lock.newCondition());
691          try {
692              lock.getWaitingThreads(c);
# Line 701 | Line 703 | public class ReentrantLockTest extends J
703       * hasWaiters returns true when a thread is waiting, else false
704       */
705      public void testHasWaiters() {
706 <        final ReentrantLock lock = new ReentrantLock();
706 >        final ReentrantLock lock = new ReentrantLock();
707          final Condition c = lock.newCondition();
708 <        Thread t = new Thread(new Runnable() {
708 >        Thread t = new Thread(new Runnable() {
709                  public void run() {
710                      try {
711                          lock.lock();
# Line 743 | Line 745 | public class ReentrantLockTest extends J
745       * getWaitQueueLength returns number of waiting threads
746       */
747      public void testGetWaitQueueLength() {
748 <        final ReentrantLock lock = new ReentrantLock();
748 >        final ReentrantLock lock = new ReentrantLock();
749          final Condition c = lock.newCondition();
750 <        Thread t1 = new Thread(new Runnable() {
750 >        Thread t1 = new Thread(new Runnable() {
751                  public void run() {
752                      try {
753                          lock.lock();
# Line 760 | Line 762 | public class ReentrantLockTest extends J
762                  }
763              });
764  
765 <        Thread t2 = new Thread(new Runnable() {
765 >        Thread t2 = new Thread(new Runnable() {
766                  public void run() {
767                      try {
768                          lock.lock();
# Line 804 | Line 806 | public class ReentrantLockTest extends J
806       * getWaitingThreads returns only and all waiting threads
807       */
808      public void testGetWaitingThreads() {
809 <        final PublicReentrantLock lock = new PublicReentrantLock();    
809 >        final PublicReentrantLock lock = new PublicReentrantLock();
810          final Condition c = lock.newCondition();
811 <        Thread t1 = new Thread(new Runnable() {
811 >        Thread t1 = new Thread(new Runnable() {
812                  public void run() {
813                      try {
814                          lock.lock();
# Line 820 | Line 822 | public class ReentrantLockTest extends J
822                  }
823              });
824  
825 <        Thread t2 = new Thread(new Runnable() {
825 >        Thread t2 = new Thread(new Runnable() {
826                  public void run() {
827                      try {
828                          lock.lock();
# Line 863 | Line 865 | public class ReentrantLockTest extends J
865          }
866      }
867  
868 +    /** A helper class for uninterruptible wait tests */
869 +    class UninterruptableThread extends Thread {
870 +        private ReentrantLock lock;
871 +        private Condition c;
872 +
873 +        public volatile boolean canAwake = false;
874 +        public volatile boolean interrupted = false;
875 +        public volatile boolean lockStarted = false;
876 +
877 +        public UninterruptableThread(ReentrantLock lock, Condition c) {
878 +            this.lock = lock;
879 +            this.c = c;
880 +        }
881 +
882 +        public synchronized void run() {
883 +            lock.lock();
884 +            lockStarted = true;
885 +
886 +            while (!canAwake) {
887 +                c.awaitUninterruptibly();
888 +            }
889  
890 +            interrupted = isInterrupted();
891 +            lock.unlock();
892 +        }
893 +    }
894  
895      /**
896       * awaitUninterruptibly doesn't abort on interrupt
897       */
898      public void testAwaitUninterruptibly() {
899 <        final ReentrantLock lock = new ReentrantLock();
899 >        final ReentrantLock lock = new ReentrantLock();
900          final Condition c = lock.newCondition();
901 <        Thread t = new Thread(new Runnable() {
875 <                public void run() {
876 <                    lock.lock();
877 <                    c.awaitUninterruptibly();
878 <                    lock.unlock();
879 <                }
880 <            });
901 >        UninterruptableThread thread = new UninterruptableThread(lock, c);
902  
903          try {
904 <            t.start();
905 <            Thread.sleep(SHORT_DELAY_MS);
906 <            t.interrupt();
904 >            thread.start();
905 >
906 >            while (!thread.lockStarted) {
907 >                Thread.sleep(100);
908 >            }
909 >
910              lock.lock();
911 <            c.signal();
912 <            lock.unlock();
913 <            assert(t.isInterrupted());
914 <            t.join(SHORT_DELAY_MS);
915 <            assertFalse(t.isAlive());
916 <        }
917 <        catch (Exception ex) {
911 >            try {
912 >                thread.interrupt();
913 >                thread.canAwake = true;
914 >                c.signal();
915 >            } finally {
916 >                lock.unlock();
917 >            }
918 >
919 >            thread.join();
920 >            assertTrue(thread.interrupted);
921 >            assertFalse(thread.isAlive());
922 >        } catch (Exception ex) {
923              unexpectedException();
924          }
925      }
# Line 899 | Line 928 | public class ReentrantLockTest extends J
928       * await is interruptible
929       */
930      public void testAwait_Interrupt() {
931 <        final ReentrantLock lock = new ReentrantLock();
931 >        final ReentrantLock lock = new ReentrantLock();
932          final Condition c = lock.newCondition();
933 <        Thread t = new Thread(new Runnable() {
933 >        Thread t = new Thread(new Runnable() {
934                  public void run() {
935                      try {
936                          lock.lock();
# Line 930 | Line 959 | public class ReentrantLockTest extends J
959       * awaitNanos is interruptible
960       */
961      public void testAwaitNanos_Interrupt() {
962 <        final ReentrantLock lock = new ReentrantLock();
962 >        final ReentrantLock lock = new ReentrantLock();
963          final Condition c = lock.newCondition();
964 <        Thread t = new Thread(new Runnable() {
964 >        Thread t = new Thread(new Runnable() {
965                  public void run() {
966                      try {
967                          lock.lock();
# Line 961 | Line 990 | public class ReentrantLockTest extends J
990       * awaitUntil is interruptible
991       */
992      public void testAwaitUntil_Interrupt() {
993 <        final ReentrantLock lock = new ReentrantLock();
993 >        final ReentrantLock lock = new ReentrantLock();
994          final Condition c = lock.newCondition();
995 <        Thread t = new Thread(new Runnable() {
995 >        Thread t = new Thread(new Runnable() {
996                  public void run() {
997                      try {
998                          lock.lock();
# Line 993 | Line 1022 | public class ReentrantLockTest extends J
1022       * signalAll wakes up all threads
1023       */
1024      public void testSignalAll() {
1025 <        final ReentrantLock lock = new ReentrantLock();
1025 >        final ReentrantLock lock = new ReentrantLock();
1026          final Condition c = lock.newCondition();
1027 <        Thread t1 = new Thread(new Runnable() {
1027 >        Thread t1 = new Thread(new Runnable() {
1028                  public void run() {
1029                      try {
1030                          lock.lock();
# Line 1008 | Line 1037 | public class ReentrantLockTest extends J
1037                  }
1038              });
1039  
1040 <        Thread t2 = new Thread(new Runnable() {
1040 >        Thread t2 = new Thread(new Runnable() {
1041                  public void run() {
1042                      try {
1043                          lock.lock();
# Line 1016 | Line 1045 | public class ReentrantLockTest extends J
1045                          lock.unlock();
1046                      }
1047                      catch(InterruptedException e) {
1048 +                        threadUnexpectedException();
1049 +                    }
1050 +                }
1051 +            });
1052 +
1053 +        try {
1054 +            t1.start();
1055 +            t2.start();
1056 +            Thread.sleep(SHORT_DELAY_MS);
1057 +            lock.lock();
1058 +            c.signalAll();
1059 +            lock.unlock();
1060 +            t1.join(SHORT_DELAY_MS);
1061 +            t2.join(SHORT_DELAY_MS);
1062 +            assertFalse(t1.isAlive());
1063 +            assertFalse(t2.isAlive());
1064 +        }
1065 +        catch (Exception ex) {
1066 +            unexpectedException();
1067 +        }
1068 +    }
1069 +
1070 +    /**
1071 +     * await after multiple reentrant locking preserves lock count
1072 +     */
1073 +    public void testAwaitLockCount() {
1074 +        final ReentrantLock lock = new ReentrantLock();
1075 +        final Condition c = lock.newCondition();
1076 +        Thread t1 = new Thread(new Runnable() {
1077 +                public void run() {
1078 +                    try {
1079 +                        lock.lock();
1080 +                        threadAssertEquals(1, lock.getHoldCount());
1081 +                        c.await();
1082 +                        threadAssertEquals(1, lock.getHoldCount());
1083 +                        lock.unlock();
1084 +                    }
1085 +                    catch(InterruptedException e) {
1086 +                        threadUnexpectedException();
1087 +                    }
1088 +                }
1089 +            });
1090 +
1091 +        Thread t2 = new Thread(new Runnable() {
1092 +                public void run() {
1093 +                    try {
1094 +                        lock.lock();
1095 +                        lock.lock();
1096 +                        threadAssertEquals(2, lock.getHoldCount());
1097 +                        c.await();
1098 +                        threadAssertEquals(2, lock.getHoldCount());
1099 +                        lock.unlock();
1100 +                        lock.unlock();
1101 +                    }
1102 +                    catch(InterruptedException e) {
1103                          threadUnexpectedException();
1104                      }
1105                  }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines