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.16 by dl, Sun Jan 11 16:02:33 2004 UTC vs.
Revision 1.21 by dl, Thu May 18 10:29:23 2006 UTC

#	Line 44 | Line 44 | public class AbstractQueuedSynchronizerT
44		}
45
46		public AbstractQueuedSynchronizer.ConditionObject newCondition() { return new AbstractQueuedSynchronizer.ConditionObject(); }
47	–
48	–	public void lock() {
49	–	acquire(1);
50	–	}
47
48		}
49
#	Line 71 | Line 67 | public class AbstractQueuedSynchronizerT
67		/**
68		* A runnable calling acquireInterruptibly
69		*/
70	<	class InterruptibleLockRunnable implements Runnable {
71	<	final Mutex lock;
72	<	InterruptibleLockRunnable(Mutex l) { lock = l; }
70	>	class InterruptibleSyncRunnable implements Runnable {
71	>	final Mutex sync;
72	>	InterruptibleSyncRunnable(Mutex l) { sync = l; }
73		public void run() {
74		try {
75	<	lock.acquireInterruptibly(1);
75	>	sync.acquireInterruptibly(1);
76		} catch(InterruptedException success){}
77		}
78		}
#	Line 86 | Line 82 | public class AbstractQueuedSynchronizerT
82		* A runnable calling acquireInterruptibly that expects to be
83		* interrupted
84		*/
85	<	class InterruptedLockRunnable implements Runnable {
86	<	final Mutex lock;
87	<	InterruptedLockRunnable(Mutex l) { lock = l; }
85	>	class InterruptedSyncRunnable implements Runnable {
86	>	final Mutex sync;
87	>	InterruptedSyncRunnable(Mutex l) { sync = l; }
88		public void run() {
89		try {
90	<	lock.acquireInterruptibly(1);
90	>	sync.acquireInterruptibly(1);
91		threadShouldThrow();
92		} catch(InterruptedException success){}
93		}
#	Line 106 | Line 102 | public class AbstractQueuedSynchronizerT
102		}
103
104		/**
105	<	* acquiring released lock succeeds
105	>	* acquiring released sync succeeds
106		*/
107		public void testAcquire() {
108		Mutex rl = new Mutex();
109		rl.acquire(1);
110		assertTrue(rl.isHeldExclusively());
111		rl.release(1);
112	+	assertFalse(rl.isHeldExclusively());
113		}
114
115		/**
116	<	* tryAcquire on an released lock succeeds
116	>	* tryAcquire on an released sync succeeds
117		*/
118		public void testTryAcquire() {
119		Mutex rl = new Mutex();
#	Line 129 | Line 126 | public class AbstractQueuedSynchronizerT
126		* hasQueuedThreads reports whether there are waiting threads
127		*/
128		public void testhasQueuedThreads() {
129	<	final Mutex lock = new Mutex();
130	<	Thread t1 = new Thread(new InterruptedLockRunnable(lock));
131	<	Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
129	>	final Mutex sync = new Mutex();
130	>	Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
131	>	Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
132		try {
133	<	assertFalse(lock.hasQueuedThreads());
134	<	lock.acquire(1);
133	>	assertFalse(sync.hasQueuedThreads());
134	>	sync.acquire(1);
135		t1.start();
136		Thread.sleep(SHORT_DELAY_MS);
137	<	assertTrue(lock.hasQueuedThreads());
137	>	assertTrue(sync.hasQueuedThreads());
138		t2.start();
139		Thread.sleep(SHORT_DELAY_MS);
140	<	assertTrue(lock.hasQueuedThreads());
140	>	assertTrue(sync.hasQueuedThreads());
141		t1.interrupt();
142		Thread.sleep(SHORT_DELAY_MS);
143	<	assertTrue(lock.hasQueuedThreads());
144	<	lock.release(1);
143	>	assertTrue(sync.hasQueuedThreads());
144	>	sync.release(1);
145		Thread.sleep(SHORT_DELAY_MS);
146	<	assertFalse(lock.hasQueuedThreads());
146	>	assertFalse(sync.hasQueuedThreads());
147		t1.join();
148		t2.join();
149		} catch(Exception e){
#	Line 158 | Line 155 | public class AbstractQueuedSynchronizerT
155		* isQueued(null) throws NPE
156		*/
157		public void testIsQueuedNPE() {
158	<	final Mutex lock = new Mutex();
158	>	final Mutex sync = new Mutex();
159		try {
160	<	lock.isQueued(null);
160	>	sync.isQueued(null);
161		shouldThrow();
162		} catch (NullPointerException success) {
163		}
#	Line 170 | Line 167 | public class AbstractQueuedSynchronizerT
167		* isQueued reports whether a thread is queued.
168		*/
169		public void testIsQueued() {
170	<	final Mutex lock = new Mutex();
171	<	Thread t1 = new Thread(new InterruptedLockRunnable(lock));
172	<	Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
173	<	try {
174	<	assertFalse(lock.isQueued(t1));
175	<	assertFalse(lock.isQueued(t2));
176	<	lock.acquire(1);
170	>	final Mutex sync = new Mutex();
171	>	Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
172	>	Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
173	>	try {
174	>	assertFalse(sync.isQueued(t1));
175	>	assertFalse(sync.isQueued(t2));
176	>	sync.acquire(1);
177		t1.start();
178		Thread.sleep(SHORT_DELAY_MS);
179	<	assertTrue(lock.isQueued(t1));
179	>	assertTrue(sync.isQueued(t1));
180		t2.start();
181		Thread.sleep(SHORT_DELAY_MS);
182	<	assertTrue(lock.isQueued(t1));
183	<	assertTrue(lock.isQueued(t2));
182	>	assertTrue(sync.isQueued(t1));
183	>	assertTrue(sync.isQueued(t2));
184		t1.interrupt();
185		Thread.sleep(SHORT_DELAY_MS);
186	<	assertFalse(lock.isQueued(t1));
187	<	assertTrue(lock.isQueued(t2));
188	<	lock.release(1);
186	>	assertFalse(sync.isQueued(t1));
187	>	assertTrue(sync.isQueued(t2));
188	>	sync.release(1);
189	>	Thread.sleep(SHORT_DELAY_MS);
190	>	assertFalse(sync.isQueued(t1));
191		Thread.sleep(SHORT_DELAY_MS);
192	<	assertFalse(lock.isQueued(t1));
194	<	assertFalse(lock.isQueued(t2));
192	>	assertFalse(sync.isQueued(t2));
193		t1.join();
194		t2.join();
195		} catch(Exception e){
#	Line 200 | Line 198 | public class AbstractQueuedSynchronizerT
198		}
199
200		/**
201	<	* getFirstQueuedThread returns first waiting thread or null is none
201	>	* getFirstQueuedThread returns first waiting thread or null if none
202		*/
203		public void testGetFirstQueuedThread() {
204	<	final Mutex lock = new Mutex();
205	<	Thread t1 = new Thread(new InterruptedLockRunnable(lock));
206	<	Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
204	>	final Mutex sync = new Mutex();
205	>	Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
206	>	Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
207		try {
208	<	assertNull(lock.getFirstQueuedThread());
209	<	lock.acquire(1);
208	>	assertNull(sync.getFirstQueuedThread());
209	>	sync.acquire(1);
210		t1.start();
211		Thread.sleep(SHORT_DELAY_MS);
212	<	assertEquals(t1, lock.getFirstQueuedThread());
212	>	assertEquals(t1, sync.getFirstQueuedThread());
213		t2.start();
214		Thread.sleep(SHORT_DELAY_MS);
215	<	assertEquals(t1, lock.getFirstQueuedThread());
215	>	assertEquals(t1, sync.getFirstQueuedThread());
216		t1.interrupt();
217		Thread.sleep(SHORT_DELAY_MS);
220	–	assertEquals(t2, lock.getFirstQueuedThread());
221	–	lock.release(1);
218		Thread.sleep(SHORT_DELAY_MS);
219	<	assertNull(lock.getFirstQueuedThread());
219	>	assertEquals(t2, sync.getFirstQueuedThread());
220	>	sync.release(1);
221	>	Thread.sleep(SHORT_DELAY_MS);
222	>	assertNull(sync.getFirstQueuedThread());
223		t1.join();
224		t2.join();
225		} catch(Exception e){
#	Line 233 | Line 232 | public class AbstractQueuedSynchronizerT
232		* hasContended reports false if no thread has ever blocked, else true
233		*/
234		public void testHasContended() {
235	<	final Mutex lock = new Mutex();
236	<	Thread t1 = new Thread(new InterruptedLockRunnable(lock));
237	<	Thread t2 = new Thread(new InterruptibleLockRunnable(lock));
235	>	final Mutex sync = new Mutex();
236	>	Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
237	>	Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
238		try {
239	<	assertFalse(lock.hasContended());
240	<	lock.acquire(1);
239	>	assertFalse(sync.hasContended());
240	>	sync.acquire(1);
241	>	t1.start();
242	>	Thread.sleep(SHORT_DELAY_MS);
243	>	assertTrue(sync.hasContended());
244	>	t2.start();
245	>	Thread.sleep(SHORT_DELAY_MS);
246	>	assertTrue(sync.hasContended());
247	>	t1.interrupt();
248	>	Thread.sleep(SHORT_DELAY_MS);
249	>	assertTrue(sync.hasContended());
250	>	sync.release(1);
251	>	Thread.sleep(SHORT_DELAY_MS);
252	>	assertTrue(sync.hasContended());
253	>	t1.join();
254	>	t2.join();
255	>	} catch(Exception e){
256	>	unexpectedException();
257	>	}
258	>	}
259	>
260	>	/**
261	>	* getQueuedThreads includes waiting threads
262	>	*/
263	>	public void testGetQueuedThreads() {
264	>	final Mutex sync = new Mutex();
265	>	Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
266	>	Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
267	>	try {
268	>	assertTrue(sync.getQueuedThreads().isEmpty());
269	>	sync.acquire(1);
270	>	assertTrue(sync.getQueuedThreads().isEmpty());
271		t1.start();
272		Thread.sleep(SHORT_DELAY_MS);
273	<	assertTrue(lock.hasContended());
273	>	assertTrue(sync.getQueuedThreads().contains(t1));
274		t2.start();
275		Thread.sleep(SHORT_DELAY_MS);
276	<	assertTrue(lock.hasContended());
276	>	assertTrue(sync.getQueuedThreads().contains(t1));
277	>	assertTrue(sync.getQueuedThreads().contains(t2));
278		t1.interrupt();
279		Thread.sleep(SHORT_DELAY_MS);
280	<	assertTrue(lock.hasContended());
281	<	lock.release(1);
280	>	assertFalse(sync.getQueuedThreads().contains(t1));
281	>	assertTrue(sync.getQueuedThreads().contains(t2));
282	>	sync.release(1);
283		Thread.sleep(SHORT_DELAY_MS);
284	<	assertTrue(lock.hasContended());
284	>	assertTrue(sync.getQueuedThreads().isEmpty());
285	>	t1.join();
286	>	t2.join();
287	>	} catch(Exception e){
288	>	unexpectedException();
289	>	}
290	>	}
291	>
292	>	/**
293	>	* getExclusiveQueuedThreads includes waiting threads
294	>	*/
295	>	public void testGetExclusiveQueuedThreads() {
296	>	final Mutex sync = new Mutex();
297	>	Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
298	>	Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
299	>	try {
300	>	assertTrue(sync.getExclusiveQueuedThreads().isEmpty());
301	>	sync.acquire(1);
302	>	assertTrue(sync.getExclusiveQueuedThreads().isEmpty());
303	>	t1.start();
304	>	Thread.sleep(SHORT_DELAY_MS);
305	>	assertTrue(sync.getExclusiveQueuedThreads().contains(t1));
306	>	t2.start();
307	>	Thread.sleep(SHORT_DELAY_MS);
308	>	assertTrue(sync.getExclusiveQueuedThreads().contains(t1));
309	>	assertTrue(sync.getExclusiveQueuedThreads().contains(t2));
310	>	t1.interrupt();
311	>	Thread.sleep(SHORT_DELAY_MS);
312	>	assertFalse(sync.getExclusiveQueuedThreads().contains(t1));
313	>	assertTrue(sync.getExclusiveQueuedThreads().contains(t2));
314	>	sync.release(1);
315	>	Thread.sleep(SHORT_DELAY_MS);
316	>	assertTrue(sync.getExclusiveQueuedThreads().isEmpty());
317	>	t1.join();
318	>	t2.join();
319	>	} catch(Exception e){
320	>	unexpectedException();
321	>	}
322	>	}
323	>
324	>	/**
325	>	* getSharedQueuedThreads does not include exclusively waiting threads
326	>	*/
327	>	public void testGetSharedQueuedThreads() {
328	>	final Mutex sync = new Mutex();
329	>	Thread t1 = new Thread(new InterruptedSyncRunnable(sync));
330	>	Thread t2 = new Thread(new InterruptibleSyncRunnable(sync));
331	>	try {
332	>	assertTrue(sync.getSharedQueuedThreads().isEmpty());
333	>	sync.acquire(1);
334	>	assertTrue(sync.getSharedQueuedThreads().isEmpty());
335	>	t1.start();
336	>	Thread.sleep(SHORT_DELAY_MS);
337	>	assertTrue(sync.getSharedQueuedThreads().isEmpty());
338	>	t2.start();
339	>	Thread.sleep(SHORT_DELAY_MS);
340	>	assertTrue(sync.getSharedQueuedThreads().isEmpty());
341	>	t1.interrupt();
342	>	Thread.sleep(SHORT_DELAY_MS);
343	>	assertTrue(sync.getSharedQueuedThreads().isEmpty());
344	>	sync.release(1);
345	>	Thread.sleep(SHORT_DELAY_MS);
346	>	assertTrue(sync.getSharedQueuedThreads().isEmpty());
347		t1.join();
348		t2.join();
349		} catch(Exception e){
#	Line 262 | Line 355 | public class AbstractQueuedSynchronizerT
355		* tryAcquireNanos is interruptible.
356		*/
357		public void testInterruptedException2() {
358	<	final Mutex lock = new Mutex();
359	<	lock.acquire(1);
358	>	final Mutex sync = new Mutex();
359	>	sync.acquire(1);
360		Thread t = new Thread(new Runnable() {
361		public void run() {
362		try {
363	<	lock.tryAcquireNanos(1, MEDIUM_DELAY_MS * 1000 * 1000);
363	>	sync.tryAcquireNanos(1, MEDIUM_DELAY_MS * 1000 * 1000);
364		threadShouldThrow();
365		} catch(InterruptedException success){}
366		}
#	Line 282 | Line 375 | public class AbstractQueuedSynchronizerT
375
376
377		/**
378	<	* TryAcquire on a locked lock fails
378	>	* TryAcquire on exclusively held sync fails
379		*/
380	<	public void testTryAcquireWhenLocked() {
381	<	final Mutex lock = new Mutex();
382	<	lock.acquire(1);
380	>	public void testTryAcquireWhenSynced() {
381	>	final Mutex sync = new Mutex();
382	>	sync.acquire(1);
383		Thread t = new Thread(new Runnable() {
384		public void run() {
385	<	threadAssertFalse(lock.tryAcquire(1));
385	>	threadAssertFalse(sync.tryAcquire(1));
386		}
387		});
388		try {
389		t.start();
390		t.join();
391	<	lock.release(1);
391	>	sync.release(1);
392		} catch(Exception e){
393		unexpectedException();
394		}
395		}
396
397		/**
398	<	* tryAcquireNanos on a locked lock times out
398	>	* tryAcquireNanos on an exclusively held sync times out
399		*/
400		public void testAcquireNanos_Timeout() {
401	<	final Mutex lock = new Mutex();
402	<	lock.acquire(1);
401	>	final Mutex sync = new Mutex();
402	>	sync.acquire(1);
403		Thread t = new Thread(new Runnable() {
404		public void run() {
405		try {
406	<	threadAssertFalse(lock.tryAcquireNanos(1, 1000 * 1000));
406	>	threadAssertFalse(sync.tryAcquireNanos(1, 1000 * 1000));
407		} catch (Exception ex) {
408		threadUnexpectedException();
409		}
#	Line 319 | Line 412 | public class AbstractQueuedSynchronizerT
412		try {
413		t.start();
414		t.join();
415	<	lock.release(1);
415	>	sync.release(1);
416		} catch(Exception e){
417		unexpectedException();
418		}
#	Line 330 | Line 423 | public class AbstractQueuedSynchronizerT
423		* getState is true when acquired and false when not
424		*/
425		public void testGetState() {
426	<	final Mutex lock = new Mutex();
427	<	lock.acquire(1);
428	<	assertTrue(lock.isHeldExclusively());
429	<	lock.release(1);
430	<	assertFalse(lock.isHeldExclusively());
426	>	final Mutex sync = new Mutex();
427	>	sync.acquire(1);
428	>	assertTrue(sync.isHeldExclusively());
429	>	sync.release(1);
430	>	assertFalse(sync.isHeldExclusively());
431		Thread t = new Thread(new Runnable() {
432		public void run() {
433	<	lock.acquire(1);
433	>	sync.acquire(1);
434		try {
435		Thread.sleep(SMALL_DELAY_MS);
436		}
437		catch(Exception e) {
438		threadUnexpectedException();
439		}
440	<	lock.release(1);
440	>	sync.release(1);
441		}
442		});
443		try {
444		t.start();
445		Thread.sleep(SHORT_DELAY_MS);
446	<	assertTrue(lock.isHeldExclusively());
446	>	assertTrue(sync.isHeldExclusively());
447		t.join();
448	<	assertFalse(lock.isHeldExclusively());
448	>	assertFalse(sync.isHeldExclusively());
449		} catch(Exception e){
450		unexpectedException();
451		}
#	Line 363 | Line 456 | public class AbstractQueuedSynchronizerT
456		* acquireInterruptibly is interruptible.
457		*/
458		public void testAcquireInterruptibly1() {
459	<	final Mutex lock = new Mutex();
460	<	lock.acquire(1);
461	<	Thread t = new Thread(new InterruptedLockRunnable(lock));
459	>	final Mutex sync = new Mutex();
460	>	sync.acquire(1);
461	>	Thread t = new Thread(new InterruptedSyncRunnable(sync));
462		try {
463		t.start();
464	+	Thread.sleep(SHORT_DELAY_MS);
465		t.interrupt();
466	<	lock.release(1);
466	>	Thread.sleep(SHORT_DELAY_MS);
467	>	sync.release(1);
468		t.join();
469		} catch(Exception e){
470		unexpectedException();
#	Line 380 | Line 475 | public class AbstractQueuedSynchronizerT
475		* acquireInterruptibly succeeds when released, else is interruptible
476		*/
477		public void testAcquireInterruptibly2() {
478	<	final Mutex lock = new Mutex();
478	>	final Mutex sync = new Mutex();
479		try {
480	<	lock.acquireInterruptibly(1);
480	>	sync.acquireInterruptibly(1);
481		} catch(Exception e) {
482		unexpectedException();
483		}
484	<	Thread t = new Thread(new InterruptedLockRunnable(lock));
484	>	Thread t = new Thread(new InterruptedSyncRunnable(sync));
485		try {
486		t.start();
487		t.interrupt();
488	<	assertTrue(lock.isHeldExclusively());
488	>	assertTrue(sync.isHeldExclusively());
489		t.join();
490		} catch(Exception e){
491		unexpectedException();
#	Line 398 | Line 493 | public class AbstractQueuedSynchronizerT
493		}
494
495		/**
496	<	* owns is true for a condition created by lock else false
496	>	* owns is true for a condition created by sync else false
497		*/
498		public void testOwns() {
499	<	final Mutex lock = new Mutex();
500	<	final AbstractQueuedSynchronizer.ConditionObject c = lock.newCondition();
501	<	final Mutex lock2 = new Mutex();
502	<	assertTrue(lock.owns(c));
503	<	assertFalse(lock2.owns(c));
499	>	final Mutex sync = new Mutex();
500	>	final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
501	>	final Mutex sync2 = new Mutex();
502	>	assertTrue(sync.owns(c));
503	>	assertFalse(sync2.owns(c));
504		}
505
506		/**
507	<	* Calling await without holding lock throws IllegalMonitorStateException
507	>	* Calling await without holding sync throws IllegalMonitorStateException
508		*/
509		public void testAwait_IllegalMonitor() {
510	<	final Mutex lock = new Mutex();
511	<	final AbstractQueuedSynchronizer.ConditionObject c = lock.newCondition();
510	>	final Mutex sync = new Mutex();
511	>	final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
512		try {
513		c.await();
514		shouldThrow();
#	Line 426 | Line 521 | public class AbstractQueuedSynchronizerT
521		}
522
523		/**
524	<	* Calling signal without holding lock throws IllegalMonitorStateException
524	>	* Calling signal without holding sync throws IllegalMonitorStateException
525		*/
526		public void testSignal_IllegalMonitor() {
527	<	final Mutex lock = new Mutex();
528	<	final AbstractQueuedSynchronizer.ConditionObject c = lock.newCondition();
527	>	final Mutex sync = new Mutex();
528	>	final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
529		try {
530		c.signal();
531		shouldThrow();
#	Line 446 | Line 541 | public class AbstractQueuedSynchronizerT
541		* awaitNanos without a signal times out
542		*/
543		public void testAwaitNanos_Timeout() {
544	<	final Mutex lock = new Mutex();
545	<	final AbstractQueuedSynchronizer.ConditionObject c = lock.newCondition();
544	>	final Mutex sync = new Mutex();
545	>	final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
546		try {
547	<	lock.acquire(1);
547	>	sync.acquire(1);
548		long t = c.awaitNanos(100);
549		assertTrue(t <= 0);
550	<	lock.release(1);
550	>	sync.release(1);
551		}
552		catch (Exception ex) {
553		unexpectedException();
#	Line 460 | Line 555 | public class AbstractQueuedSynchronizerT
555		}
556
557		/**
558	<	*  timed await without a signal times out
558	>	*  Timed await without a signal times out
559		*/
560		public void testAwait_Timeout() {
561	<	final Mutex lock = new Mutex();
562	<	final AbstractQueuedSynchronizer.ConditionObject c = lock.newCondition();
561	>	final Mutex sync = new Mutex();
562	>	final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
563		try {
564	<	lock.acquire(1);
564	>	sync.acquire(1);
565		assertFalse(c.await(SHORT_DELAY_MS, TimeUnit.MILLISECONDS));
566	<	lock.release(1);
566	>	sync.release(1);
567		}
568		catch (Exception ex) {
569		unexpectedException();
#	Line 479 | Line 574 | public class AbstractQueuedSynchronizerT
574		* awaitUntil without a signal times out
575		*/
576		public void testAwaitUntil_Timeout() {
577	<	final Mutex lock = new Mutex();
578	<	final AbstractQueuedSynchronizer.ConditionObject c = lock.newCondition();
577	>	final Mutex sync = new Mutex();
578	>	final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
579		try {
580	<	lock.acquire(1);
580	>	sync.acquire(1);
581		java.util.Date d = new java.util.Date();
582		assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + 10)));
583	<	lock.release(1);
583	>	sync.release(1);
584		}
585		catch (Exception ex) {
586		unexpectedException();
#	Line 496 | Line 591 | public class AbstractQueuedSynchronizerT
591		* await returns when signalled
592		*/
593		public void testAwait() {
594	<	final Mutex lock = new Mutex();
595	<	final AbstractQueuedSynchronizer.ConditionObject c = lock.newCondition();
594	>	final Mutex sync = new Mutex();
595	>	final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
596		Thread t = new Thread(new Runnable() {
597		public void run() {
598		try {
599	<	lock.acquire(1);
599	>	sync.acquire(1);
600		c.await();
601	<	lock.release(1);
601	>	sync.release(1);
602		}
603		catch(InterruptedException e) {
604		threadUnexpectedException();
#	Line 514 | Line 609 | public class AbstractQueuedSynchronizerT
609		try {
610		t.start();
611		Thread.sleep(SHORT_DELAY_MS);
612	<	lock.acquire(1);
612	>	sync.acquire(1);
613		c.signal();
614	<	lock.release(1);
614	>	sync.release(1);
615		t.join(SHORT_DELAY_MS);
616		assertFalse(t.isAlive());
617		}
#	Line 531 | Line 626 | public class AbstractQueuedSynchronizerT
626		* hasWaiters throws NPE if null
627		*/
628		public void testHasWaitersNPE() {
629	<	final Mutex lock = new Mutex();
629	>	final Mutex sync = new Mutex();
630		try {
631	<	lock.hasWaiters(null);
631	>	sync.hasWaiters(null);
632		shouldThrow();
633		} catch (NullPointerException success) {
634		} catch (Exception ex) {
#	Line 545 | Line 640 | public class AbstractQueuedSynchronizerT
640		* getWaitQueueLength throws NPE if null
641		*/
642		public void testGetWaitQueueLengthNPE() {
643	<	final Mutex lock = new Mutex();
643	>	final Mutex sync = new Mutex();
644		try {
645	<	lock.getWaitQueueLength(null);
645	>	sync.getWaitQueueLength(null);
646		shouldThrow();
647		} catch (NullPointerException success) {
648		} catch (Exception ex) {
#	Line 560 | Line 655 | public class AbstractQueuedSynchronizerT
655		* getWaitingThreads throws NPE if null
656		*/
657		public void testGetWaitingThreadsNPE() {
658	<	final Mutex lock = new Mutex();
658	>	final Mutex sync = new Mutex();
659		try {
660	<	lock.getWaitingThreads(null);
660	>	sync.getWaitingThreads(null);
661		shouldThrow();
662		} catch (NullPointerException success) {
663		} catch (Exception ex) {
#	Line 575 | Line 670 | public class AbstractQueuedSynchronizerT
670		* hasWaiters throws IAE if not owned
671		*/
672		public void testHasWaitersIAE() {
673	<	final Mutex lock = new Mutex();
674	<	final AbstractQueuedSynchronizer.ConditionObject c = (lock.newCondition());
675	<	final Mutex lock2 = new Mutex();
673	>	final Mutex sync = new Mutex();
674	>	final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
675	>	final Mutex sync2 = new Mutex();
676		try {
677	<	lock2.hasWaiters(c);
677	>	sync2.hasWaiters(c);
678		shouldThrow();
679		} catch (IllegalArgumentException success) {
680		} catch (Exception ex) {
#	Line 588 | Line 683 | public class AbstractQueuedSynchronizerT
683		}
684
685		/**
686	<	* hasWaiters throws IMSE if not locked
686	>	* hasWaiters throws IMSE if not synced
687		*/
688		public void testHasWaitersIMSE() {
689	<	final Mutex lock = new Mutex();
690	<	final AbstractQueuedSynchronizer.ConditionObject c = (lock.newCondition());
689	>	final Mutex sync = new Mutex();
690	>	final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
691		try {
692	<	lock.hasWaiters(c);
692	>	sync.hasWaiters(c);
693		shouldThrow();
694		} catch (IllegalMonitorStateException success) {
695		} catch (Exception ex) {
#	Line 607 | Line 702 | public class AbstractQueuedSynchronizerT
702		* getWaitQueueLength throws IAE if not owned
703		*/
704		public void testGetWaitQueueLengthIAE() {
705	<	final Mutex lock = new Mutex();
706	<	final AbstractQueuedSynchronizer.ConditionObject c = (lock.newCondition());
707	<	final Mutex lock2 = new Mutex();
705	>	final Mutex sync = new Mutex();
706	>	final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
707	>	final Mutex sync2 = new Mutex();
708		try {
709	<	lock2.getWaitQueueLength(c);
709	>	sync2.getWaitQueueLength(c);
710		shouldThrow();
711		} catch (IllegalArgumentException success) {
712		} catch (Exception ex) {
#	Line 620 | Line 715 | public class AbstractQueuedSynchronizerT
715		}
716
717		/**
718	<	* getWaitQueueLength throws IMSE if not locked
718	>	* getWaitQueueLength throws IMSE if not synced
719		*/
720		public void testGetWaitQueueLengthIMSE() {
721	<	final Mutex lock = new Mutex();
722	<	final AbstractQueuedSynchronizer.ConditionObject c = (lock.newCondition());
721	>	final Mutex sync = new Mutex();
722	>	final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
723		try {
724	<	lock.getWaitQueueLength(c);
724	>	sync.getWaitQueueLength(c);
725		shouldThrow();
726		} catch (IllegalMonitorStateException success) {
727		} catch (Exception ex) {
#	Line 639 | Line 734 | public class AbstractQueuedSynchronizerT
734		* getWaitingThreads throws IAE if not owned
735		*/
736		public void testGetWaitingThreadsIAE() {
737	<	final Mutex lock = new Mutex();
738	<	final AbstractQueuedSynchronizer.ConditionObject c = (lock.newCondition());
739	<	final Mutex lock2 = new Mutex();
737	>	final Mutex sync = new Mutex();
738	>	final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
739	>	final Mutex sync2 = new Mutex();
740		try {
741	<	lock2.getWaitingThreads(c);
741	>	sync2.getWaitingThreads(c);
742		shouldThrow();
743		} catch (IllegalArgumentException success) {
744		} catch (Exception ex) {
#	Line 652 | Line 747 | public class AbstractQueuedSynchronizerT
747		}
748
749		/**
750	<	* getWaitingThreads throws IMSE if not locked
750	>	* getWaitingThreads throws IMSE if not synced
751		*/
752		public void testGetWaitingThreadsIMSE() {
753	<	final Mutex lock = new Mutex();
754	<	final AbstractQueuedSynchronizer.ConditionObject c = (lock.newCondition());
753	>	final Mutex sync = new Mutex();
754	>	final AbstractQueuedSynchronizer.ConditionObject c = (sync.newCondition());
755		try {
756	<	lock.getWaitingThreads(c);
756	>	sync.getWaitingThreads(c);
757		shouldThrow();
758		} catch (IllegalMonitorStateException success) {
759		} catch (Exception ex) {
#	Line 672 | Line 767 | public class AbstractQueuedSynchronizerT
767		* hasWaiters returns true when a thread is waiting, else false
768		*/
769		public void testHasWaiters() {
770	<	final Mutex lock = new Mutex();
771	<	final AbstractQueuedSynchronizer.ConditionObject c = lock.newCondition();
770	>	final Mutex sync = new Mutex();
771	>	final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
772		Thread t = new Thread(new Runnable() {
773		public void run() {
774		try {
775	<	lock.acquire(1);
776	<	threadAssertFalse(lock.hasWaiters(c));
777	<	threadAssertEquals(0, lock.getWaitQueueLength(c));
775	>	sync.acquire(1);
776	>	threadAssertFalse(sync.hasWaiters(c));
777	>	threadAssertEquals(0, sync.getWaitQueueLength(c));
778		c.await();
779	<	lock.release(1);
779	>	sync.release(1);
780		}
781		catch(InterruptedException e) {
782		threadUnexpectedException();
#	Line 692 | Line 787 | public class AbstractQueuedSynchronizerT
787		try {
788		t.start();
789		Thread.sleep(SHORT_DELAY_MS);
790	<	lock.acquire(1);
791	<	assertTrue(lock.hasWaiters(c));
792	<	assertEquals(1, lock.getWaitQueueLength(c));
790	>	sync.acquire(1);
791	>	assertTrue(sync.hasWaiters(c));
792	>	assertEquals(1, sync.getWaitQueueLength(c));
793		c.signal();
794	<	lock.release(1);
794	>	sync.release(1);
795		Thread.sleep(SHORT_DELAY_MS);
796	<	lock.acquire(1);
797	<	assertFalse(lock.hasWaiters(c));
798	<	assertEquals(0, lock.getWaitQueueLength(c));
799	<	lock.release(1);
796	>	sync.acquire(1);
797	>	assertFalse(sync.hasWaiters(c));
798	>	assertEquals(0, sync.getWaitQueueLength(c));
799	>	sync.release(1);
800		t.join(SHORT_DELAY_MS);
801		assertFalse(t.isAlive());
802		}
#	Line 714 | Line 809 | public class AbstractQueuedSynchronizerT
809		* getWaitQueueLength returns number of waiting threads
810		*/
811		public void testGetWaitQueueLength() {
812	<	final Mutex lock = new Mutex();
813	<	final AbstractQueuedSynchronizer.ConditionObject c = lock.newCondition();
812	>	final Mutex sync = new Mutex();
813	>	final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
814		Thread t1 = new Thread(new Runnable() {
815		public void run() {
816		try {
817	<	lock.acquire(1);
818	<	threadAssertFalse(lock.hasWaiters(c));
819	<	threadAssertEquals(0, lock.getWaitQueueLength(c));
817	>	sync.acquire(1);
818	>	threadAssertFalse(sync.hasWaiters(c));
819	>	threadAssertEquals(0, sync.getWaitQueueLength(c));
820		c.await();
821	<	lock.release(1);
821	>	sync.release(1);
822		}
823		catch(InterruptedException e) {
824		threadUnexpectedException();
#	Line 734 | Line 829 | public class AbstractQueuedSynchronizerT
829		Thread t2 = new Thread(new Runnable() {
830		public void run() {
831		try {
832	<	lock.acquire(1);
833	<	threadAssertTrue(lock.hasWaiters(c));
834	<	threadAssertEquals(1, lock.getWaitQueueLength(c));
832	>	sync.acquire(1);
833	>	threadAssertTrue(sync.hasWaiters(c));
834	>	threadAssertEquals(1, sync.getWaitQueueLength(c));
835		c.await();
836	<	lock.release(1);
836	>	sync.release(1);
837		}
838		catch(InterruptedException e) {
839		threadUnexpectedException();
#	Line 751 | Line 846 | public class AbstractQueuedSynchronizerT
846		Thread.sleep(SHORT_DELAY_MS);
847		t2.start();
848		Thread.sleep(SHORT_DELAY_MS);
849	<	lock.acquire(1);
850	<	assertTrue(lock.hasWaiters(c));
851	<	assertEquals(2, lock.getWaitQueueLength(c));
849	>	sync.acquire(1);
850	>	assertTrue(sync.hasWaiters(c));
851	>	assertEquals(2, sync.getWaitQueueLength(c));
852		c.signalAll();
853	<	lock.release(1);
853	>	sync.release(1);
854		Thread.sleep(SHORT_DELAY_MS);
855	<	lock.acquire(1);
856	<	assertFalse(lock.hasWaiters(c));
857	<	assertEquals(0, lock.getWaitQueueLength(c));
858	<	lock.release(1);
855	>	sync.acquire(1);
856	>	assertFalse(sync.hasWaiters(c));
857	>	assertEquals(0, sync.getWaitQueueLength(c));
858	>	sync.release(1);
859		t1.join(SHORT_DELAY_MS);
860		t2.join(SHORT_DELAY_MS);
861		assertFalse(t1.isAlive());
#	Line 775 | Line 870 | public class AbstractQueuedSynchronizerT
870		* getWaitingThreads returns only and all waiting threads
871		*/
872		public void testGetWaitingThreads() {
873	<	final Mutex lock = new Mutex();
874	<	final AbstractQueuedSynchronizer.ConditionObject c = lock.newCondition();
873	>	final Mutex sync = new Mutex();
874	>	final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
875		Thread t1 = new Thread(new Runnable() {
876		public void run() {
877		try {
878	<	lock.acquire(1);
879	<	threadAssertTrue(lock.getWaitingThreads(c).isEmpty());
878	>	sync.acquire(1);
879	>	threadAssertTrue(sync.getWaitingThreads(c).isEmpty());
880		c.await();
881	<	lock.release(1);
881	>	sync.release(1);
882		}
883		catch(InterruptedException e) {
884		threadUnexpectedException();
#	Line 794 | Line 889 | public class AbstractQueuedSynchronizerT
889		Thread t2 = new Thread(new Runnable() {
890		public void run() {
891		try {
892	<	lock.acquire(1);
893	<	threadAssertFalse(lock.getWaitingThreads(c).isEmpty());
892	>	sync.acquire(1);
893	>	threadAssertFalse(sync.getWaitingThreads(c).isEmpty());
894		c.await();
895	<	lock.release(1);
895	>	sync.release(1);
896		}
897		catch(InterruptedException e) {
898		threadUnexpectedException();
#	Line 806 | Line 901 | public class AbstractQueuedSynchronizerT
901		});
902
903		try {
904	<	lock.acquire(1);
905	<	assertTrue(lock.getWaitingThreads(c).isEmpty());
906	<	lock.release(1);
904	>	sync.acquire(1);
905	>	assertTrue(sync.getWaitingThreads(c).isEmpty());
906	>	sync.release(1);
907		t1.start();
908		Thread.sleep(SHORT_DELAY_MS);
909		t2.start();
910		Thread.sleep(SHORT_DELAY_MS);
911	<	lock.acquire(1);
912	<	assertTrue(lock.hasWaiters(c));
913	<	assertTrue(lock.getWaitingThreads(c).contains(t1));
914	<	assertTrue(lock.getWaitingThreads(c).contains(t2));
911	>	sync.acquire(1);
912	>	assertTrue(sync.hasWaiters(c));
913	>	assertTrue(sync.getWaitingThreads(c).contains(t1));
914	>	assertTrue(sync.getWaitingThreads(c).contains(t2));
915		c.signalAll();
916	<	lock.release(1);
916	>	sync.release(1);
917		Thread.sleep(SHORT_DELAY_MS);
918	<	lock.acquire(1);
919	<	assertFalse(lock.hasWaiters(c));
920	<	assertTrue(lock.getWaitingThreads(c).isEmpty());
921	<	lock.release(1);
918	>	sync.acquire(1);
919	>	assertFalse(sync.hasWaiters(c));
920	>	assertTrue(sync.getWaitingThreads(c).isEmpty());
921	>	sync.release(1);
922		t1.join(SHORT_DELAY_MS);
923		t2.join(SHORT_DELAY_MS);
924		assertFalse(t1.isAlive());
#	Line 840 | Line 935 | public class AbstractQueuedSynchronizerT
935		* awaitUninterruptibly doesn't abort on interrupt
936		*/
937		public void testAwaitUninterruptibly() {
938	<	final Mutex lock = new Mutex();
939	<	final AbstractQueuedSynchronizer.ConditionObject c = lock.newCondition();
938	>	final Mutex sync = new Mutex();
939	>	final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
940		Thread t = new Thread(new Runnable() {
941		public void run() {
942	<	lock.acquire(1);
942	>	sync.acquire(1);
943		c.awaitUninterruptibly();
944	<	lock.release(1);
944	>	sync.release(1);
945		}
946		});
947
#	Line 854 | Line 949 | public class AbstractQueuedSynchronizerT
949		t.start();
950		Thread.sleep(SHORT_DELAY_MS);
951		t.interrupt();
952	<	lock.acquire(1);
952	>	sync.acquire(1);
953		c.signal();
954	<	lock.release(1);
860	<	assert(t.isInterrupted());
954	>	sync.release(1);
955		t.join(SHORT_DELAY_MS);
956		assertFalse(t.isAlive());
957		}
#	Line 870 | Line 964 | public class AbstractQueuedSynchronizerT
964		* await is interruptible
965		*/
966		public void testAwait_Interrupt() {
967	<	final Mutex lock = new Mutex();
968	<	final AbstractQueuedSynchronizer.ConditionObject c = lock.newCondition();
967	>	final Mutex sync = new Mutex();
968	>	final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
969		Thread t = new Thread(new Runnable() {
970		public void run() {
971		try {
972	<	lock.acquire(1);
972	>	sync.acquire(1);
973		c.await();
974	<	lock.release(1);
974	>	sync.release(1);
975		threadShouldThrow();
976		}
977		catch(InterruptedException success) {
#	Line 901 | Line 995 | public class AbstractQueuedSynchronizerT
995		* awaitNanos is interruptible
996		*/
997		public void testAwaitNanos_Interrupt() {
998	<	final Mutex lock = new Mutex();
999	<	final AbstractQueuedSynchronizer.ConditionObject c = lock.newCondition();
998	>	final Mutex sync = new Mutex();
999	>	final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
1000		Thread t = new Thread(new Runnable() {
1001		public void run() {
1002		try {
1003	<	lock.acquire(1);
1003	>	sync.acquire(1);
1004		c.awaitNanos(1000 * 1000 * 1000); // 1 sec
1005	<	lock.release(1);
1005	>	sync.release(1);
1006		threadShouldThrow();
1007		}
1008		catch(InterruptedException success) {
#	Line 932 | Line 1026 | public class AbstractQueuedSynchronizerT
1026		* awaitUntil is interruptible
1027		*/
1028		public void testAwaitUntil_Interrupt() {
1029	<	final Mutex lock = new Mutex();
1030	<	final AbstractQueuedSynchronizer.ConditionObject c = lock.newCondition();
1029	>	final Mutex sync = new Mutex();
1030	>	final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
1031		Thread t = new Thread(new Runnable() {
1032		public void run() {
1033		try {
1034	<	lock.acquire(1);
1034	>	sync.acquire(1);
1035		java.util.Date d = new java.util.Date();
1036		c.awaitUntil(new java.util.Date(d.getTime() + 10000));
1037	<	lock.release(1);
1037	>	sync.release(1);
1038		threadShouldThrow();
1039		}
1040		catch(InterruptedException success) {
#	Line 964 | Line 1058 | public class AbstractQueuedSynchronizerT
1058		* signalAll wakes up all threads
1059		*/
1060		public void testSignalAll() {
1061	<	final Mutex lock = new Mutex();
1062	<	final AbstractQueuedSynchronizer.ConditionObject c = lock.newCondition();
1061	>	final Mutex sync = new Mutex();
1062	>	final AbstractQueuedSynchronizer.ConditionObject c = sync.newCondition();
1063		Thread t1 = new Thread(new Runnable() {
1064		public void run() {
1065		try {
1066	<	lock.acquire(1);
1066	>	sync.acquire(1);
1067		c.await();
1068	<	lock.release(1);
1068	>	sync.release(1);
1069		}
1070		catch(InterruptedException e) {
1071		threadUnexpectedException();
#	Line 982 | Line 1076 | public class AbstractQueuedSynchronizerT
1076		Thread t2 = new Thread(new Runnable() {
1077		public void run() {
1078		try {
1079	<	lock.acquire(1);
1079	>	sync.acquire(1);
1080		c.await();
1081	<	lock.release(1);
1081	>	sync.release(1);
1082		}
1083		catch(InterruptedException e) {
1084		threadUnexpectedException();
#	Line 996 | Line 1090 | public class AbstractQueuedSynchronizerT
1090		t1.start();
1091		t2.start();
1092		Thread.sleep(SHORT_DELAY_MS);
1093	<	lock.acquire(1);
1093	>	sync.acquire(1);
1094		c.signalAll();
1095	<	lock.release(1);
1095	>	sync.release(1);
1096		t1.join(SHORT_DELAY_MS);
1097		t2.join(SHORT_DELAY_MS);
1098		assertFalse(t1.isAlive());
#	Line 1014 | Line 1108 | public class AbstractQueuedSynchronizerT
1108		* toString indicates current state
1109		*/
1110		public void testToString() {
1111	<	Mutex lock = new Mutex();
1112	<	String us = lock.toString();
1111	>	Mutex sync = new Mutex();
1112	>	String us = sync.toString();
1113		assertTrue(us.indexOf("State = 0") >= 0);
1114	<	lock.acquire(1);
1115	<	String ls = lock.toString();
1114	>	sync.acquire(1);
1115	>	String ls = sync.toString();
1116		assertTrue(ls.indexOf("State = 1") >= 0);
1117		}
1118
#	Line 1058 | Line 1152 | public class AbstractQueuedSynchronizerT
1152		}
1153
1154		/**
1155	<	* release and has no effect when already signalled
1155	>	* releaseShared has no effect when already signalled
1156		*/
1157		public void testReleaseShared() {
1158		final BooleanLatch l = new BooleanLatch();

Diff Legend

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