summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch')
-rw-r--r--dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch b/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch
new file mode 100644
index 000000000000..394830701fee
--- /dev/null
+++ b/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch
@@ -0,0 +1,39 @@
+--- mysql-connector-java-5.0.5/src/testsuite/regression/DataSourceRegressionTest.java 2007-03-01 17:48:47.000000000 +0100
++++ mysql-connector-java-5.0.5-no-jboss-test/src/testsuite/regression/DataSourceRegressionTest.java 2007-04-12 09:53:05.000000000 +0200
+@@ -52,7 +52,6 @@
+ import testsuite.simple.DataSourceTest;
+
+ import com.mysql.jdbc.NonRegisteringDriver;
+-import com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker;
+ import com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource;
+ import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
+ import com.mysql.jdbc.jdbc2.optional.MysqlDataSourceFactory;
+@@ -315,28 +314,6 @@
+ assertEquals(testIntFlag, thawedDs.getBlobSendChunkSize());
+ }
+
+- /**
+- * Tests fix for BUG#20242 - MysqlValidConnectionChecker for JBoss doesn't
+- * work with MySQLXADataSources.
+- *
+- * @throws Exception if the test fails.
+- */
+- public void testBug20242() throws Exception {
+- if (versionMeetsMinimum(5, 0)) {
+- try {
+- Class.forName("org.jboss.resource.adapter.jdbc.ValidConnectionChecker");
+- } catch (Exception ex) {
+- return; // class not available for testing
+- }
+-
+- MysqlXADataSource xaDs = new MysqlXADataSource();
+- xaDs.setUrl(dbUrl);
+-
+- MysqlValidConnectionChecker checker = new MysqlValidConnectionChecker();
+- assertNull(checker.isValidConnection(xaDs.getXAConnection().getConnection()));
+- }
+- }
+-
+ private void bindDataSource(String name, DataSource ds) throws Exception {
+ this.ctx.bind(this.tempDir.getAbsolutePath() + name, ds);
+ }