You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2014/04/20 19:00:48 UTC
svn commit: r1588794 [3/3] - in /qpid/trunk/qpid/java:
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/
broker-core/src/main/java/org/apache/qpid/server/ broker-core...
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerTest.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerTest.java Sun Apr 20 17:00:46 2014
@@ -20,23 +20,25 @@
*/
package org.apache.qpid.server.security.auth.manager;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.security.auth.login.AccountNotFoundException;
+
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.User;
+import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.security.auth.AuthenticationResult;
+import org.apache.qpid.server.util.BrokerTestHelper;
import org.apache.qpid.test.utils.QpidTestCase;
- import org.apache.qpid.server.security.SecurityManager;
-
-import javax.security.auth.login.AccountNotFoundException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
public class ScramSHA1AuthenticationManagerTest extends QpidTestCase
{
@@ -51,7 +53,7 @@ public class ScramSHA1AuthenticationMana
super.setUp();
_executor = new TaskExecutor();
_executor.start();
- _broker = mock(Broker.class);
+ _broker = BrokerTestHelper.createBrokerMock();
_securityManager = mock(SecurityManager.class);
when(_broker.getTaskExecutor()).thenReturn(_executor);
when(_broker.getSecurityManager()).thenReturn(_securityManager);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java Sun Apr 20 17:00:46 2014
@@ -30,15 +30,13 @@ import javax.security.sasl.SaslException
import javax.security.sasl.SaslServer;
import org.apache.qpid.server.model.AuthenticationProvider;
-import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus;
import org.apache.qpid.server.security.auth.sasl.SaslUtil;
import org.apache.qpid.server.security.auth.sasl.plain.PlainSaslServer;
+import org.apache.qpid.server.util.BrokerTestHelper;
import org.apache.qpid.test.utils.QpidTestCase;
-import static org.mockito.Mockito.mock;
-
public class SimpleAuthenticationManagerTest extends QpidTestCase
{
private static final String TEST_USER = "testUser";
@@ -51,8 +49,8 @@ public class SimpleAuthenticationManager
Map<String,Object> authManagerAttrs = new HashMap<String, Object>();
authManagerAttrs.put(AuthenticationProvider.NAME,"MANAGEMENT_MODE_AUTHENTICATION");
authManagerAttrs.put(AuthenticationProvider.ID, UUID.randomUUID());
- final SimpleAuthenticationManager authManager = new SimpleAuthenticationManager(authManagerAttrs, mock(Broker.class)
- );
+ final SimpleAuthenticationManager authManager = new SimpleAuthenticationManager(authManagerAttrs,
+ BrokerTestHelper.createBrokerMock());
authManager.addUser(TEST_USER, TEST_PASSWORD);
_authenticationManager = authManager;
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java Sun Apr 20 17:00:46 2014
@@ -35,12 +35,13 @@ import org.apache.qpid.server.model.Auth
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.SystemContext;
import org.apache.qpid.server.model.TrustStore;
+import org.apache.qpid.server.util.BrokerTestHelper;
public class SimpleLDAPAuthenticationManagerFactoryTest extends TestCase
{
private SimpleLDAPAuthenticationManagerFactory _factory = new SimpleLDAPAuthenticationManagerFactory();
private Map<String, Object> _configuration = new HashMap<String, Object>();
- private Broker _broker = mock(Broker.class);
+ private Broker _broker = BrokerTestHelper.createBrokerMock();
private SystemContext _systemContext = mock(SystemContext.class);
private TrustStore _trustStore = mock(TrustStore.class);
@@ -51,9 +52,6 @@ public class SimpleLDAPAuthenticationMan
when(_trustStore.getName()).thenReturn("mytruststore");
when(_trustStore.getId()).thenReturn(UUID.randomUUID());
- when(_broker.getCategoryClass()).thenReturn(Broker.class);
- when(_broker.getParent(eq(SystemContext.class))).thenReturn(_systemContext);
- when(_systemContext.getChildren(eq(Broker.class))).thenReturn(Collections.singleton(_broker));
_configuration.put(AuthenticationProvider.ID, UUID.randomUUID());
_configuration.put(AuthenticationProvider.NAME, getName());
@@ -65,7 +63,7 @@ public class SimpleLDAPAuthenticationMan
_configuration.put("providerUrl", "ldap://example.com:389/");
_configuration.put("searchContext", "dc=example");
- AuthenticationManager manager = _factory.create(_configuration, _broker);
+ AuthenticationManager manager = _factory.create(null, _configuration, _broker);
assertNotNull(manager);
}
@@ -76,7 +74,7 @@ public class SimpleLDAPAuthenticationMan
_configuration.put("providerUrl", "ldaps://example.com:636/");
_configuration.put("searchContext", "dc=example");
- AuthenticationManager manager = _factory.create(_configuration, _broker);
+ AuthenticationManager manager = _factory.create(null, _configuration, _broker);
assertNotNull(manager);
}
@@ -91,7 +89,7 @@ public class SimpleLDAPAuthenticationMan
_configuration.put("searchContext", "dc=example");
_configuration.put("trustStore", "mytruststore");
- AuthenticationManager manager = _factory.create(_configuration, _broker);
+ AuthenticationManager manager = _factory.create(null, _configuration, _broker);
assertNotNull(manager);
}
@@ -106,7 +104,7 @@ public class SimpleLDAPAuthenticationMan
try
{
- _factory.create(_configuration, _broker);
+ _factory.create(null, _configuration, _broker);
fail("Exception not thrown");
}
catch(IllegalArgumentException e)
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java Sun Apr 20 17:00:46 2014
@@ -43,7 +43,9 @@ import org.apache.qpid.server.binding.Bi
import org.apache.qpid.server.exchange.ExchangeImpl;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.model.Binding;
+import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.ExclusivityPolicy;
import org.apache.qpid.server.model.LifetimePolicy;
@@ -82,6 +84,7 @@ public abstract class AbstractDurableCon
private UUID _exchangeId;
private DurableConfigurationStore _configStore;
protected Map<String, Object> _configurationStoreSettings;
+ private ConfiguredObjectFactoryImpl _factory;
public void setUp() throws Exception
{
@@ -90,7 +93,7 @@ public abstract class AbstractDurableCon
_configurationStoreSettings = new HashMap<String, Object>();
_queueId = UUIDGenerator.generateRandomUUID();
_exchangeId = UUIDGenerator.generateRandomUUID();
-
+ _factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
_storeName = getName();
_storePath = TMP_FOLDER + File.separator + _storeName;
_configurationStoreSettings.put(MessageStore.STORE_PATH, _storePath);
@@ -452,6 +455,8 @@ public abstract class AbstractDurableCon
when(queue.getActualAttributes()).thenReturn(attributes);
+ when(queue.getObjectFactory()).thenReturn(_factory);
+ when(queue.getModel()).thenReturn(_factory.getModel());
ConfiguredObjectRecord objectRecord = mock(ConfiguredObjectRecord.class);
when(objectRecord.getId()).thenReturn(_queueId);
when(objectRecord.getType()).thenReturn(Queue.class.getSimpleName());
@@ -473,6 +478,8 @@ public abstract class AbstractDurableCon
when(exchange.getId()).thenReturn(_exchangeId);
when(exchange.getCategoryClass()).thenReturn(Exchange.class);
when(exchange.isDurable()).thenReturn(true);
+ when(exchange.getObjectFactory()).thenReturn(_factory);
+ when(exchange.getModel()).thenReturn(_factory.getModel());
ConfiguredObjectRecord exchangeRecord = mock(ConfiguredObjectRecord.class);
when(exchangeRecord.getId()).thenReturn(_exchangeId);
@@ -491,6 +498,9 @@ public abstract class AbstractDurableCon
ConfiguredObject<?> parent = mock(ConfiguredObject.class);
when(parent.getName()).thenReturn("testName");
+
+ when(parent.getObjectFactory()).thenReturn(_factory);
+ when(parent.getModel()).thenReturn(_factory.getModel());
_configStore.openConfigurationStore(parent, _configurationStoreSettings);
_configStore.visitConfiguredObjectRecords(_handler);
}
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/JsonFileConfigStoreTest.java Sun Apr 20 17:00:46 2014
@@ -20,31 +20,34 @@
*/
package org.apache.qpid.server.store;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Mockito.inOrder;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import java.io.File;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import org.mockito.ArgumentMatcher;
+import org.mockito.InOrder;
+
+import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.ConfiguredObjectFactory;
+import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestFileUtils;
import org.apache.qpid.util.FileUtils;
-import org.mockito.ArgumentMatcher;
-import org.mockito.InOrder;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.times;
public class JsonFileConfigStoreTest extends QpidTestCase
{
@@ -65,6 +68,9 @@ public class JsonFileConfigStoreTest ext
_virtualHost = mock(ConfiguredObject.class);
when(_virtualHost.getName()).thenReturn(getName());
+ ConfiguredObjectFactory factory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
+ when(_virtualHost.getObjectFactory()).thenReturn(factory);
+ when(_virtualHost.getModel()).thenReturn(factory.getModel());
_storeLocation = TestFileUtils.createTestDirectory("json", true);
_configurationStoreSettings = new HashMap<String, Object>();
_configurationStoreSettings.put(JsonFileConfigStore.STORE_TYPE, JsonFileConfigStore.TYPE);
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java Sun Apr 20 17:00:46 2014
@@ -40,16 +40,16 @@ import org.apache.qpid.server.exchange.E
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.logging.LogRecorder;
import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.Exchange;
-import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.SystemContext;
import org.apache.qpid.server.model.SystemContextImpl;
import org.apache.qpid.server.model.UUIDGenerator;
-import org.apache.qpid.server.plugin.ConfiguredObjectTypeFactory;
+import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.protocol.AMQConnectionModel;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.queue.AMQQueue;
@@ -77,7 +77,7 @@ public class BrokerTestHelper
public static Broker createBrokerMock()
{
- ConfiguredObjectFactory objectFactory = new ConfiguredObjectFactoryImpl(Model.getInstance());
+ ConfiguredObjectFactory objectFactory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
SubjectCreator subjectCreator = mock(SubjectCreator.class);
when(subjectCreator.getMechanisms()).thenReturn("");
@@ -88,10 +88,14 @@ public class BrokerTestHelper
when(broker.getSubjectCreator(any(SocketAddress.class))).thenReturn(subjectCreator);
when(broker.getSecurityManager()).thenReturn(new SecurityManager(mock(Broker.class), false));
when(broker.getObjectFactory()).thenReturn(objectFactory);
+ when(broker.getModel()).thenReturn(objectFactory.getModel());
when(broker.getEventLogger()).thenReturn(new EventLogger());
when(broker.getCategoryClass()).thenReturn(Broker.class);
SystemContext systemContext = mock(SystemContext.class);
+ when(systemContext.getObjectFactory()).thenReturn(objectFactory);
+ when(systemContext.getModel()).thenReturn(objectFactory.getModel());
+ when(systemContext.getCategoryClass()).thenReturn(SystemContext.class);
when(systemContext.getEventLogger()).thenReturn(new EventLogger());
when(broker.getParent(eq(SystemContext.class))).thenReturn(systemContext);
@@ -112,11 +116,11 @@ public class BrokerTestHelper
//VirtualHostFactory factory = new PluggableFactoryLoader<VirtualHostFactory>(VirtualHostFactory.class).get(hostType);
SystemContext systemContext = new SystemContextImpl(TASK_EXECUTOR,
- new ConfiguredObjectFactoryImpl(Model.getInstance()),
+ new ConfiguredObjectFactoryImpl(BrokerModel.getInstance()),
mock(EventLogger.class),
mock(LogRecorder.class),
new BrokerOptions());
- ConfiguredObjectFactory objectFactory = new ConfiguredObjectFactoryImpl(Model.getInstance());
+ ConfiguredObjectFactory objectFactory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
Broker broker = mock(Broker.class);
when(broker.getParent(eq(SystemContext.class))).thenReturn(systemContext);
when(broker.getTaskExecutor()).thenReturn(TASK_EXECUTOR);
@@ -124,10 +128,9 @@ public class BrokerTestHelper
when(broker.getSecurityManager()).thenReturn(securityManager);
when(broker.getCategoryClass()).thenReturn(Broker.class);
when(broker.getObjectFactory()).thenReturn(objectFactory);
- ConfiguredObjectTypeFactory factory = objectFactory.getConfiguredObjectTypeFactory(org.apache.qpid.server.model.VirtualHost.class,
- attributes);
+ when(broker.getModel()).thenReturn(objectFactory.getModel());
- AbstractVirtualHost host = (AbstractVirtualHost) factory.create(attributes, broker);
+ AbstractVirtualHost host = (AbstractVirtualHost) objectFactory.create(VirtualHost.class,attributes, broker);
host.setDesiredState(host.getState(), State.ACTIVE);
@@ -187,21 +190,21 @@ public class BrokerTestHelper
when(virtualHost.getSecurityManager()).thenReturn(securityManager);
when(virtualHost.getEventLogger()).thenReturn(eventLogger);
when(virtualHost.getDurableConfigurationStore()).thenReturn(mock(DurableConfigurationStore.class));
- ConfiguredObjectFactory objectFactory = new ConfiguredObjectFactoryImpl(Model.getInstance());
+ final ConfiguredObjectFactory objectFactory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
+ when(virtualHost.getObjectFactory()).thenReturn(objectFactory);
+ when(virtualHost.getModel()).thenReturn(objectFactory.getModel());
final Map<String,Object> attributes = new HashMap<String, Object>();
attributes.put(org.apache.qpid.server.model.Exchange.ID, UUIDGenerator.generateExchangeUUID("amp.direct", virtualHost.getName()));
attributes.put(org.apache.qpid.server.model.Exchange.NAME, "amq.direct");
attributes.put(org.apache.qpid.server.model.Exchange.TYPE, "direct");
attributes.put(org.apache.qpid.server.model.Exchange.DURABLE, durable);
- final ConfiguredObjectTypeFactory<? extends Exchange> exchangeFactory =
- objectFactory.getConfiguredObjectTypeFactory(Exchange.class, attributes);
return Subject.doAs(SecurityManager.getSubjectWithAddedSystemRights(), new PrivilegedAction<ExchangeImpl>()
{
@Override
public ExchangeImpl run()
{
- return (ExchangeImpl) exchangeFactory.create(attributes, virtualHost);
+ return (ExchangeImpl) objectFactory.create(Exchange.class, attributes, virtualHost);
}
});
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/DurableConfigurationRecovererTest.java Sun Apr 20 17:00:46 2014
@@ -49,10 +49,10 @@ import org.apache.qpid.server.exchange.T
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.model.Binding;
import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObjectFactory;
import org.apache.qpid.server.model.Exchange;
-import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.SystemContext;
import org.apache.qpid.server.model.UUIDGenerator;
@@ -113,7 +113,39 @@ public class DurableConfigurationRecover
when(_configuredObjectFactory.getConfiguredObjectTypeFactory(eq(Exchange.class), anyMap())).thenReturn(_exchangeFactory);
when(_configuredObjectFactory.getConfiguredObjectTypeFactory(eq(Queue.class), anyMap())).thenReturn(_queueFactory);
when(_configuredObjectFactory.getConfiguredObjectTypeFactory(eq(Binding.class), anyMap())).thenReturn(_bindingFactory);
+ final ArgumentCaptor<ConfiguredObjectRecord> recordArgumentCaptor = ArgumentCaptor.forClass(ConfiguredObjectRecord.class);
+ when(_configuredObjectFactory.recover(recordArgumentCaptor.capture(), any(ConfiguredObject.class))).thenAnswer(new Answer<Object>()
+ {
+ @Override
+ public Object answer(final InvocationOnMock invocation) throws Throwable
+ {
+ ConfiguredObjectRecord record = recordArgumentCaptor.getValue();
+ if(record.getType().equals("Queue"))
+ {
+ return _queueFactory.recover(mock(ConfiguredObjectFactory.class), record, _vhost);
+ }
+ else if(record.getType().equals("Exchange"))
+ {
+ return _exchangeFactory.recover(mock(ConfiguredObjectFactory.class), record, _vhost);
+ }
+ return null;
+ }
+ });
+ final ArgumentCaptor<ConfiguredObjectRecord> bindingRecordArgumentCaptor = ArgumentCaptor.forClass(ConfiguredObjectRecord.class);
+ when(_configuredObjectFactory.recover(bindingRecordArgumentCaptor.capture(), any(ConfiguredObject.class), any(ConfiguredObject.class))).thenAnswer(new Answer<Object>()
+ {
+ @Override
+ public Object answer(final InvocationOnMock invocation) throws Throwable
+ {
+ ConfiguredObjectRecord record = bindingRecordArgumentCaptor.getValue();
+ if(record.getType().equals("Binding"))
+ {
+ return _bindingFactory.recover(mock(ConfiguredObjectFactory.class), record, mock(ConfiguredObject.class),mock(ConfiguredObject.class));
+ }
+ return null;
+ }
+ });
final ArgumentCaptor<ConfiguredObjectRecord> recoveredExchange = ArgumentCaptor.forClass(ConfiguredObjectRecord.class);
@@ -136,7 +168,7 @@ public class DurableConfigurationRecover
when(unresolved.resolve()).thenReturn(exchange);
return unresolved;
}
- }).when(_exchangeFactory).recover(recoveredExchange.capture(), any(ConfiguredObject.class));
+ }).when(_exchangeFactory).recover(any(ConfiguredObjectFactory.class), recoveredExchange.capture(), any(ConfiguredObject.class));
@@ -171,7 +203,7 @@ public class DurableConfigurationRecover
return unresolved;
}
- }).when(_queueFactory).recover(recoveredQueue.capture(), any(ConfiguredObject.class));
+ }).when(_queueFactory).recover(any(ConfiguredObjectFactory.class), recoveredQueue.capture(), any(ConfiguredObject.class));
final ArgumentCaptor<ConfiguredObjectRecord> recoveredBinding = ArgumentCaptor.forClass(ConfiguredObjectRecord.class);
@@ -184,10 +216,10 @@ public class DurableConfigurationRecover
@Override
public Object answer(final InvocationOnMock invocation) throws Throwable
{
- ConfiguredObjectRecord queueRecord = recoveredBinding.getValue();
+ ConfiguredObjectRecord bindingRecord = recoveredBinding.getValue();
Binding binding = mock(Binding.class);
- UUID id = queueRecord.getId();
- String name = (String) queueRecord.getAttributes().get("name");
+ UUID id = bindingRecord.getId();
+ String name = (String) bindingRecord.getAttributes().get("name");
when(binding.getId()).thenReturn(id);
when(binding.getName()).thenReturn(name);
@@ -197,7 +229,7 @@ public class DurableConfigurationRecover
return unresolved;
}
- }).when(_bindingFactory).recover(recoveredBinding.capture(), parent1.capture(), parent2.capture());
+ }).when(_bindingFactory).recover(any(ConfiguredObjectFactory.class), recoveredBinding.capture(), parent1.capture(), parent2.capture());
@@ -224,13 +256,13 @@ public class DurableConfigurationRecover
{
_durableConfigurationRecoverer.beginConfigurationRecovery(_store);
assertEquals("Did not upgrade to the expected version",
- Model.MODEL_VERSION,
+ BrokerModel.MODEL_VERSION,
_durableConfigurationRecoverer.completeConfigurationRecovery());
}
public void testUpgradeNewerStoreFails() throws Exception
{
- String bumpedModelVersion = Model.MODEL_MAJOR_VERSION + "." + (Model.MODEL_MINOR_VERSION + 1);
+ String bumpedModelVersion = BrokerModel.MODEL_MAJOR_VERSION + "." + (BrokerModel.MODEL_MINOR_VERSION + 1);
try
{
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java Sun Apr 20 17:00:46 2014
@@ -32,6 +32,7 @@ import org.apache.qpid.server.exchange.E
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.message.MessageDestination;
import org.apache.qpid.server.message.MessageSource;
+import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObjectAttribute;
@@ -39,6 +40,7 @@ import org.apache.qpid.server.model.Conf
import org.apache.qpid.server.model.Connection;
import org.apache.qpid.server.model.IllegalStateTransitionException;
import org.apache.qpid.server.model.LifetimePolicy;
+import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.VirtualHostAlias;
import org.apache.qpid.server.protocol.LinkRegistry;
@@ -438,6 +440,12 @@ public class MockVirtualHost implements
return null;
}
+ @Override
+ public Model getModel()
+ {
+ return BrokerModel.getInstance();
+ }
+
public LinkRegistry getLinkRegistry(String remoteContainerId)
{
return null;
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java Sun Apr 20 17:00:46 2014
@@ -20,6 +20,9 @@
*/
package org.apache.qpid.server.security.access.plugins;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import java.io.File;
import java.util.HashMap;
import java.util.Map;
@@ -27,19 +30,32 @@ import java.util.UUID;
import java.util.regex.Pattern;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.logging.EventLoggerProvider;
import org.apache.qpid.server.model.AccessControlProvider;
import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.ConfiguredObjectFactory;
+import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.GroupProvider;
-import org.apache.qpid.server.security.AccessControl;
import org.apache.qpid.server.security.access.FileAccessControlProviderConstants;
import org.apache.qpid.test.utils.QpidTestCase;
import org.apache.qpid.test.utils.TestFileUtils;
-import static org.mockito.Mockito.mock;
-
public class ACLFileAccessControlProviderFactoryTest extends QpidTestCase
{
+ private Broker _broker;
+
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ _broker = mock(Broker.class);
+ ConfiguredObjectFactory objectFactory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
+
+ when(_broker.getObjectFactory()).thenReturn(objectFactory);
+ when(_broker.getModel()).thenReturn(objectFactory.getModel());
+ when(_broker.getCategoryClass()).thenReturn(Broker.class);
+ }
+
public void testCreateInstanceWhenAclFileIsNotPresent()
{
ACLFileAccessControlProviderFactory factory = new ACLFileAccessControlProviderFactory();
@@ -48,7 +64,7 @@ public class ACLFileAccessControlProvide
attributes.put(AccessControlProvider.NAME, "acl");
try
{
- AccessControlProvider acl = factory.create(attributes, mock(Broker.class));
+ AccessControlProvider acl = factory.create(null, attributes, _broker);
fail("ACL was created without a configuration file path specified");
}
catch(IllegalArgumentException e)
@@ -66,7 +82,7 @@ public class ACLFileAccessControlProvide
attributes.put(AccessControlProvider.NAME, "acl");
attributes.put(GroupProvider.TYPE, FileAccessControlProviderConstants.ACL_FILE_PROVIDER_TYPE);
attributes.put(FileAccessControlProviderConstants.PATH, aclFile.getAbsolutePath());
- AccessControlProvider acl = factory.create(attributes, mock(Broker.class));
+ AccessControlProvider acl = factory.create(null, attributes, _broker);
acl.getAccessControl().open();
assertNotNull("ACL was not created from acl file: " + aclFile.getAbsolutePath(), acl);
@@ -84,7 +100,7 @@ public class ACLFileAccessControlProvide
attributes.put(FileAccessControlProviderConstants.PATH, aclFile.getAbsolutePath());
try
{
- AccessControlProvider control = factory.create(attributes, mock(Broker.class));
+ AccessControlProvider control = factory.create(null, attributes, _broker);
control.getAccessControl().open();
fail("It should not be possible to create and initialise ACL with non existing file");
}
Modified: qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java Sun Apr 20 17:00:46 2014
@@ -54,7 +54,6 @@ import org.apache.qpid.server.model.Abst
import org.apache.qpid.server.model.ConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ManagedObject;
-import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.plugin.MessageConverter;
import org.apache.qpid.server.plugin.SystemNodeCreator;
@@ -201,7 +200,7 @@ class ManagementNode implements MessageS
if(entityType.creatable())
{
boolean isCreatableChild = false;
- for(Class<? extends ConfiguredObject> parentConfig : Model.getInstance().getParentTypes(clazz))
+ for(Class<? extends ConfiguredObject> parentConfig : _managedObject.getModel().getParentTypes(clazz))
{
isCreatableChild = parentConfig.isAssignableFrom(_managedObject.getClass());
if(isCreatableChild)
@@ -243,7 +242,7 @@ class ManagementNode implements MessageS
if(ConfiguredObject.class.isAssignableFrom(clazz))
{
- Collection<Class<? extends ConfiguredObject>> childTypes = Model.getInstance().getChildTypes(clazz);
+ Collection<Class<? extends ConfiguredObject>> childTypes = _managedObject.getModel().getChildTypes(clazz);
for(Class<? extends ConfiguredObject> childClass : childTypes)
{
populateTypeMetaData(childClass, true);
@@ -1214,7 +1213,7 @@ class ManagementNode implements MessageS
final Class managementClass = getManagementClass(_managedObject.getClass());
_entities.get(_entityTypes.get(managementClass.getName())).put(_managedObject.getName(), _managedObject);
- Collection<Class<? extends ConfiguredObject>> childClasses = Model.getInstance().getChildTypes(managementClass);
+ Collection<Class<? extends ConfiguredObject>> childClasses = object.getModel().getChildTypes(managementClass);
for(Class<? extends ConfiguredObject> childClass : childClasses)
{
if(getManagementClass(childClass) != null)
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverter.java Sun Apr 20 17:00:46 2014
@@ -26,15 +26,12 @@ import java.util.List;
import java.util.Map;
import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.Model;
public class ConfiguredObjectToMapConverter
{
/** Name of the key used for the statistics map */
public static final String STATISTICS_MAP_KEY = "statistics";
- private Model _model = Model.getInstance();
-
public Map<String, Object> convertObjectToMap(final ConfiguredObject<?> confObject,
Class<? extends ConfiguredObject> clazz,
int depth)
@@ -51,13 +48,6 @@ public class ConfiguredObjectToMapConver
return object;
}
- /**
- * Used for unit test only.
- */
- void setModel(Model model)
- {
- _model = model;
- }
private void incorporateAttributesIntoMap(
final ConfiguredObject<?> confObject, Map<String, Object> object)
@@ -110,7 +100,7 @@ public class ConfiguredObjectToMapConver
Class<? extends ConfiguredObject> clazz, int depth,
Map<String, Object> object)
{
- for(Class<? extends ConfiguredObject> childClass : _model.getChildTypes(clazz))
+ for(Class<? extends ConfiguredObject> childClass : confObject.getModel().getChildTypes(clazz))
{
Collection<? extends ConfiguredObject> children = confObject.getChildren(childClass);
if(children != null)
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java Sun Apr 20 17:00:46 2014
@@ -43,7 +43,6 @@ import org.codehaus.jackson.map.Serializ
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.State;
public class RestServlet extends AbstractServlet
@@ -152,7 +151,7 @@ public class RestServlet extends Abstrac
for(int i = 0; i < _hierarchy.length; i++)
{
- if(i == 0 || Model.getInstance().getChildTypes(_hierarchy[i - 1]).contains(_hierarchy[i]))
+ if(i == 0 || getBroker().getModel().getChildTypes(_hierarchy[i - 1]).contains(_hierarchy[i]))
{
for(ConfiguredObject<?> parent : parents)
@@ -276,7 +275,7 @@ public class RestServlet extends Abstrac
ConfiguredObject child)
{
Collection<ConfiguredObject> ancestors = new HashSet<ConfiguredObject>();
- Collection<Class<? extends ConfiguredObject>> parentTypes = Model.getInstance().getParentTypes(childType);
+ Collection<Class<? extends ConfiguredObject>> parentTypes = child.getModel().getParentTypes(childType);
for(Class<? extends ConfiguredObject> parentClazz : parentTypes)
{
@@ -406,7 +405,7 @@ public class RestServlet extends Abstrac
{
for(int j = i-1; j >=0; j--)
{
- if(Model.getInstance().getChildTypes(_hierarchy[j]).contains(_hierarchy[i]))
+ if(getBroker().getModel().getChildTypes(_hierarchy[j]).contains(_hierarchy[i]))
{
for(ConfiguredObject<?> parent : objects[j])
{
@@ -426,7 +425,7 @@ public class RestServlet extends Abstrac
}
List<ConfiguredObject> parents = new ArrayList<ConfiguredObject>();
Class<? extends ConfiguredObject> objClass = getConfiguredClass();
- Collection<Class<? extends ConfiguredObject>> parentClasses = Model.getInstance().getParentTypes(objClass);
+ Collection<Class<? extends ConfiguredObject>> parentClasses = getBroker().getModel().getParentTypes(objClass);
for(int i = _hierarchy.length-2; i >=0 ; i--)
{
if(parentClasses.contains(_hierarchy[i]))
@@ -488,7 +487,7 @@ public class RestServlet extends Abstrac
return true;
}
- Collection<Class<? extends ConfiguredObject>> parentClasses = Model.getInstance().getParentTypes(objClass);
+ Collection<Class<? extends ConfiguredObject>> parentClasses = obj.getModel().getParentTypes(objClass);
for (ConfiguredObject parent : otherParents)
{
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java Sun Apr 20 17:00:46 2014
@@ -28,12 +28,12 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.ConfiguredObject;
-import org.apache.qpid.server.model.Model;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig;
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.ConfiguredObject;
+
public class StructureServlet extends AbstractServlet
{
public StructureServlet()
@@ -70,7 +70,7 @@ public class StructureServlet extends Ab
structure.put("id", object.getId());
structure.put("name", object.getName());
- for(Class<? extends ConfiguredObject> childClass : Model.getInstance().getChildTypes(clazz))
+ for(Class<? extends ConfiguredObject> childClass : object.getModel().getChildTypes(clazz))
{
Collection<? extends ConfiguredObject> children = object.getChildren(childClass);
if(children != null)
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java Sun Apr 20 17:00:46 2014
@@ -26,7 +26,10 @@ import java.util.Map;
import java.util.UUID;
import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.ConfiguredObjectFactory;
+import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.test.utils.QpidTestCase;
public class HttpManagementFactoryTest extends QpidTestCase
@@ -46,6 +49,9 @@ public class HttpManagementFactoryTest e
_attributes.put(HttpManagement.TIME_OUT, SESSION_TIMEOUT);
_attributes.put(ConfiguredObject.ID, _id);
when(_broker.getCategoryClass()).thenReturn(Broker.class);
+ ConfiguredObjectFactory objectFactory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
+ when(_broker.getObjectFactory()).thenReturn(objectFactory);
+ when(_broker.getModel()).thenReturn(objectFactory.getModel());
HttpManagement management = _pluginFactory.createInstance(_attributes, _broker);
management.open();
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java Sun Apr 20 17:00:46 2014
@@ -31,7 +31,10 @@ import java.util.UUID;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.ConfiguredObjectFactory;
+import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.test.utils.QpidTestCase;
public class HttpManagementTest extends QpidTestCase
@@ -46,6 +49,12 @@ public class HttpManagementTest extends
super.setUp();
_id = UUID.randomUUID();
_broker = mock(Broker.class);
+ ConfiguredObjectFactory objectFactory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
+
+ when(_broker.getObjectFactory()).thenReturn(objectFactory);
+ when(_broker.getModel()).thenReturn(objectFactory.getModel());
+ when(_broker.getCategoryClass()).thenReturn(Broker.class);
+
Map<String, Object> attributes = new HashMap<String, Object>();
attributes.put(HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, false);
attributes.put(HttpManagement.HTTPS_BASIC_AUTHENTICATION_ENABLED, true);
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java Sun Apr 20 17:00:46 2014
@@ -93,9 +93,10 @@ public class ConfiguredObjectToMapConver
final String childAttributeValue = "childvalue";
Model model = createTestModel();
- _converter.setModel(model);
TestChild mockChild = mock(TestChild.class);
+ when(mockChild.getModel()).thenReturn(model);
+ when(_configuredObject.getModel()).thenReturn(model);
configureMockToReturnOneAttribute(mockChild, childAttributeName, childAttributeValue);
when(_configuredObject.getChildren(TestChild.class)).thenReturn(Arrays.asList(mockChild));
Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java Sun Apr 20 17:00:46 2014
@@ -19,13 +19,17 @@
package org.apache.qpid.server.jmx;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.ConfiguredObjectFactory;
+import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.test.utils.QpidTestCase;
public class JMXManagementFactoryTest extends QpidTestCase
@@ -40,6 +44,11 @@ public class JMXManagementFactoryTest ex
_attributes.put(ConfiguredObject.ID,UUID.randomUUID());
_attributes.put(ConfiguredObject.TYPE, JMXManagementPlugin.PLUGIN_TYPE);
_attributes.put(ConfiguredObject.NAME, getName());
+ ConfiguredObjectFactory objectFactory = new ConfiguredObjectFactoryImpl(BrokerModel.getInstance());
+
+ when(_broker.getObjectFactory()).thenReturn(objectFactory);
+ when(_broker.getModel()).thenReturn(objectFactory.getModel());
+ when(_broker.getCategoryClass()).thenReturn(Broker.class);
JMXManagementPlugin jmxManagement = _jmxManagementFactory.createInstance( _attributes, _broker);
jmxManagement.open();
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java?rev=1588794&r1=1588793&r2=1588794&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java Sun Apr 20 17:00:46 2014
@@ -36,10 +36,10 @@ import org.apache.qpid.server.logging.Lo
import org.apache.qpid.server.model.AccessControlProvider;
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.BrokerModel;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObjectFactoryImpl;
import org.apache.qpid.server.model.GroupProvider;
-import org.apache.qpid.server.model.Model;
import org.apache.qpid.server.model.Plugin;
import org.apache.qpid.server.model.PreferencesProvider;
import org.apache.qpid.server.model.SystemContextImpl;
@@ -76,12 +76,15 @@ public class TestBrokerConfiguration
public TestBrokerConfiguration(String storeType, String intialStoreLocation, final TaskExecutor taskExecutor)
{
- _store = new MemoryConfigurationEntryStore(new SystemContextImpl(taskExecutor, new ConfiguredObjectFactoryImpl(
- Model.getInstance()),
- mock(EventLogger.class), mock(LogRecorder.class),
- mock(BrokerOptions.class)),
- intialStoreLocation,
- null, Collections.<String,String>emptyMap());
+ _store = new MemoryConfigurationEntryStore(
+ new SystemContextImpl(taskExecutor,
+ new ConfiguredObjectFactoryImpl(BrokerModel.getInstance()),
+ mock(EventLogger.class),
+ mock(LogRecorder.class),
+ mock(BrokerOptions.class)),
+ intialStoreLocation,
+ null,
+ Collections.<String,String>emptyMap());
}
public boolean setBrokerAttribute(String name, Object value)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org