Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 26713 invoked from network); 4 Sep 2007 13:13:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Sep 2007 13:13:18 -0000 Received: (qmail 70606 invoked by uid 500); 4 Sep 2007 13:13:13 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 70583 invoked by uid 500); 4 Sep 2007 13:13:13 -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 70569 invoked by uid 99); 4 Sep 2007 13:13:13 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Sep 2007 06:13:13 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Sep 2007 13:13:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A93371A9832; Tue, 4 Sep 2007 06:12:57 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r572662 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMetaDataJdbc30Test.java Date: Tue, 04 Sep 2007 13:12:57 -0000 To: derby-commits@db.apache.org From: kmarsden@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070904131257.A93371A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kmarsden Date: Tue Sep 4 06:12:56 2007 New Revision: 572662 URL: http://svn.apache.org/viewvc?rev=572662&view=rev Log: DERBY-2658 Convert jdbcapi/parameterMetaDataJdbc30.java to JUnit Fix SQLState assertions Contributed by Ramin Moazeni Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMetaDataJdbc30Test.java Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMetaDataJdbc30Test.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMetaDataJdbc30Test.java?rev=572662&r1=572661&r2=572662&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMetaDataJdbc30Test.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMetaDataJdbc30Test.java Tue Sep 4 06:12:56 2007 @@ -283,7 +283,7 @@ fail("DERBY-44 failed (didn't get SQLSTATE 22019)"); rs.close(); } catch (SQLException e) { - assertSQLState("22019", e.getSQLState(), e); + assertSQLState("22019", e); } ps.close(); } @@ -723,26 +723,33 @@ static void dumpParameterMetaDataNegative(ParameterMetaData paramMetaData) throws SQLException { int numParam = paramMetaData.getParameterCount(); + + /* + * DERBY-3039 - ParameterMetaData.isNullable() returns differenet SQLState in Embedded + * and Network Client + */ + String expectedSQLState = (usingEmbedded())?"XCL13":"XCL14"; + try { paramMetaData.isNullable(-1); fail("parameterMetaData.isNullable(-1) should have failed"); } catch (SQLException se) { - assertSQLState("XCL13",se.getSQLState(), se); + assertSQLState(expectedSQLState, se); } try { paramMetaData.isNullable(0); fail("parameterMetaData.isNullable(0) should have failed"); } catch (SQLException se) { - assertSQLState("XCL13",se.getSQLState(), se); + assertSQLState(expectedSQLState, se); } try { paramMetaData.isNullable(numParam+1); fail("parameterMetaData.isNullable("+(numParam+1)+") should have failed"); } catch (SQLException se) { - assertSQLState("XCL13",se.getSQLState(), se); + assertSQLState(expectedSQLState, se); } } @@ -810,5 +817,5 @@ * @param in_param4 */ public static void dummyDecimal(BigDecimal in_param, BigDecimal in_param2, BigDecimal[] in_param3, BigDecimal[] in_param4) { - } + } }