Index: modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassTest.java =================================================================== --- modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassTest.java (revision 454621) +++ modules/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/ClassTest.java (working copy) @@ -173,13 +173,20 @@ return new ProtectionDomain[0]; } + private boolean recurring = false; + public boolean isPriviledged() { - combine = false; + if (recurring) return true; try { - AccessController.checkPermission(privCheckPermission); - } catch (SecurityException e) { + recurring = true; + combine = false; + try { + AccessController.checkPermission(privCheckPermission); + } catch (SecurityException e) {} + return !combine; + } finally { + recurring = false; } - return !combine; } } @@ -218,8 +225,8 @@ if (combiner.isPriviledged()) return; checkMemberAccess++; - assertTrue(reason + " unexpected class: " + cls, cls == checkClass); - assertTrue(reason + "unexpected type: " + type, type == checkType); + assertSame(reason, checkClass, cls); + assertEquals(reason, checkType, type); } @Override @@ -230,18 +237,13 @@ String name = checkClass.getName(); int index = name.lastIndexOf('.'); String checkPackage = name.substring(0, index); - assertTrue(reason + " unexpected package: " + packageName, packageName - .equals(checkPackage)); + assertEquals(reason, checkPackage, packageName); } public void assertProperCalls() { - assertTrue(reason + " unexpected checkPermission count: " + checkPermission, - checkPermission == 0); - assertTrue( - reason + " unexpected checkMemberAccess count: " + checkMemberAccess, - checkMemberAccess == 1); - assertTrue(reason + " unexpected checkPackageAccess count: " - + checkPackageAccess, checkPackageAccess == 1); + assertEquals(reason + " unexpected checkPermission count", 0, checkPermission); + assertEquals(reason + " unexpected checkMemberAccess count", 1, checkMemberAccess); + assertEquals(reason + " unexpected checkPackageAccess count", 1, checkPackageAccess); } }