svn commit: r1374215 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java

[ka...@apache.org]

Author: kahatlen
Date: Fri Aug 17 12:02:35 2012
New Revision: 1374215

URL: http://svn.apache.org/viewvc?rev=1374215&view=rev
Log:
DERBY-5854: Test for methods in BrokeredCallableStatement

Exclude XA and connection pool tests on small devices.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java?rev=1374215&r1=1374214&r2=1374215&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java Fri Aug 17 12:02:35 2012
@@ -1023,10 +1023,15 @@ public final class TestConfiguration {
      * @param test the test/suite to decorate
      * @return A test setup with the requested decorator.
      */
-    public static TestSetup connectionCPDecorator(Test test)
+    public static Test connectionCPDecorator(Test test)
     {
-        return new ConnectorSetup(test,
+        if (JDBC.vmSupportsJDBC3()) {
+            return new ConnectorSetup(test,
              "org.apache.derbyTesting.junit.ConnectionPoolDataSourceConnector");
+        } else {
+            return new TestSuite("ConnectionPoolDataSource not supported");
+        }
+
     }
 
     /**
@@ -1040,10 +1045,14 @@ public final class TestConfiguration {
      * The tearDown reverts the configuration to the previous
      * configuration.
      */
-    public static TestSetup connectionXADecorator(Test test)
+    public static Test connectionXADecorator(Test test)
     {
-        return new ConnectorSetup(test,
+        if (JDBC.vmSupportsJDBC3()) {
+            return new ConnectorSetup(test,
                 "org.apache.derbyTesting.junit.XADataSourceConnector");
+        } else {
+            return new TestSuite("XADataSource not supported");
+        }
     }
     /**
      * Return a decorator that changes the configuration to obtain