db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r160358 - in incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: harness/RunTest.java master/DerbyNetClient/badConnection.out master/DerbyNetClient/dataSourcePermissions_net.out master/DerbyNetClient/testij.out
Date Thu, 07 Apr 2005 01:17:55 GMT
Author: kmarsden
Date: Wed Apr  6 18:17:54 2005
New Revision: 160358

URL: http://svn.apache.org/viewcvs?view=rev&rev=160358
Log:
Submit master updates and test harness change to not require user   


Modified:
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/badConnection.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dataSourcePermissions_net.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java?view=diff&r1=160357&r2=160358
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/RunTest.java
Wed Apr  6 18:17:54 2005
@@ -1655,18 +1655,25 @@
 			    p.put(key, value);
 			
 		}
-		// Temporary until jcc supports null userid
-		if (NetServer.isClientConnection(framework))
+
+		
+		// jcc default requires userid
+		// derby client will default to "APP" so doesn't need harness
+		// to set a user.
+		if (NetServer.isJCCConnection(framework))
 		{
 			String user = System.getProperty("ij.user");
-			String password = System.getProperty("ij.password");
 			if (user == null) user = "APP";
-			if (password == null) password = "APP";
-
 		    p.put("ij.user",user);
-		    p.put("ij.password",password);
 		}
 
+		// both jcc and client require password for the moment
+		if (NetServer.isClientConnection(framework))
+		{	
+			String password = System.getProperty("ij.password");
+			if (password == null) password = "APP";
+		    p.put("ij.password",password);
+		}
 		
 		if (NetServer.isJCCConnection(framework))
 		{

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/badConnection.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/badConnection.out?view=diff&r1=160357&r2=160358
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/badConnection.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/badConnection.out
Wed Apr  6 18:17:54 2005
@@ -3,7 +3,7 @@
 SQLState is: null
 vendorCode is: -99999
 nextException is: null
-reason is: null userid not supported
+reason is: null password not supported
 Database not Found  (RDBNFNRM)
 passed SQLException all the way to client, then thrown by client...
 SQLState is: 08004

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dataSourcePermissions_net.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dataSourcePermissions_net.out?view=diff&r1=160357&r2=160358
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dataSourcePermissions_net.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dataSourcePermissions_net.out
Wed Apr  6 18:17:54 2005
@@ -1,6 +1,6 @@
 EXPECTED SHUTDOWN DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: wombat08006.DDatabase
'wombat' shutdown.((server log XXX)
 Checking authentication with DriverManager
-EXPECTED CONNFAIL null userid not supported
+EXPECTED CONNFAIL null password not supported
 EXPECTED CONNFAIL Connection authorization failure occurred.  Reason: userid invalid.
 DS connected as EDWARD
 DS connected as FRANCES

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out?view=diff&r1=160357&r2=160358
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out
Wed Apr  6 18:17:54 2005
@@ -24,7 +24,7 @@
 connect 'jdbc:derby://localhost:1527/wombat;create=true;user=judy;password=judy';
 ij(CONNECTION1)> connect 'jdbc:derby://localhost:1527/./wombat;user=judy;password=judy';
 ij(CONNECTION2)> connect 'jdbc:derby://localhost:1527/toursDB';
-ERROR (no SQLState): null userid not supported
+ERROR (no SQLState): null password not supported
 ij(CONNECTION2)> connect 'jdbc:derby://localhost:1527/toursDB' USER 'dbadmin' PASSWORD
'dbadbmin';
 ERROR 08004: The application server rejected establishment of the connection.  An attempt
was made to access a database, toursDB, which was not found.
 ij(CONNECTION2)> connect 'jdbc:derby://localhost:1527/wombat' USER 'APP' PASSWORD 'APP';



Mime
View raw message