db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1359068 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools: _Suite.java derbyrunjartest.java
Date Mon, 09 Jul 2012 11:18:56 GMT
Author: kahatlen
Date: Mon Jul  9 11:18:56 2012
New Revision: 1359068

URL: http://svn.apache.org/viewvc?rev=1359068&view=rev
Log:
DERBY-5821: tools/derbyrunjartest.java doesn't use jvmflags

Add the test to the tools suite. Skip testing the server command on
J2ME platforms, where it's not supported.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java?rev=1359068&r1=1359067&r2=1359068&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java
Mon Jul  9 11:18:56 2012
@@ -59,7 +59,7 @@ public class _Suite extends BaseTestCase
         suite.addTest(IjConnNameTest.suite());
         suite.addTest(RollBackWrappingWhenFailOnImportTest.suite());
         suite.addTest(ConnectWrongSubprotocolTest.suite());
-        
+        suite.addTest(derbyrunjartest.suite());
         suite.addTest(ij3Test.suite());
         
         // SysinfoAPITest currently fails when run against jars, so is

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java?rev=1359068&r1=1359067&r2=1359068&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java
Mon Jul  9 11:18:56 2012
@@ -27,6 +27,7 @@ import java.util.Arrays;
 import junit.framework.Test;
 import junit.framework.TestSuite;
 import org.apache.derbyTesting.junit.BaseTestCase;
+import org.apache.derbyTesting.junit.JDBC;
 import org.apache.derbyTesting.junit.SecurityManagerSetup;
 
 /**
@@ -41,8 +42,18 @@ public class derbyrunjartest extends Bas
 
     public static Test suite() {
         Class cl = derbyrunjartest.class;
+
+        TestSuite suite = new TestSuite(cl);
+
+        // The server command can only be used on platforms that support
+        // the network server. Specifically, it does not work in J2ME
+        // environments.
+        if (JDBC.vmSupportsJDBC3()) {
+            suite.addTest(new derbyrunjartest("xtestServer"));
+        }
+
         return new SecurityManagerSetup(
-                new TestSuite(cl),
+                suite,
                 cl.getName().replace('.', '/') + ".policy",
                 true);
     }
@@ -127,7 +138,7 @@ public class derbyrunjartest extends Bas
         runtool(cmd, output, 0);
     }
 
-    public void testServer() throws Exception {
+    public void xtestServer() throws Exception {
         String[] cmd = { "server" };
         String[] output = {
             "Usage: NetworkServerControl <commands> ",



Mime
View raw message