From a5aa44670d4f447da3d095e05b70bc0166ffc7d9 Mon Sep 17 00:00:00 2001
From: Clebert Suconic <clebertsuconic@apache.org>
Date: Wed, 27 Jan 2016 18:36:21 -0500
Subject: [PATCH] Improvements on JDBC Test

---
 .../integration/jdbc/store/journal/JDBCJournalTest.java      | 5 +++++
 .../integration/persistence/StorageManagerTestBase.java      | 2 +-
 .../artemis/tests/integration/xa/BasicXaRecoveryTest.java    | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jdbc/store/journal/JDBCJournalTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jdbc/store/journal/JDBCJournalTest.java
index 6d58ed8da3..d978f08076 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jdbc/store/journal/JDBCJournalTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jdbc/store/journal/JDBCJournalTest.java
@@ -26,14 +26,19 @@ import org.apache.activemq.artemis.core.journal.IOCompletion;
 import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
 import org.apache.activemq.artemis.core.journal.RecordInfo;
 import org.apache.activemq.artemis.jdbc.store.journal.JDBCJournalImpl;
+import org.apache.activemq.artemis.tests.util.ThreadLeakCheckRule;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
 public class JDBCJournalTest {
 
+   @Rule
+   public ThreadLeakCheckRule threadLeakCheckRule = new ThreadLeakCheckRule();
+
    private static final String JOURNAL_TABLE_NAME = "MESSAGE_JOURNAL";
 
    private JDBCJournalImpl journal;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
index 07b00db644..e0b746a50d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
@@ -59,7 +59,7 @@ public abstract class StorageManagerTestBase extends ActiveMQTestBase {
       this.storeType = storeType;
    }
 
-   @Parameterized.Parameters(name = "storeType")
+   @Parameterized.Parameters(name = "storeType={0}")
    public static Collection<Object[]> data() {
       Object[][] params = new Object[][] {{StoreConfiguration.StoreType.FILE}, {StoreConfiguration.StoreType.DATABASE}};
       return Arrays.asList(params);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java
index ddd2f2687e..59cba5826b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/xa/BasicXaRecoveryTest.java
@@ -93,6 +93,11 @@ public class BasicXaRecoveryTest extends ActiveMQTestBase {
    public void setUp() throws Exception {
       super.setUp();
 
+      if (storeType == StoreConfiguration.StoreType.DATABASE) {
+         Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance();
+      }
+
+
       addressSettings.clear();
 
       if (storeType == StoreConfiguration.StoreType.DATABASE) {