svn commit: r427358 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/grantRevoke.out suites/derbynetclientmats.runall tests/lang/grantRevoke.java

[ba...@apache.org]

Author: bandaram
Date: Mon Jul 31 16:23:27 2006
New Revision: 427358

URL: http://svn.apache.org/viewvc?rev=427358&view=rev
Log:
DERBY-1367: Enable grantRevoke.java test in DerbyNetClient framework.

Submitted by Satheesh Bandaram (satheesh@gmail.com)

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevoke.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/grantRevoke.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevoke.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevoke.out?rev=427358&r1=427357&r2=427358&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevoke.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/grantRevoke.out Mon Jul 31 16:23:27 2006
@@ -1,13 +1,3 @@
-name = DAN password = MakeItFaster
-name = KREG password = visualWhat?
-name = JEFF password = HomeRun61
-name = AMES password = AnyVolunteer?
-name = JERRY password = SacreBleu
-name = HOWARDR password = IamBetterAtTennis
-name = FRANCOIS password = paceesalute
-name = JAMIE password = MrNamePlates
-name = OWNER password = BigCheese
-name = PUBLIC password = null
 Grant test: simple grant
 SelectPrivCheck: select * from S1.T1
 SelectPrivCheck: select count(*) from "S1"."T1" where (C1 is null) or (C2 is null) or (C3 is null)

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall?rev=427358&r1=427357&r2=427358&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall Mon Jul 31 16:23:27 2006
@@ -6,3 +6,4 @@
 jdbcapi/checkDataSource.java
 derbynet/ByteArrayCombinerStreamTest.junit
 derbynet/SqlExceptionTest.junit
+lang/grantRevoke.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/grantRevoke.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/grantRevoke.java?rev=427358&r1=427357&r2=427358&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/grantRevoke.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/grantRevoke.java Mon Jul 31 16:23:27 2006
@@ -59,6 +59,9 @@
 			// use the ij utility to read the property file and
 			// make the initial connection.
             ij.getPropertyArg(args);
+
+            // ij.password set in the _app.properties file gets overwritten by test harness!!!
+            System.setProperty("ij.password", "BigCheese");
             owner.setConnection( ij.startJBMS());
             dbmd = owner.getConnection().getMetaData();
 
@@ -1019,6 +1022,10 @@
                        String colPermsType)
             throws SQLException
         {
+			// Can't do this testing in client frameworks as FormatableBitSet is not exposed there
+			if (TestUtil.isNetFramework())
+				return;
+
             if( columns == null)
             {
                 ResultSet rs = owner.stmt.executeQuery(
@@ -1168,6 +1175,10 @@
          */
         void checkMetaData( String testLabel) throws SQLException
         {
+			// Can't do this testing in client frameworks as FormatableBitSet is not exposed there
+			if (TestUtil.isNetFramework())
+				return;
+
             if( columns == null)
             {
                 ResultSet rs = dbmd.getTablePrivileges( (String) null, schema, table);
@@ -1985,7 +1996,6 @@
         this.name = name;
         this.password = password;
         isPublic = "public".equalsIgnoreCase( name);
-		System.out.println("name = "+name+" password = "+password);
     }
 
     boolean isPublic()