QPID-5087 : [Java Broker] Fix test to mock restoreQueue/Exchange rather than createQueue/Exchange

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

1 files changed, 4 insertions, 6 deletions

diff --git a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java b/java/broker/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
index d793895e7f..987a541d05 100644
--- a/java/broker/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
+++ b/java/broker/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
@@ -123,8 +123,8 @@ public class DurableConfigurationRecovererTest extends QpidTestCase
 
         _queueFactory = mock(QueueFactory.class);
 
-        when(_queueFactory.createQueue(idArg.capture(), queueArg.capture(),
-                anyBoolean(), anyString(), anyBoolean(), anyBoolean(), anyBoolean(), argsArg.capture())).then(
+        when(_queueFactory.restoreQueue(idArg.capture(), queueArg.capture(),
+                anyString(), anyBoolean(), anyBoolean(), anyBoolean(), argsArg.capture())).then(
                 new Answer()
                 {
 
@@ -270,10 +270,9 @@ public class DurableConfigurationRecovererTest extends QpidTestCase
 
         final Exchange customExchange = mock(Exchange.class);
 
-        when(_exchangeFactory.createExchange(eq(customExchangeId),
+        when(_exchangeFactory.restoreExchange(eq(customExchangeId),
                                              eq(CUSTOM_EXCHANGE_NAME),
                                              eq(HeadersExchange.TYPE.getType()),
-                                             anyBoolean(),
                                              anyBoolean())).thenReturn(customExchange);
 
         final ConfiguredObjectRecord[] expected = {
@@ -387,10 +386,9 @@ public class DurableConfigurationRecovererTest extends QpidTestCase
         when(customExchange.getId()).thenReturn(exchangeId);
         when(customExchange.getName()).thenReturn(CUSTOM_EXCHANGE_NAME);
 
-        when(_exchangeFactory.createExchange(eq(exchangeId),
+        when(_exchangeFactory.restoreExchange(eq(exchangeId),
                                              eq(CUSTOM_EXCHANGE_NAME),
                                              eq(HeadersExchange.TYPE.getType()),
-                                             anyBoolean(),
                                              anyBoolean())).thenReturn(customExchange);
 
         _durableConfigurationRecoverer.beginConfigurationRecovery(_store, 2);