ViewVC Help

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

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

Comparing jsr166/src/test/tck/SemaphoreTest.java (file contents):
Revision 1.12 by dl, Sun Jan 4 22:58:03 2004 UTC vs.
Revision 1.15 by jsr166, Mon Nov 2 20:28:32 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 13 | Line 13 | import java.io.*;
13
14		public class SemaphoreTest extends JSR166TestCase {
15		public static void main(String[] args) {
16	<	junit.textui.TestRunner.run (suite());
16	>	junit.textui.TestRunner.run (suite());
17		}
18		public static Test suite() {
19		return new TestSuite(SemaphoreTest.class);
#	Line 24 | Line 24 | public class SemaphoreTest extends JSR16
24		*/
25		static class PublicSemaphore extends Semaphore {
26		PublicSemaphore(int p, boolean f) { super(p, f); }
27	<	public Collection<Thread> getQueuedThreads() {
28	<	return super.getQueuedThreads();
27	>	public Collection<Thread> getQueuedThreads() {
28	>	return super.getQueuedThreads();
29		}
30	<	public void reducePermits(int p) {
30	>	public void reducePermits(int p) {
31		super.reducePermits(p);
32		}
33		}
#	Line 70 | Line 70 | public class SemaphoreTest extends JSR16
70		assertFalse(s0.isFair());
71		Semaphore s1 = new Semaphore(-1, false);
72		assertEquals(-1, s1.availablePermits());
73	+	assertFalse(s1.isFair());
74		Semaphore s2 = new Semaphore(-1, false);
75		assertEquals(-1, s2.availablePermits());
76	+	assertFalse(s2.isFair());
77	+	}
78	+
79	+	/**
80	+	* Constructor without fairness argument behaves as nonfair
81	+	*/
82	+	public void testConstructor2() {
83	+	Semaphore s0 = new Semaphore(0);
84	+	assertEquals(0, s0.availablePermits());
85	+	assertFalse(s0.isFair());
86	+	Semaphore s1 = new Semaphore(-1);
87	+	assertEquals(-1, s1.availablePermits());
88	+	assertFalse(s1.isFair());
89	+	Semaphore s2 = new Semaphore(-1);
90	+	assertEquals(-1, s2.availablePermits());
91	+	assertFalse(s2.isFair());
92		}
93
94		/**
#	Line 265 | Line 282 | public class SemaphoreTest extends JSR16
282		unexpectedException();
283		}
284		}
285	<
285	>
286		/**
287		*  A waiting timed acquire blocks interruptibly
288		*/
#	Line 293 | Line 310 | public class SemaphoreTest extends JSR16
310		/**
311		* hasQueuedThreads reports whether there are waiting threads
312		*/
313	<	public void testHasQueuedThreads() {
313	>	public void testHasQueuedThreads() {
314		final Semaphore lock = new Semaphore(1, false);
315		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
316		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
#	Line 317 | Line 334 | public class SemaphoreTest extends JSR16
334		} catch(Exception e){
335		unexpectedException();
336		}
337	<	}
337	>	}
338
339		/**
340		* getQueueLength reports number of waiting threads
341		*/
342	<	public void testGetQueueLength() {
342	>	public void testGetQueueLength() {
343		final Semaphore lock = new Semaphore(1, false);
344		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
345		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
#	Line 346 | Line 363 | public class SemaphoreTest extends JSR16
363		} catch(Exception e){
364		unexpectedException();
365		}
366	<	}
366	>	}
367
368		/**
369		* getQueuedThreads includes waiting threads
370		*/
371	<	public void testGetQueuedThreads() {
371	>	public void testGetQueuedThreads() {
372		final PublicSemaphore lock = new PublicSemaphore(1, false);
373		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
374		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
#	Line 378 | Line 395 | public class SemaphoreTest extends JSR16
395		} catch(Exception e){
396		unexpectedException();
397		}
398	<	}
398	>	}
399
400		/**
401		* drainPermits reports and removes given number of permits
#	Line 777 | Line 794 | public class SemaphoreTest extends JSR16
794		unexpectedException();
795		}
796		}
797	<
797	>
798		/**
799		*  A waiting tryAcquire blocks interruptibly
800		*/
#	Line 829 | Line 846 | public class SemaphoreTest extends JSR16
846		/**
847		* getQueueLength reports number of waiting threads
848		*/
849	<	public void testGetQueueLength_fair() {
849	>	public void testGetQueueLength_fair() {
850		final Semaphore lock = new Semaphore(1, true);
851		Thread t1 = new Thread(new InterruptedLockRunnable(lock));
852		Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
#	Line 853 | Line 870 | public class SemaphoreTest extends JSR16
870		} catch(Exception e){
871		unexpectedException();
872		}
873	<	}
873	>	}
874
875
876		/**
#	Line 882 | Line 899 | public class SemaphoreTest extends JSR16
899		}
900		}
901
902	+	/**
903	+	* toString indicates current number of permits
904	+	*/
905	+	public void testToString() {
906	+	Semaphore s = new Semaphore(0);
907	+	String us = s.toString();
908	+	assertTrue(us.indexOf("Permits = 0") >= 0);
909	+	s.release();
910	+	String s1 = s.toString();
911	+	assertTrue(s1.indexOf("Permits = 1") >= 0);
912	+	s.release();
913	+	String s2 = s.toString();
914	+	assertTrue(s2.indexOf("Permits = 2") >= 0);
915	+	}
916
917		}

Diff Legend

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