1.1 --- a/samples/privilegedcreator/test/api/MutexTest.java	Mon May 25 18:35:11 2009 +0200
     1.2 +++ b/samples/privilegedcreator/test/api/MutexTest.java	Mon May 25 18:37:56 2009 +0200
     1.3 @@ -38,7 +38,7 @@
     1.4       */
     1.5      @Test
     1.6      public void readAccess() {
     1.7 -        Mutex instance = new Mutex();
     1.8 +        Mutex lock = new Mutex();
     1.9  
    1.10          // BEGIN: mutex.use
    1.11          class R implements Runnable {
    1.12 @@ -49,23 +49,23 @@
    1.13              }
    1.14          }
    1.15          R r = new R();
    1.16 -        instance.readAccess(r);
    1.17 -        assertEquals("One call to runnable", 1, r.cnt);
    1.18 +        lock.readAccess(r);
    1.19 +        assertEquals("Counter increased", 1, r.cnt);
    1.20          // END: mutex.use
    1.21      }
    1.22      
    1.23      @Test
    1.24      public void usePrivileged() {
    1.25 -        Mutex.Privileged lock = new Mutex.Privileged();
    1.26 -        Mutex mutex = new Mutex(lock);
    1.27 -
    1.28 +        int cnt = 0;
    1.29          // BEGIN: mutex.privileged
    1.30 -        lock.enterReadAccess();
    1.31 +        PRIVILEGED.enterReadAccess();
    1.32          try {
    1.33            // do the operation
    1.34 +            cnt++;
    1.35          } finally {
    1.36 -           lock.exitReadAccess();
    1.37 +           PRIVILEGED.exitReadAccess();
    1.38          }
    1.39 +        assertEquals("Counter increased", 1, cnt);
    1.40          // END: mutex.privileged
    1.41          
    1.42      }