db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
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 GMT
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) {}



Mime
View raw message