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.33 by jsr166, Wed Dec 31 19:58:21 2014 UTC vs.
Revision 1.35 by jsr166, Thu Nov 19 01:36:09 2015 UTC

#	Line 18 | Line 18 | import junit.framework.TestSuite;
18
19		public class SemaphoreTest extends JSR166TestCase {
20		public static void main(String[] args) {
21	<	junit.textui.TestRunner.run(suite());
21	>	main(suite(), args);
22		}
23		public static Test suite() {
24		return new TestSuite(SemaphoreTest.class);
#	Line 467 | Line 467 | public class SemaphoreTest extends JSR16
467		clone.release();
468		assertEquals(2, s.availablePermits());
469		assertEquals(1, clone.availablePermits());
470	+	assertFalse(s.hasQueuedThreads());
471	+	assertFalse(clone.hasQueuedThreads());
472	+	} catch (InterruptedException e) { threadUnexpectedException(e); }
473
474	<	s = new Semaphore(0, fair);
474	>	{
475	>	PublicSemaphore s = new PublicSemaphore(0, fair);
476		Thread t = newStartedThread(new InterruptibleLockRunnable(s));
477	<	waitForQueuedThreads(s);
478	<	clone = serialClone(s);
477	>	// waitForQueuedThreads(s); // suffers from "flicker", so ...
478	>	waitForQueuedThread(s, t);  // ... we use this instead
479	>	PublicSemaphore clone = serialClone(s);
480		assertEquals(fair, s.isFair());
481		assertEquals(fair, clone.isFair());
482		assertEquals(0, s.availablePermits());
#	Line 482 | Line 487 | public class SemaphoreTest extends JSR16
487		awaitTermination(t);
488		assertFalse(s.hasQueuedThreads());
489		assertFalse(clone.hasQueuedThreads());
490	<	} catch (InterruptedException e) { threadUnexpectedException(e); }
490	>	}
491		}
492
493		/**

Diff Legend

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