Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 11259 invoked from network); 11 Jan 2011 09:44:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 11 Jan 2011 09:44:05 -0000 Received: (qmail 97028 invoked by uid 500); 11 Jan 2011 09:44:05 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 96956 invoked by uid 500); 11 Jan 2011 09:44:04 -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 96948 invoked by uid 99); 11 Jan 2011 09:44:03 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jan 2011 09:44:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Jan 2011 09:44:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C2B1123888E7; Tue, 11 Jan 2011 09:43:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1057548 - in /db/derby/code/branches/10.4: ./ java/testing/org/apache/derbyTesting/functionTests/tests/memory/TriggerTests.java Date: Tue, 11 Jan 2011 09:43:42 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110111094342.C2B1123888E7@eris.apache.org> Author: kahatlen Date: Tue Jan 11 09:43:42 2011 New Revision: 1057548 URL: http://svn.apache.org/viewvc?rev=1057548&view=rev Log: DERBY-4874: TriggerTests should report why it cannot drop table Merged revision 1057542 from trunk. Modified: db/derby/code/branches/10.4/ (props changed) db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/memory/TriggerTests.java Propchange: db/derby/code/branches/10.4/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jan 11 09:43:42 2011 @@ -1,3 +1,3 @@ /db/derby/code/branches/10.5:814216,958230 /db/derby/code/branches/10.6:1055601 -/db/derby/code/trunk:788436,793588,794303,796316,796372,797147,798347,798742,800523,803548,805696,809643,812669,816536,835286,882732,898635,915177,915733,917771,928065,934996,946794,954544,958163,958230,959550,980684,999119,1053724 +/db/derby/code/trunk:788436,793588,794303,796316,796372,797147,798347,798742,800523,803548,805696,809643,812669,816536,835286,882732,898635,915177,915733,917771,928065,934996,946794,954544,958163,958230,959550,980684,999119,1053724,1057542 Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/memory/TriggerTests.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/memory/TriggerTests.java?rev=1057548&r1=1057547&r2=1057548&view=diff ============================================================================== --- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/memory/TriggerTests.java (original) +++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/memory/TriggerTests.java Tue Jan 11 09:43:42 2011 @@ -241,19 +241,11 @@ public class TriggerTests extends BaseJD * @throws SQLException */ public void basicSetup() throws SQLException{ - Statement s = createStatement(); - try { - s.execute("drop table table1"); - } catch (SQLException sqle) {} - - try { - s.execute("drop table table2"); - } catch (SQLException sqle) {} - - try { - s.execute("drop table table3"); - } catch (SQLException sqle) {} + dropTable("TABLE1"); + dropTable("TABLE2"); + dropTable("TABLE3"); + Statement s = createStatement(); try { s.execute("drop trigger trigger1"); } catch (SQLException sqle) {}