Author: djd
Date: Mon Nov 19 15:36:27 2007
New Revision: 596488
URL: http://svn.apache.org/viewvc?rev=596488&view=rev
Log:
Merge 554397 from trunk - fix AutoloadTest to not fail on non-JDK platforms
Modified:
db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java
Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java?rev=596488&r1=596487&r2=596488&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java
(original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/AutoloadTest.java
Mon Nov 19 15:36:27 2007
@@ -120,7 +120,7 @@
// not loaded implicitly by some other means.
TestSuite suite = new TestSuite("AutoloadTest: no autoloading expected");
- suite.addTest(new AutoloadTest("testEmbeddedNotStarted"));
+ suite.addTest(SecurityManagerSetup.noSecurityManager(new AutoloadTest("testEmbeddedNotStarted")));
suite.addTest(new AutoloadTest("noloadTestNodriverLoaded"));
suite.addTest(TestConfiguration.clientServerDecorator(
new AutoloadTest("noloadTestNodriverLoaded")));
@@ -318,7 +318,11 @@
/**
* Return true if a ThreadGroup exists that has a name
- * starting with derby.
+ * starting with 'derby.'. This needs to run without a security
+ * manager as it requires permissions to see all active
+ * thread groups. Since this not testing Derby functionality
+ * there's harm to not having a security manager, since
+ * no code is executed against Derby.
*/
private boolean hasDerbyThreadGroup() {
ThreadGroup tg = Thread.currentThread().getThreadGroup();
|