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 my...@apache.org on 2013/11/13 00:28:19 UTC

svn commit: r1541311 - in /db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang: BooleanValuesTest.java TriggerTest.java XMLBindingTest.java XMLMissingClassesTest.java XMLTypeAndOpsTest.java

Author: myrnavl
Date: Tue Nov 12 23:28:18 2013
New Revision: 1541311

URL: http://svn.apache.org/r1541311
Log:
DERBY-6413; test failure in XML tests, TriggerTests and BooleanValuesTest with ibm 1.6 sr 15 in 10.7 and earlier
   Run the tests affected without security manager

Modified:
    db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BooleanValuesTest.java
    db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerTest.java
    db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLBindingTest.java
    db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLMissingClassesTest.java
    db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java

Modified: db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BooleanValuesTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BooleanValuesTest.java?rev=1541311&r1=1541310&r2=1541311&view=diff
==============================================================================
--- db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BooleanValuesTest.java (original)
+++ db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BooleanValuesTest.java Tue Nov 12 23:28:18 2013
@@ -32,6 +32,7 @@ import java.sql.Types;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.apache.derbyTesting.junit.SecurityManagerSetup;
 import org.apache.derbyTesting.junit.TestConfiguration;
 import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.XML;
@@ -97,7 +98,8 @@ public class BooleanValuesTest  extends 
     {
         Test result = (TestSuite) TestConfiguration.defaultSuite(BooleanValuesTest.class);
 
-        return result;
+        // run without SecurityManager; see DERBY-6413
+        return SecurityManagerSetup.noSecurityManager(result);
     }
 
     protected void    setUp()

Modified: db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerTest.java?rev=1541311&r1=1541310&r2=1541311&view=diff
==============================================================================
--- db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerTest.java (original)
+++ db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerTest.java Tue Nov 12 23:28:18 2013
@@ -49,6 +49,7 @@ import org.apache.derbyTesting.functionT
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.SecurityManagerSetup;
 import org.apache.derbyTesting.junit.TestConfiguration;
 import org.apache.derbyTesting.junit.XML;
 
@@ -75,8 +76,10 @@ public class TriggerTest extends BaseJDB
      * embedded. 
      */
     public static Test suite() {
-        return new CleanDatabaseTestSetup(
-                TestConfiguration.embeddedSuite(TriggerTest.class));
+        // run without security Manager, see DERBY-6413
+        return SecurityManagerSetup.noSecurityManager(
+            new CleanDatabaseTestSetup(
+                TestConfiguration.embeddedSuite(TriggerTest.class)));
         
     }
     

Modified: db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLBindingTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLBindingTest.java?rev=1541311&r1=1541310&r2=1541311&view=diff
==============================================================================
--- db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLBindingTest.java (original)
+++ db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLBindingTest.java Tue Nov 12 23:28:18 2013
@@ -33,6 +33,7 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.SecurityManagerSetup;
 import org.apache.derbyTesting.junit.XML;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.BaseJDBCTestSetup;
@@ -92,7 +93,8 @@ public class XMLBindingTest extends Base
                 });
         }
 
-        return suite;
+        // run without security manager, see DERBY-6413
+        return SecurityManagerSetup.noSecurityManager(suite);
     }
 
     /**

Modified: db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLMissingClassesTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLMissingClassesTest.java?rev=1541311&r1=1541310&r2=1541311&view=diff
==============================================================================
--- db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLMissingClassesTest.java (original)
+++ db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLMissingClassesTest.java Tue Nov 12 23:28:18 2013
@@ -23,6 +23,7 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.SecurityManagerSetup;
 import org.apache.derbyTesting.junit.XML;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.TestConfiguration;
@@ -90,7 +91,8 @@ public final class XMLMissingClassesTest
                 XMLMissingClassesTest.class));
         }
 
-        return suite;
+        // run without security manager, see DERBY-6413
+        return SecurityManagerSetup.noSecurityManager(suite);
     }
 
     /**

Modified: db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java?rev=1541311&r1=1541310&r2=1541311&view=diff
==============================================================================
--- db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java (original)
+++ db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLTypeAndOpsTest.java Tue Nov 12 23:28:18 2013
@@ -23,6 +23,7 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.apache.derbyTesting.junit.JDBC;
+import org.apache.derbyTesting.junit.SecurityManagerSetup;
 import org.apache.derbyTesting.junit.XML;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.BaseJDBCTestSetup;
@@ -89,7 +90,8 @@ public final class XMLTypeAndOpsTest ext
         suite.addTest(
             TestConfiguration.defaultSuite(XMLTypeAndOpsTest.class, false));
 
-        return (new XMLTestSetup(suite));
+        // run without security manager, see DERBY-6413
+        return SecurityManagerSetup.noSecurityManager(new XMLTestSetup(suite));
     }
 
     /**