Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 90278 invoked from network); 31 Jul 2006 23:23:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 31 Jul 2006 23:23:50 -0000 Received: (qmail 2788 invoked by uid 500); 31 Jul 2006 23:23:50 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 2767 invoked by uid 500); 31 Jul 2006 23:23:50 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 2756 invoked by uid 99); 31 Jul 2006 23:23:50 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Jul 2006 16:23:50 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Jul 2006 16:23:48 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id BEF5E1A981A; Mon, 31 Jul 2006 16:23:28 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r427358 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/grantRevoke.out suites/derbynetclientmats.runall tests/lang/grantRevoke.java Date: Mon, 31 Jul 2006 23:23:28 -0000 To: derby-commits@db.apache.org From: bandaram@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060731232328.BEF5E1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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()