You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2017/01/15 21:03:34 UTC
svn commit: r1778945 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting:
junit/BaseTestCase.java unitTests/junit/SystemPrivilegesPermissionTest.java
Author: rhillegas
Date: Sun Jan 15 21:03:34 2017
New Revision: 1778945
URL: http://svn.apache.org/viewvc?rev=1778945&view=rev
Log:
DERBY-6856: Disable SystemPrivilegesPermissionTest.testSerialization(), an unnecessary test case which fails on JDK 9. Tests passed cleanly on derby-6856-10-aa-disable-permissions-subverting-test.diff.
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java?rev=1778945&r1=1778944&r2=1778945&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java Sun Jan 15 21:03:34 2017
@@ -880,6 +880,10 @@ public abstract class BaseTestCase
return getSystemProperty("java.version").startsWith("1.7");
}
+ public static final boolean isJava8() {
+ return getSystemProperty("java.version").startsWith("1.8");
+ }
+
public static final boolean runsWithEmma() {
return getSystemProperty("java.class.path").indexOf("emma.jar") != -1;
}
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.java?rev=1778945&r1=1778944&r2=1778945&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/junit/SystemPrivilegesPermissionTest.java Sun Jan 15 21:03:34 2017
@@ -209,8 +209,19 @@ public class SystemPrivilegesPermissionT
// We need to manipulate private and final fields in order to test
// deserialization of invalid objects. Disable the security manager
// for this test case to allow that.
- suite.addTest(SecurityManagerSetup.noSecurityManager(
- new SystemPrivilegesPermissionTest("testSerialization")));
+ //
+ // As of Java 9, you can't subvert access controls via this ruse.
+ // Only run this test on Java 8.
+ if (isJava8())
+ {
+ suite.addTest
+ (
+ SecurityManagerSetup.noSecurityManager
+ (
+ new SystemPrivilegesPermissionTest("testSerialization")
+ )
+ );
+ }
return suite;
}