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 2014/10/09 23:56:51 UTC
svn commit: r1630598 -
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLOptimizerTraceTest.java
Author: myrnavl
Date: Thu Oct 9 21:56:51 2014
New Revision: 1630598
URL: http://svn.apache.org/r1630598
Log:
DERBY-6760; test_01_planCost has been failing for last couple nights on trunk and 10.11 with Unexpected SQL state. expected:<XIE0S> but was:<null>
making the test accept a 38000 sqlstate with ibm 1.6 jvm.
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLOptimizerTraceTest.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLOptimizerTraceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLOptimizerTraceTest.java?rev=1630598&r1=1630597&r2=1630598&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLOptimizerTraceTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/XMLOptimizerTraceTest.java Thu Oct 9 21:56:51 2014
@@ -27,6 +27,8 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import junit.framework.Test;
+
+import org.apache.derby.iapi.services.info.JVMInfo;
import org.apache.derbyTesting.junit.BaseTestSuite;
import org.apache.derbyTesting.junit.SupportFilesSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
@@ -328,10 +330,14 @@ public class XMLOptimizerTraceTest exte
conn,
"call syscs_util.syscs_register_tool( 'optimizerTracing', true, 'xml' )"
);
+ // IBM 1.6 is wrapping the exception in a 38000. See DERBY-6760.
+ String expectedError = FILE_EXISTS;
+ if (JVMInfo.isIBMJVM() && JVMInfo.JDK_ID==JVMInfo.J2SE_16)
+ expectedError = "38000";
expectExecutionError
(
conn,
- FILE_EXISTS,
+ expectedError,
"call syscs_util.syscs_register_tool( 'optimizerTracing', false, '" + traceFile.getPath() + "' )"
);
goodStatement