You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by my...@apache.org on 2007/04/13 00:15:54 UTC

svn commit: r528254 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ProcedureInTriggerTest.java

Author: myrnavl
Date: Thu Apr 12 15:15:54 2007
New Revision: 528254

URL: http://svn.apache.org/viewvc?view=rev&rev=528254
Log:
DERBY-2536 - modify ProcedureInTriggerTest for behavior because of existing bug when running with jdk16.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ProcedureInTriggerTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ProcedureInTriggerTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ProcedureInTriggerTest.java?view=diff&rev=528254&r1=528253&r2=528254
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ProcedureInTriggerTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/ProcedureInTriggerTest.java Thu Apr 12 15:15:54 2007
@@ -228,12 +228,15 @@
         //--- trigger creation will pass but firing should fail
         s.execute("create trigger bad_before_trig no cascade BEFORE insert on t2 for each STATEMENT call proc_wrongly_defined_as_no_sql(50, 'fifty')");
         //--- try to insert 2 rows
-        //--- Bug DERBY-1629 -- in JDK 1.6 you only get 38001, not 38000
         try {
             s.execute("insert into t2 values (1,2), (2,4)");
         } catch (SQLException se) {
-            assertSQLState("38000", se);
-            se = se.getNextException();
+            //--- Bug DERBY-1629 -- in JDK 1.6 you only get 38001, not 38000
+            if (!JDBC.vmSupportsJDBC4())
+            {
+                assertSQLState("38000", se);
+                se = se.getNextException();
+            }
             assertSQLState("38001", se);           
         }
         //--- check trigger is not fired.