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 dj...@apache.org on 2006/04/06 23:30:30 UTC
svn commit: r392084 -
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java
Author: djd
Date: Thu Apr 6 14:30:26 2006
New Revision: 392084
URL: http://svn.apache.org/viewcvs?rev=392084&view=rev
Log:
DERBY-1158 DERBY-1159 Remove special casing of network client for holdability tests
using executeUpdate methods.
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java?rev=392084&r1=392083&r2=392084&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/XATest.java Thu Apr 6 14:30:26 2006
@@ -919,12 +919,10 @@
xar.start(xid, XAResource.TMNOFLAGS);
// Statements not returning ResultSet's should be ok
- if (!TestUtil.isDerbyNetClientFramework()) { // DERBY-1159
sdh.executeUpdate("DELETE FROM APP.FOO where A < -99");
shh.executeUpdate("DELETE FROM APP.FOO where A < -99");
sch.executeUpdate("DELETE FROM APP.FOO where A < -99");
- }
-
+
ArrayList openRS = new ArrayList();
// Statements obtained while default was hold.
@@ -942,18 +940,14 @@
openRS.add(psch.executeQuery());
// Statements not returning ResultSet's should be ok
- if (!TestUtil.isDerbyNetClientFramework()) { // DERBY-1159
psdh_d.executeUpdate();
pshh_d.executeUpdate();
psch_d.executeUpdate();
- }
-
+
// Statements not returning ResultSet's should be ok
- if (!TestUtil.isDerbyNetClientFramework()) { // DERBY-1159
sdc.executeUpdate("DELETE FROM APP.FOO where A < -99");
shc.executeUpdate("DELETE FROM APP.FOO where A < -99");
scc.executeUpdate("DELETE FROM APP.FOO where A < -99");
- }
// Statements obtained while default was close.
// all should return close on commit ResultSets
@@ -967,11 +961,9 @@
openRS.add(pscc.executeQuery());
// Statements not returning ResultSet's should be ok
- if (!TestUtil.isDerbyNetClientFramework()) { // DERBY-1159
psdc_d.executeUpdate();
pshc_d.executeUpdate();
pscc_d.executeUpdate();
- }
// All the ResultSets should be open. Run a simple
// test, clearWarnings throws an error if the ResultSet