db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r603088 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting: functionTests/tests/derbynet/SSLTest.java functionTests/tests/derbynet/SecureServerTest.java junit/NetworkServerTestSetup.java
Date Mon, 10 Dec 2007 23:16:05 GMT
Author: djd
Date: Mon Dec 10 15:16:04 2007
New Revision: 603088

URL: http://svn.apache.org/viewvc?rev=603088&view=rev
Log:
Add some comments to NetworkServerTestSetp and change one constructor so that it no longer
incorrectly implies that it can start the network server within the same virtual machine.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java?rev=603088&r1=603087&r2=603088&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java
Mon Dec 10 15:16:04 2007
@@ -120,7 +120,6 @@
             new NetworkServerTestSetup(sslTest,
                                        startupProperties,
                                        startupArgs,
-                                       true,
                                        true, 
                                        sslTest._inputStreamHolder);
         

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java?rev=603088&r1=603087&r2=603088&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
Mon Dec 10 15:16:04 2007
@@ -248,7 +248,6 @@
              secureServerTest,
              startupProperties,
              startupArgs,
-             true,
              secureServerTest._outcome.serverShouldComeUp(),
              secureServerTest._inputStreamHolder
              );

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java?rev=603088&r1=603087&r2=603088&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java
Mon Dec 10 15:16:04 2007
@@ -35,10 +35,6 @@
  * Test decorator that starts the network server on startup
  * and stops it on teardown.
  * 
- *
- * Currently it will start the network server in the same VM
- * and it does not support starting it from a remote 
- * machine.
  */
 final public class NetworkServerTestSetup extends BaseTestSetup {
 
@@ -66,12 +62,31 @@
     private final boolean useSeparateProcess;
     private final boolean serverShouldComeUp;
     private final InputStream[] inputStreamHolder;
+    
+    /**
+     * System properties to set on the command line (using -D)
+     * only when starting the server in a separate virtual machine.
+     */
     private final String[]    systemProperties;
+    
+    /**
+     * Startup arguments for the command line
+     * only when starting the server in a separate virtual machine.
+     */
     private final String[]    startupArgs;
     private Process serverProcess;
     
     /**
-     * Decorator this test with the NetworkServerTestSetup
+     * Decorator this test with the NetworkServerTestSetup.
+     * 
+     * Runs the server using the current configuration (at the time
+     * of setup).
+     * 
+     * @param asCommand True to start using NetworkServerControl.main()
+     * within the same virtual machine, false to use NetworkServerControl.start.
+     * 
+     * @see NetworkServerControl#main(String[])
+     * @see NetworkServerControl#start(PrintWriter)
      */
     public NetworkServerTestSetup(Test test, boolean asCommand) {
         super(test);
@@ -85,14 +100,15 @@
 }
 
      /**
-     * Decorator for starting up with specific command args.
+     * Decorator for starting up with specific command args
+     * and system properties. Server is always started up
+     * in a separate process with a separate virtual machine.
      */
     public NetworkServerTestSetup
         (
          Test test,
          String[] systemProperties,
          String[] startupArgs,
-         boolean useSeparateProcess,
          boolean serverShouldComeUp,
          InputStream[] inputStreamHolder
         )



Mime
View raw message