summaryrefslogtreecommitdiff
path: root/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java')
-rw-r--r--qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java93
1 files changed, 48 insertions, 45 deletions
diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
index 9f1f6f48c0..b784405881 100644
--- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
+++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
@@ -30,6 +30,7 @@ import java.util.UUID;
import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.logging.EventLogger;
+import org.apache.qpid.server.store.ConfiguredObjectRecordImpl;
import org.apache.qpid.server.store.StoreException;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.exchange.DirectExchange;
@@ -214,17 +215,16 @@ public class DurableConfigurationRecovererTest extends QpidTestCase
_durableConfigurationRecoverer.beginConfigurationRecovery(_store, 0);
- _durableConfigurationRecoverer.configuredObject(new UUID(1, 0),
+ _durableConfigurationRecoverer.configuredObject(new ConfiguredObjectRecordImpl(new UUID(1, 0),
"org.apache.qpid.server.model.Binding",
createBinding("key",
- DIRECT_EXCHANGE_ID,
- QUEUE_ID,
"x-filter-jms-selector",
- "wibble"));
+ "wibble"),
+ createBindingParents(DIRECT_EXCHANGE_ID, QUEUE_ID)));
final ConfiguredObjectRecord[] expected = {
- new ConfiguredObjectRecord(new UUID(1, 0), "Binding",
- createBinding("key", DIRECT_EXCHANGE_ID, QUEUE_ID))
+ new ConfiguredObjectRecordImpl(new UUID(1, 0), "Binding",
+ createBinding("key"))
};
verifyCorrectUpdates(expected);
@@ -239,32 +239,30 @@ public class DurableConfigurationRecovererTest extends QpidTestCase
_durableConfigurationRecoverer.beginConfigurationRecovery(_store, 0);
- _durableConfigurationRecoverer.configuredObject(new UUID(1, 0),
+ _durableConfigurationRecoverer.configuredObject(new ConfiguredObjectRecordImpl(new UUID(1, 0),
"org.apache.qpid.server.model.Binding",
createBinding("key",
- DIRECT_EXCHANGE_ID,
- QUEUE_ID,
"x-filter-jms-selector",
"wibble",
"not-a-selector",
- "moo"));
+ "moo"),
+ createBindingParents(DIRECT_EXCHANGE_ID, QUEUE_ID)));
final UUID customExchangeId = new UUID(3,0);
- _durableConfigurationRecoverer.configuredObject(new UUID(2, 0),
+ _durableConfigurationRecoverer.configuredObject(new ConfiguredObjectRecordImpl(new UUID(2, 0),
"org.apache.qpid.server.model.Binding",
createBinding("key",
- customExchangeId,
- QUEUE_ID,
"x-filter-jms-selector",
"wibble",
"not-a-selector",
- "moo"));
+ "moo"),
+ createBindingParents(customExchangeId,QUEUE_ID)));
- _durableConfigurationRecoverer.configuredObject(customExchangeId,
+ _durableConfigurationRecoverer.configuredObject(new ConfiguredObjectRecordImpl(customExchangeId,
"org.apache.qpid.server.model.Exchange",
- createExchange(CUSTOM_EXCHANGE_NAME, HeadersExchange.TYPE));
+ createExchange(CUSTOM_EXCHANGE_NAME, HeadersExchange.TYPE)));
final ExchangeImpl customExchange = mock(ExchangeImpl.class);
@@ -291,10 +289,10 @@ public class DurableConfigurationRecovererTest extends QpidTestCase
final ConfiguredObjectRecord[] expected = {
- new ConfiguredObjectRecord(new UUID(1, 0), "org.apache.qpid.server.model.Binding",
- createBinding("key", DIRECT_EXCHANGE_ID, QUEUE_ID, "not-a-selector", "moo")),
- new ConfiguredObjectRecord(new UUID(2, 0), "org.apache.qpid.server.model.Binding",
- createBinding("key", customExchangeId, QUEUE_ID, "not-a-selector", "moo"))
+ new ConfiguredObjectRecordImpl(new UUID(1, 0), "org.apache.qpid.server.model.Binding",
+ createBinding("key", "not-a-selector", "moo")),
+ new ConfiguredObjectRecordImpl(new UUID(2, 0), "org.apache.qpid.server.model.Binding",
+ createBinding("key", "not-a-selector", "moo"))
};
verifyCorrectUpdates(expected);
@@ -308,17 +306,16 @@ public class DurableConfigurationRecovererTest extends QpidTestCase
_durableConfigurationRecoverer.beginConfigurationRecovery(_store, 0);
- _durableConfigurationRecoverer.configuredObject(new UUID(1, 0),
+ _durableConfigurationRecoverer.configuredObject(new ConfiguredObjectRecordImpl(new UUID(1, 0),
"org.apache.qpid.server.model.Binding",
createBinding("key",
- TOPIC_EXCHANGE_ID,
- QUEUE_ID,
"x-filter-jms-selector",
- "wibble"));
+ "wibble"),
+ createBindingParents(TOPIC_EXCHANGE_ID,QUEUE_ID)));
final ConfiguredObjectRecord[] expected = {
- new ConfiguredObjectRecord(new UUID(1, 0), "Binding",
- createBinding("key", TOPIC_EXCHANGE_ID, QUEUE_ID, "x-filter-jms-selector", "wibble"))
+ new ConfiguredObjectRecordImpl(new UUID(1, 0), "Binding",
+ createBinding("key", "x-filter-jms-selector", "wibble"))
};
verifyCorrectUpdates(expected);
@@ -331,16 +328,15 @@ public class DurableConfigurationRecovererTest extends QpidTestCase
_durableConfigurationRecoverer.beginConfigurationRecovery(_store, 2);
- _durableConfigurationRecoverer.configuredObject(new UUID(1, 0),
+ _durableConfigurationRecoverer.configuredObject(new ConfiguredObjectRecordImpl(new UUID(1, 0),
"Binding",
createBinding("key",
- DIRECT_EXCHANGE_ID,
- QUEUE_ID,
"x-filter-jms-selector",
- "wibble"));
+ "wibble"),
+ createBindingParents(DIRECT_EXCHANGE_ID,QUEUE_ID)));
doThrow(new RuntimeException("Update Should not be called"))
- .when(_store).update(anyBoolean(), any(ConfiguredObjectRecord[].class));
+ .when(_store).update(anyBoolean(), any(ConfiguredObjectRecordImpl[].class));
_durableConfigurationRecoverer.completeConfigurationRecovery();
}
@@ -350,13 +346,13 @@ public class DurableConfigurationRecovererTest extends QpidTestCase
_durableConfigurationRecoverer.beginConfigurationRecovery(_store, 2);
- _durableConfigurationRecoverer.configuredObject(new UUID(1, 0),
+ _durableConfigurationRecoverer.configuredObject(new ConfiguredObjectRecordImpl(new UUID(1, 0),
"Binding",
createBinding("key",
- new UUID(3,0),
- QUEUE_ID,
"x-filter-jms-selector",
- "wibble"));
+ "wibble"),
+ createBindingParents(new UUID(3,0),
+ QUEUE_ID)));
try
{
@@ -378,8 +374,8 @@ public class DurableConfigurationRecovererTest extends QpidTestCase
try
{
final Map<String, Object> emptyArguments = Collections.emptyMap();
- _durableConfigurationRecoverer.configuredObject(new UUID(1, 0),
- "Wibble", emptyArguments);
+ _durableConfigurationRecoverer.configuredObject(new ConfiguredObjectRecordImpl(new UUID(1, 0),
+ "Wibble", emptyArguments));
_durableConfigurationRecoverer.completeConfigurationRecovery();
fail("Expected resolution to fail due to unknown object type");
}
@@ -425,11 +421,11 @@ public class DurableConfigurationRecovererTest extends QpidTestCase
_durableConfigurationRecoverer.beginConfigurationRecovery(_store, 2);
- _durableConfigurationRecoverer.configuredObject(queueId, Queue.class.getSimpleName(),
- createQueue("testQueue", exchangeId));
- _durableConfigurationRecoverer.configuredObject(exchangeId,
+ _durableConfigurationRecoverer.configuredObject(new ConfiguredObjectRecordImpl(queueId, Queue.class.getSimpleName(),
+ createQueue("testQueue", exchangeId)));
+ _durableConfigurationRecoverer.configuredObject(new ConfiguredObjectRecordImpl(exchangeId,
org.apache.qpid.server.model.Exchange.class.getSimpleName(),
- createExchange(CUSTOM_EXCHANGE_NAME, HeadersExchange.TYPE));
+ createExchange(CUSTOM_EXCHANGE_NAME, HeadersExchange.TYPE)));
_durableConfigurationRecoverer.completeConfigurationRecovery();
@@ -450,16 +446,14 @@ public class DurableConfigurationRecovererTest extends QpidTestCase
return null;
}
- }).when(_store).update(anyBoolean(), any(ConfiguredObjectRecord[].class));
+ }).when(_store).update(anyBoolean(), any(ConfiguredObjectRecordImpl[].class));
}
- private Map<String,Object> createBinding(String bindingKey, UUID exchangeId, UUID queueId, String... args)
+ private Map<String,Object> createBinding(String bindingKey, String... args)
{
Map<String, Object> binding = new LinkedHashMap<String, Object>();
binding.put("name", bindingKey);
- binding.put(Binding.EXCHANGE, exchangeId.toString());
- binding.put(Binding.QUEUE, queueId.toString());
Map<String,String> argumentMap = new LinkedHashMap<String, String>();
if(args != null && args.length != 0)
{
@@ -481,6 +475,15 @@ public class DurableConfigurationRecovererTest extends QpidTestCase
return binding;
}
+ private Map<String,ConfiguredObjectRecord> createBindingParents(UUID exchangeId, UUID queueId)
+ {
+ Map<String,ConfiguredObjectRecord> parents = new HashMap<String, ConfiguredObjectRecord>();
+ parents.put("Exchange", new ConfiguredObjectRecordImpl(exchangeId,"Exchange",Collections.<String,Object>emptyMap()));
+ parents.put("Queue", new ConfiguredObjectRecordImpl(queueId,"Queue",Collections.<String,Object>emptyMap()));
+
+ return parents;
+ }
+
private Map<String, Object> createExchange(String name, ExchangeType<HeadersExchange> type)
{
View Lorry Controller Status