QPID-5821: [Java Broker] Refactor MessageStore and DurableConfigurationStore interfaces to remove message store settings map.

VirtualHost model objects now have attributes.

Work done by Keith Wall <kwall@apache.org> and me.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1605737 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 10 insertions, 6 deletions

diff --git a/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java b/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
index 8261e93347..3f48a8fc5a 100644
--- a/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
+++ b/qpid/java/broker-plugins/jdbc-store/src/test/java/org/apache/qpid/server/store/jdbc/JDBCMessageStoreTest.java
@@ -20,18 +20,21 @@
  */
 package org.apache.qpid.server.store.jdbc;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Map;
 import java.util.Set;
 
+import org.apache.qpid.server.model.VirtualHost;
 import org.apache.qpid.server.store.MessageStore;
 import org.apache.qpid.server.store.MessageStoreTestCase;
+import org.apache.qpid.server.virtualhost.jdbc.JDBCVirtualHost;
 
 public class JDBCMessageStoreTest extends MessageStoreTestCase
 {
@@ -61,12 +64,13 @@ public class JDBCMessageStoreTest extends MessageStoreTestCase
     }
 
     @Override
-    protected Map<String, Object> getStoreSettings()
+    protected VirtualHost createVirtualHost()
     {
         _connectionURL = "jdbc:derby:memory:/" + getTestName() + ";create=true";
-        Map<String, Object> messageStoreSettings = new HashMap<String, Object>();
-        messageStoreSettings.put(GenericJDBCMessageStore.CONNECTION_URL, _connectionURL);
-        return messageStoreSettings;
+
+        final JDBCVirtualHost jdbcVirtualHost = mock(JDBCVirtualHost.class);
+        when(jdbcVirtualHost.getConnectionUrl()).thenReturn(_connectionURL);
+        return jdbcVirtualHost;
     }