db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r638155 - in /db/derby/code/branches/10.3.2.1_test/java: drda/org/apache/derby/drda/ testing/org/apache/derbyTesting/functionTests/tests/derbynet/ testing/org/apache/derbyTesting/junit/
Date Tue, 18 Mar 2008 00:31:13 GMT
Author: kmarsden
Date: Mon Mar 17 17:31:12 2008
New Revision: 638155

URL: http://svn.apache.org/viewvc?rev=638155&view=rev
Log:
Portions of DERBY-2109 test changes (632502)  for required user/password for 
network server shutdown with authentication.  Also put in stubs
for new NetworkServerControl commands.

Modified:
    db/derby/code/branches/10.3.2.1_test/java/drda/org/apache/derby/drda/NetworkServerControl.java
    db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java
    db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
    db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java

Modified: db/derby/code/branches/10.3.2.1_test/java/drda/org/apache/derby/drda/NetworkServerControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3.2.1_test/java/drda/org/apache/derby/drda/NetworkServerControl.java?rev=638155&r1=638154&r2=638155&view=diff
==============================================================================
--- db/derby/code/branches/10.3.2.1_test/java/drda/org/apache/derby/drda/NetworkServerControl.java
(original)
+++ db/derby/code/branches/10.3.2.1_test/java/drda/org/apache/derby/drda/NetworkServerControl.java
Mon Mar 17 17:31:12 2008
@@ -214,7 +214,13 @@
 										portNumber);
 
 	}
-	
+
+    public NetworkServerControl(InetAddress address,int portNumber, String user, String password)
throws Exception
+    {
+        serverImpl = new NetworkServerControlImpl(address, 
+                portNumber);
+
+    }
 
 	/**
 	 * 
@@ -239,7 +245,14 @@
 
 	}
 	
-    
+
+    public NetworkServerControl(String user, String password) throws Exception
+    {
+        
+        serverImpl = new NetworkServerControlImpl();
+
+    }
+
 	/**
 	 * main routine for NetworkServerControl
 	 *

Modified: db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java?rev=638155&r1=638154&r2=638155&view=diff
==============================================================================
--- db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java
(original)
+++ db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SSLTest.java
Mon Mar 17 17:31:12 2008
@@ -124,7 +124,8 @@
                                        startupArgs,
                                        true,
                                        true, 
-                                       sslTest._inputStreamHolder);
+                                       sslTest._inputStreamHolder,
+                                       "MARY", "marypwd");
         
         sslTest.nsTestSetup = networkServerTestSetup;
         

Modified: db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java?rev=638155&r1=638154&r2=638155&view=diff
==============================================================================
--- db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
(original)
+++ db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/SecureServerTest.java
Mon Mar 17 17:31:12 2008
@@ -250,7 +250,9 @@
              startupArgs,
              true,
              secureServerTest._outcome.serverShouldComeUp(),
-             secureServerTest._inputStreamHolder
+             secureServerTest._inputStreamHolder,
+             SST_USER_NAME,
+             SST_PASSWORD
              );
 
         secureServerTest.nsTestSetup = networkServerTestSetup;

Modified: db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java?rev=638155&r1=638154&r2=638155&view=diff
==============================================================================
--- db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java
(original)
+++ db/derby/code/branches/10.3.2.1_test/java/testing/org/apache/derbyTesting/junit/NetworkServerTestSetup.java
Mon Mar 17 17:31:12 2008
@@ -71,6 +71,10 @@
     private final String[]    systemProperties;
     private final String[]    startupArgs;
     private Process serverProcess;
+
+    private static String user;
+
+    private  static String password;
     
     /**
      * Decorator this test with the NetworkServerTestSetup
@@ -96,7 +100,9 @@
          String[] startupArgs,
          boolean useSeparateProcess,
          boolean serverShouldComeUp,
-         InputStream[] inputStreamHolder
+         InputStream[] inputStreamHolder,
+         String user,
+         String password
         )
     {
         super(test);
@@ -108,6 +114,8 @@
         this.useSeparateProcess = true;
         this.serverShouldComeUp = serverShouldComeUp;
         this.inputStreamHolder = inputStreamHolder;
+        this.user = user;
+        this.password = password;
     }
 
     /**
@@ -327,7 +335,7 @@
         if (config.getSsl() == null) {
             return new NetworkServerControl
                 (InetAddress.getByName(config.getHostName()), 
-                 config.getPort());
+                 config.getPort(),user,password);
         } else {
             // This is a hack. A NetworkServerControl constructor with
             // the needed interface to control sslMode (and possibly



Mime
View raw message