ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ReentrantLockTest.java

Comparing jsr166/src/test/tck/ReentrantLockTest.java (file contents):
Revision 1.55 by jsr166, Wed Dec 31 20:34:16 2014 UTC vs.
Revision 1.58 by jsr166, Sat Apr 25 04:55:31 2015 UTC

#	Line 22 | Line 22 | 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 460 | Line 460 | public class ReentrantLockTest extends J
460		barrier.await();
461		awaitTermination(t);
462		assertFalse(lock.isLocked());
463	<	} catch (Exception e) {
464	<	threadUnexpectedException(e);
465	<	}
463	>	} catch (Exception fail) { threadUnexpectedException(fail); }
464		}
465
466		/**
#	Line 474 | Line 472 | public class ReentrantLockTest extends J
472		final PublicReentrantLock lock = new PublicReentrantLock(fair);
473		try {
474		lock.lockInterruptibly();
475	<	} catch (InterruptedException ie) {
478	<	threadUnexpectedException(ie);
479	<	}
475	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
476		assertLockedByMoi(lock);
477		Thread t = newStartedThread(new InterruptedLockRunnable(lock));
478		waitForQueuedThread(lock, t);
#	Line 537 | Line 533 | public class ReentrantLockTest extends J
533		assertTrue(nanosRemaining <= 0);
534		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
535		lock.unlock();
536	<	} catch (InterruptedException e) {
541	<	threadUnexpectedException(e);
542	<	}
536	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
537		}
538
539		/**
#	Line 557 | Line 551 | public class ReentrantLockTest extends J
551		assertFalse(c.await(timeoutMillis, MILLISECONDS));
552		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
553		lock.unlock();
554	<	} catch (InterruptedException e) {
561	<	threadUnexpectedException(e);
562	<	}
554	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
555		}
556
557		/**
#	Line 578 | Line 570 | public class ReentrantLockTest extends J
570		assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
571		assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
572		lock.unlock();
573	<	} catch (InterruptedException e) {
582	<	threadUnexpectedException(e);
583	<	}
573	>	} catch (InterruptedException fail) { threadUnexpectedException(fail); }
574		}
575
576		/**

Diff Legend

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