summaryrefslogtreecommitdiff
path: root/qpid/java/systests/src
diff options
context:
space:
mode:
authorKeith Wall <kwall@apache.org>2015-04-10 09:57:39 +0000
committerKeith Wall <kwall@apache.org>2015-04-10 09:57:39 +0000
commit60c56cbf7bf8afd5dc577480853e7214cb60b3e2 (patch)
tree472e786d636fd51ae12ea0061596ec7e0b64d811 /qpid/java/systests/src
parentb187311574bbf087f376256d237173b38a84fdbc (diff)
downloadqpid-python-60c56cbf7bf8afd5dc577480853e7214cb60b3e2.tar.gz
QPID-6485: [Java Broker] Remove superfluous find/get methods from the Broker configured object
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1672602 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests/src')
-rw-r--r--qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
index a1e30ac83e..936939dcdf 100644
--- a/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
+++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/protocol/MultiVersionProtocolEngineFactoryTest.java
@@ -33,10 +33,12 @@ import java.util.EnumSet;
import java.util.Iterator;
import java.util.Set;
+import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.Protocol;
import org.apache.qpid.server.model.port.AmqpPort;
+import org.apache.qpid.server.security.SubjectCreator;
import org.apache.qpid.server.util.BrokerTestHelper;
import org.apache.qpid.server.virtualhost.VirtualHostImpl;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -45,7 +47,6 @@ import org.apache.qpid.transport.network.NetworkConnection;
public class MultiVersionProtocolEngineFactoryTest extends QpidTestCase
{
- private VirtualHostImpl _virtualHost;
private Broker _broker;
@Override
@@ -154,11 +155,19 @@ public class MultiVersionProtocolEngineFactoryTest extends QpidTestCase
{
Set<Protocol> protocols = getAllAMQPProtocols();
+ SubjectCreator subjectCreator = mock(SubjectCreator.class);
+
+ AuthenticationProvider<?> authProvider = mock(AuthenticationProvider.class);
+ when(authProvider.getSubjectCreator(false)).thenReturn(subjectCreator);
+
AmqpPort<?> port = mock(AmqpPort.class);
when(port.canAcceptNewConnection(any(SocketAddress.class))).thenReturn(true);
when(port.getContextValue(eq(Integer.class), eq(AmqpPort.PORT_MAX_MESSAGE_SIZE))).thenReturn(AmqpPort.DEFAULT_MAX_MESSAGE_SIZE);
+ when(port.getAuthenticationProvider()).thenReturn(authProvider);
+
+
- when(port.getContextValue(eq(Long.class),eq(Port.CONNECTION_MAXIMUM_AUTHENTICATION_DELAY))).thenReturn(10000l);
+ when(port.getContextValue(eq(Long.class), eq(Port.CONNECTION_MAXIMUM_AUTHENTICATION_DELAY))).thenReturn(10000l);
MultiVersionProtocolEngineFactory factory =
new MultiVersionProtocolEngineFactory(_broker, protocols, null, port,
org.apache.qpid.server.model.Transport.TCP);