diff options
| author | Narayan Kamath <narayan@google.com> | 2015-04-30 11:18:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-30 11:18:57 +0000 |
| commit | bc94779e22cc27abccf92693acc42c6081933200 (patch) | |
| tree | 034757087bf5a6d7536e49f8659bdcdf500ed07b | |
| parent | fb6f51992d635ee99eff6d72606d1cc43bb5cd7b (diff) | |
| parent | 713ceebccc66477e149dec18cad0baedec7e6741 (diff) | |
| download | libcore-bc94779e22cc27abccf92693acc42c6081933200.zip libcore-bc94779e22cc27abccf92693acc42c6081933200.tar.gz libcore-bc94779e22cc27abccf92693acc42c6081933200.tar.bz2 | |
am 713ceebc: Merge "Fix JSR-166 tests."
* commit '713ceebccc66477e149dec18cad0baedec7e6741':
Fix JSR-166 tests.
| -rw-r--r-- | jsr166-tests/src/test/java/jsr166/ExecutorsTest.java | 5 | ||||
| -rw-r--r-- | jsr166-tests/src/test/java/jsr166/JSR166TestCase.java | 30 | ||||
| -rw-r--r-- | jsr166-tests/src/test/java/jsr166/ThreadTest.java | 6 |
3 files changed, 10 insertions, 31 deletions
diff --git a/jsr166-tests/src/test/java/jsr166/ExecutorsTest.java b/jsr166-tests/src/test/java/jsr166/ExecutorsTest.java index 2518e63..ae475f1 100644 --- a/jsr166-tests/src/test/java/jsr166/ExecutorsTest.java +++ b/jsr166-tests/src/test/java/jsr166/ExecutorsTest.java @@ -350,7 +350,8 @@ public class ExecutorsTest extends JSR166TestCase { public void realRun() throws Exception { final ThreadGroup egroup = Thread.currentThread().getThreadGroup(); final ClassLoader thisccl = Thread.currentThread().getContextClassLoader(); - final AccessControlContext thisacc = AccessController.getContext(); + // android-note: Removed unsupported access controller check. + // final AccessControlContext thisacc = AccessController.getContext(); Runnable r = new CheckedRunnable() { public void realRun() { Thread current = Thread.currentThread(); @@ -365,7 +366,7 @@ public class ExecutorsTest extends JSR166TestCase { String name = current.getName(); assertTrue(name.endsWith("thread-1")); assertSame(thisccl, current.getContextClassLoader()); - assertEquals(thisacc, AccessController.getContext()); + // assertEquals(thisacc, AccessController.getContext()); done.countDown(); }}; ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory()); diff --git a/jsr166-tests/src/test/java/jsr166/JSR166TestCase.java b/jsr166-tests/src/test/java/jsr166/JSR166TestCase.java index d07d936..61fa66d 100644 --- a/jsr166-tests/src/test/java/jsr166/JSR166TestCase.java +++ b/jsr166-tests/src/test/java/jsr166/JSR166TestCase.java @@ -532,11 +532,7 @@ public class JSR166TestCase extends TestCase { * getPolicy/setPolicy. */ public void runWithPermissions(Runnable r, Permission... permissions) { - SecurityManager sm = System.getSecurityManager(); - if (sm == null) { - r.run(); - } - runWithSecurityManagerWithPermissions(r, permissions); + r.run(); } /** @@ -548,29 +544,7 @@ public class JSR166TestCase extends TestCase { */ public void runWithSecurityManagerWithPermissions(Runnable r, Permission... permissions) { - SecurityManager sm = System.getSecurityManager(); - if (sm == null) { - Policy savedPolicy = Policy.getPolicy(); - try { - Policy.setPolicy(permissivePolicy()); - System.setSecurityManager(new SecurityManager()); - runWithSecurityManagerWithPermissions(r, permissions); - } finally { - System.setSecurityManager(null); - Policy.setPolicy(savedPolicy); - } - } else { - Policy savedPolicy = Policy.getPolicy(); - AdjustablePolicy policy = new AdjustablePolicy(permissions); - Policy.setPolicy(policy); - - try { - r.run(); - } finally { - policy.addPermission(new SecurityPermission("setPolicy")); - Policy.setPolicy(savedPolicy); - } - } + r.run(); } /** diff --git a/jsr166-tests/src/test/java/jsr166/ThreadTest.java b/jsr166-tests/src/test/java/jsr166/ThreadTest.java index 2652201..27f22ca 100644 --- a/jsr166-tests/src/test/java/jsr166/ThreadTest.java +++ b/jsr166-tests/src/test/java/jsr166/ThreadTest.java @@ -53,7 +53,11 @@ public class ThreadTest extends JSR166TestCase { * setDefaultUncaughtExceptionHandler. */ public void testGetAndSetDefaultUncaughtExceptionHandler() { - assertEquals(null, Thread.getDefaultUncaughtExceptionHandler()); + // android-note: Removed assertion; all "normal" android apps (including CTS tests) have a + // default uncaught exception handler installed by the framework. + // + // assertEquals(null, Thread.getDefaultUncaughtExceptionHandler()); + // failure due to securityException is OK. // Would be nice to explicitly test both ways, but cannot yet. Thread.UncaughtExceptionHandler defaultHandler |