ViewVC Help

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

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

Comparing jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java (file contents):
Revision 1.33 by jsr166, Tue Dec 1 06:03:49 2009 UTC vs.
Revision 1.39 by jsr166, Tue Mar 15 19:47:06 2011 UTC

#	Line 1 | Line 1
1		/*
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
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
#	Line 16 | Line 16 | import java.io.*;
16
17		public class AbstractQueuedSynchronizerTest extends JSR166TestCase {
18		public static void main(String[] args) {
19	<	junit.textui.TestRunner.run (suite());
19	>	junit.textui.TestRunner.run(suite());
20		}
21		public static Test suite() {
22		return new TestSuite(AbstractQueuedSynchronizerTest.class);
#	Line 34 | Line 34 | public class AbstractQueuedSynchronizerT
34		public boolean isHeldExclusively() { return getState() == 1; }
35
36		public boolean tryAcquire(int acquires) {
37	<	assertTrue(acquires == 1);
37	>	assertEquals(1, acquires);
38		return compareAndSetState(0, 1);
39		}
40
#	Line 44 | Line 44 | public class AbstractQueuedSynchronizerT
44		return true;
45		}
46
47	<	public AbstractQueuedSynchronizer.ConditionObject newCondition() { return new AbstractQueuedSynchronizer.ConditionObject(); }
47	>	public AbstractQueuedSynchronizer.ConditionObject newCondition() {
48	>	return new AbstractQueuedSynchronizer.ConditionObject();
49	>	}
50
51		}
52
#	Line 56 | Line 58 | public class AbstractQueuedSynchronizerT
58		public boolean isSignalled() { return getState() != 0; }
59
60		public int tryAcquireShared(int ignore) {
61	<	return isSignalled()? 1 : -1;
61	>	return isSignalled() ? 1 : -1;
62		}
63
64		public boolean tryReleaseShared(int ignore) {
#	Line 345 | Line 347 | public class AbstractQueuedSynchronizerT
347		sync.acquire(1);
348		Thread t = new Thread(new CheckedRunnable() {
349		public void realRun() {
350	<	threadAssertFalse(sync.tryAcquire(1));
350	>	assertFalse(sync.tryAcquire(1));
351		}});
352
353		t.start();
#	Line 473 | Line 475 | public class AbstractQueuedSynchronizerT
475		}
476
477		/**
478	<	*  Timed await without a signal times out
478	>	* Timed await without a signal times out
479		*/
480		public void testAwait_Timeout() throws InterruptedException {
481		final Mutex sync = new Mutex();
#	Line 642 | Line 644 | public class AbstractQueuedSynchronizerT
644		Thread t = new Thread(new CheckedRunnable() {
645		public void realRun() throws InterruptedException {
646		sync.acquire(1);
647	<	threadAssertFalse(sync.hasWaiters(c));
648	<	threadAssertEquals(0, sync.getWaitQueueLength(c));
647	>	assertFalse(sync.hasWaiters(c));
648	>	assertEquals(0, sync.getWaitQueueLength(c));
649		c.await();
650		sync.release(1);
651		}});
#	Line 673 | Line 675 | public class AbstractQueuedSynchronizerT
675		Thread t1 = new Thread(new CheckedRunnable() {
676		public void realRun() throws InterruptedException {
677		sync.acquire(1);
678	<	threadAssertFalse(sync.hasWaiters(c));
679	<	threadAssertEquals(0, sync.getWaitQueueLength(c));
678	>	assertFalse(sync.hasWaiters(c));
679	>	assertEquals(0, sync.getWaitQueueLength(c));
680		c.await();
681		sync.release(1);
682		}});
#	Line 682 | Line 684 | public class AbstractQueuedSynchronizerT
684		Thread t2 = new Thread(new CheckedRunnable() {
685		public void realRun() throws InterruptedException {
686		sync.acquire(1);
687	<	threadAssertTrue(sync.hasWaiters(c));
688	<	threadAssertEquals(1, sync.getWaitQueueLength(c));
687	>	assertTrue(sync.hasWaiters(c));
688	>	assertEquals(1, sync.getWaitQueueLength(c));
689		c.await();
690		sync.release(1);
691		}});
#	Line 717 | Line 719 | public class AbstractQueuedSynchronizerT
719		Thread t1 = new Thread(new CheckedRunnable() {
720		public void realRun() throws InterruptedException {
721		sync.acquire(1);
722	<	threadAssertTrue(sync.getWaitingThreads(c).isEmpty());
722	>	assertTrue(sync.getWaitingThreads(c).isEmpty());
723		c.await();
724		sync.release(1);
725		}});
#	Line 725 | Line 727 | public class AbstractQueuedSynchronizerT
727		Thread t2 = new Thread(new CheckedRunnable() {
728		public void realRun() throws InterruptedException {
729		sync.acquire(1);
730	<	threadAssertFalse(sync.getWaitingThreads(c).isEmpty());
730	>	assertFalse(sync.getWaitingThreads(c).isEmpty());
731		c.await();
732		sync.release(1);
733		}});
#	Line 932 | Line 934 | public class AbstractQueuedSynchronizerT
934
935		Thread t = new Thread(new CheckedRunnable() {
936		public void realRun() throws InterruptedException {
937	<	threadAssertFalse(l.isSignalled());
937	>	assertFalse(l.isSignalled());
938		l.acquireSharedInterruptibly(0);
939	<	threadAssertTrue(l.isSignalled());
939	>	assertTrue(l.isSignalled());
940		}});
941
942		t.start();
#	Line 949 | Line 951 | public class AbstractQueuedSynchronizerT
951		/**
952		* acquireSharedTimed returns after release
953		*/
954	<	public void testAsquireSharedTimed() throws InterruptedException {
954	>	public void testAcquireSharedTimed() throws InterruptedException {
955		final BooleanLatch l = new BooleanLatch();
956
957		Thread t = new Thread(new CheckedRunnable() {
#	Line 975 | Line 977 | public class AbstractQueuedSynchronizerT
977		final BooleanLatch l = new BooleanLatch();
978		Thread t = new Thread(new CheckedInterruptedRunnable() {
979		public void realRun() throws InterruptedException {
980	<	threadAssertFalse(l.isSignalled());
980	>	assertFalse(l.isSignalled());
981		l.acquireSharedInterruptibly(0);
982		}});
983

Diff Legend

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