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

[km...@apache.org]

Author: kmarsden
Date: Fri Jun 12 16:14:39 2009
New Revision: 784175

URL: http://svn.apache.org/viewvc?rev=784175&view=rev
Log:
DERBY-4262 test NetScripts fails with IBM's weme6.1
 Disable existingServerDecorator for JSR169 and if client or server are not available in classpath.


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=784175&r1=784174&r2=784175&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 Jun 12 16:14:39 2009
@@ -530,6 +530,12 @@
     public static Test existingServerDecorator(Test test, 
             String hostName, int PortNumber)
     {
+    	// Need to have network server and client and not
+        // running in J2ME (JSR169).
+        if (!(Derby.hasClient() && Derby.hasServer())
+                || JDBC.vmSupportsJSR169())
+            return new TestSuite("empty: no network server support");
+
         Test r =
                 new ServerSetup(test, hostName, PortNumber);
         ((ServerSetup)r).setJDBCClient(JDBCClient.DERBYNETCLIENT);