From 130ff22d820d9c20a1bc7545031954ae59dad0ef Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Sun, 20 Apr 2014 17:00:46 +0000 Subject: QPID-5713 : [Java Broker] Remove non-test references to model singleton, and instead treat as an instance variable git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588794 13f79535-47bb-0310-9956-ffa450edef68 --- .../qpid/server/management/plugin/HttpManagementFactoryTest.java | 6 ++++++ .../apache/qpid/server/management/plugin/HttpManagementTest.java | 9 +++++++++ .../plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java | 3 ++- 3 files changed, 17 insertions(+), 1 deletion(-) (limited to 'qpid/java/broker-plugins/management-http/src/test') diff --git a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java index fbdb34fb96..809b2405b1 100644 --- a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java +++ b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementFactoryTest.java @@ -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 extends QpidTestCase _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(); diff --git a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java index 56dc947482..b747ee5435 100644 --- a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java +++ b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java @@ -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 QpidTestCase 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 attributes = new HashMap(); attributes.put(HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, false); attributes.put(HttpManagement.HTTPS_BASIC_AUTHENTICATION_ENABLED, true); diff --git a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java index 0c2b6a5385..82c8d01379 100644 --- a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java +++ b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java @@ -93,9 +93,10 @@ public class ConfiguredObjectToMapConverterTest extends TestCase 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)); -- cgit v1.2.1