ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/SemaphoreTest.java
(Generate patch)

Comparing jsr166/src/test/tck/SemaphoreTest.java (file contents):
Revision 1.30 by jsr166, Fri Jun 3 05:07:14 2011 UTC vs.
Revision 1.37 by jsr166, Sat May 13 23:50:00 2017 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
10 < import java.util.*;
9 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 >
11 > import java.util.Collection;
12   import java.util.concurrent.CountDownLatch;
13   import java.util.concurrent.Semaphore;
14 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
14 >
15 > import junit.framework.AssertionFailedError;
16 > import junit.framework.Test;
17 > 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 72 | Line 76 | public class SemaphoreTest extends JSR16
76                  throw new AssertionFailedError("timed out");
77              Thread.yield();
78          }
79 <        assert(s.hasQueuedThreads());
79 >        assertTrue(s.hasQueuedThreads());
80          assertTrue(t.isAlive());
81      }
82  
# Line 297 | Line 301 | public class SemaphoreTest extends JSR16
301          waitForQueuedThread(s, t2);
302          t2.interrupt();
303  
304 <        assertThreadStaysAlive(t1);
305 <        assertTrue(t2.isAlive());
304 >        assertThreadBlocks(t1, Thread.State.WAITING);
305 >        assertThreadBlocks(t2, Thread.State.WAITING);
306  
307          s.release(2);
308  
# Line 463 | 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 478 | 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      /**
# Line 586 | Line 595 | public class SemaphoreTest extends JSR16
595                  s.acquire(3);
596              }});
597  
598 <        waitForQueuedThreads(s);
598 >        waitForQueuedThread(s, t1);
599  
600          Thread t2 = newStartedThread(new CheckedRunnable() {
601              public void realRun() throws InterruptedException {
# Line 612 | Line 621 | public class SemaphoreTest extends JSR16
621          assertTrue(t2.isAlive());
622          s.release();
623          awaitTermination(t2);
624 <   }
624 >    }
625  
626      /**
627       * toString indicates current number of permits

Diff Legend

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