Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 45651 invoked from network); 3 Jul 2007 18:58:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Jul 2007 18:58:02 -0000 Received: (qmail 85319 invoked by uid 500); 3 Jul 2007 18:58:05 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 85290 invoked by uid 500); 3 Jul 2007 18:58:05 -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 85279 invoked by uid 99); 3 Jul 2007 18:58:05 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Jul 2007 11:58:05 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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, 03 Jul 2007 11:58:01 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 8CF201A981A; Tue, 3 Jul 2007 11:57:41 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r552949 - in /db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting: functionTests/tests/jdbcapi/PrepStmtMetaDataTest.java junit/SQLUtilities.java Date: Tue, 03 Jul 2007 18:57:41 -0000 To: derby-commits@db.apache.org From: djd@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070703185741.8CF201A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djd Date: Tue Jul 3 11:57:40 2007 New Revision: 552949 URL: http://svn.apache.org/viewvc?view=rev&rev=552949 Log: Test cleanup from trunk - merge of 551870. Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/PrepStmtMetaDataTest.java db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/junit/SQLUtilities.java Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/PrepStmtMetaDataTest.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/PrepStmtMetaDataTest.java?view=diff&rev=552949&r1=552948&r2=552949 ============================================================================== --- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/PrepStmtMetaDataTest.java (original) +++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/PrepStmtMetaDataTest.java Tue Jul 3 11:57:40 2007 @@ -44,76 +44,72 @@ * ResultSet */ public void testNoResultSetMeta() throws SQLException { - Connection conn = getConnection(); - conn.setAutoCommit(true); // test MetaData with statements that // do not return a ResultSet - checkEmptyMetaData(conn, "create table ab(a int)", true); - checkEmptyMetaData(conn, "alter table ab add column b int", true); + checkEmptyMetaData("create table ab(a int)", true); + checkEmptyMetaData("alter table ab add column b int", true); - Statement s = conn.createStatement(); + Statement s = createStatement(); s .execute("create procedure testproc() language java external name " + "'org.apache.derbyTesting.functionTests.tests.jdbcapi.PrepStmtMetaDataTest.tstmeth'" + " parameter style java"); // test call statement - shouldn't have meta data - checkEmptyMetaData(conn, "call testproc()", false); + checkEmptyMetaData("call testproc()", false); // test drop procedure - meta data should be null - checkEmptyMetaData(conn, "drop procedure testproc", true); + checkEmptyMetaData("drop procedure testproc", true); // test create schema - meta data should be null - checkEmptyMetaData(conn, "create schema myschema", true); + checkEmptyMetaData("create schema myschema", true); // test drop schema - meta data should be null - checkEmptyMetaData(conn, "drop schema myschema restrict", true); + checkEmptyMetaData("drop schema myschema restrict", true); s.execute("CREATE TABLE TRIGTAB (i int)"); // test create trigger - meta data should be null checkEmptyMetaData( - conn, "create trigger mytrig after insert on ab for each row insert into trigtab values(1)", true); // test drop trigger - meta data should be null - checkEmptyMetaData(conn, "drop trigger mytrig", true); + checkEmptyMetaData("drop trigger mytrig", true); // test create view - meta data should be null - checkEmptyMetaData(conn, "create view myview as select * from ab", true); + checkEmptyMetaData("create view myview as select * from ab", true); // test drop view - meta data should be null - checkEmptyMetaData(conn, "drop view myview", true); + checkEmptyMetaData("drop view myview", true); // test drop table - meta data should be null - checkEmptyMetaData(conn, "drop table ab", false); + checkEmptyMetaData("drop table ab", false); // test create index - meta data should be null - checkEmptyMetaData(conn, "create index aindex on ab(a)", true); + checkEmptyMetaData("create index aindex on ab(a)", true); // test drop index - meta data should be null - checkEmptyMetaData(conn, "drop index aindex", false); + checkEmptyMetaData("drop index aindex", false); // test insert - meta data should be null - checkEmptyMetaData(conn, "insert into ab values(1,1)", true); + checkEmptyMetaData("insert into ab values(1,1)", true); // test update - meta data should be null - checkEmptyMetaData(conn, "update ab set a = 2", false); + checkEmptyMetaData("update ab set a = 2", false); // test delete - meta data should be null - checkEmptyMetaData(conn, "delete from ab", false); + checkEmptyMetaData("delete from ab", false); s.executeUpdate("drop table ab"); s.close(); } public void testAlterTableMeta() throws SQLException { - Connection conn = getConnection(); - Statement s = conn.createStatement(); + Statement s = createStatement(); s.executeUpdate("create table bug4579 (c11 int)"); s.executeUpdate("insert into bug4579 values (1)"); - PreparedStatement ps = conn.prepareStatement("select * from bug4579"); + PreparedStatement ps = prepareStatement("select * from bug4579"); ResultSetMetaData rsmd = ps.getMetaData(); assertEquals(1, rsmd.getColumnCount()); assertEquals(java.sql.Types.INTEGER, rsmd.getColumnType(1)); @@ -164,12 +160,10 @@ * execute PreparedStatement if true * @throws SQLException */ - private void checkEmptyMetaData(Connection conn, String sql, boolean execute) + private void checkEmptyMetaData(String sql, boolean execute) throws SQLException { - PreparedStatement ps; - ResultSetMetaData rsmd; - ps = conn.prepareStatement(sql); - rsmd = ps.getMetaData(); + PreparedStatement ps = prepareStatement(sql); + ResultSetMetaData rsmd = ps.getMetaData(); assertEmptyResultSetMetaData(rsmd); if (execute) ps.executeUpdate(); @@ -178,10 +172,10 @@ public void testAllDataTypesMetaData() throws SQLException { - Connection conn = getConnection(); - Statement s = conn.createStatement(); + Statement s = createStatement(); SQLUtilities.createAndPopulateAllDataTypesTable(s); - PreparedStatement ps = conn.prepareStatement("SELECT * from AllDataTypesTable"); + s.close(); + PreparedStatement ps = prepareStatement("SELECT * from AllDataTypesTable"); ResultSetMetaData rsmd = ps.getMetaData(); int colCount = rsmd.getColumnCount(); assertEquals(17, colCount); @@ -352,6 +346,8 @@ assertEquals("BLOB", rsmd.getColumnTypeName(17)); assertEquals(1024,rsmd.getPrecision(17)); assertEquals(0, rsmd.getScale(17)); + + ps.close(); } Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/junit/SQLUtilities.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/junit/SQLUtilities.java?view=diff&rev=552949&r1=552948&r2=552949 ============================================================================== --- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/junit/SQLUtilities.java (original) +++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/junit/SQLUtilities.java Tue Jul 3 11:57:40 2007 @@ -105,8 +105,6 @@ s.executeUpdate(createSQL.toString()); } - - s.close(); } /**