summaryrefslogtreecommitdiff
path: root/qpid/java/broker/src/test
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2013-04-29 16:45:19 +0000
committerRobert Gemmell <robbie@apache.org>2013-04-29 16:45:19 +0000
commitf8205dd62fc2ad6a1fa9831d5e5f0766e5c705fb (patch)
tree157bc95f463e2968a88c323e501c219eced64026 /qpid/java/broker/src/test
parent841a87edadca85c81a3c4ee49766258c5d77b26e (diff)
downloadqpid-python-f8205dd62fc2ad6a1fa9831d5e5f0766e5c705fb.tar.gz
QPID-4785: relax restrictions on editing/deleting active ports outwith management-mode
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1477190 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/test')
-rw-r--r--qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
index 64b432f471..758eb62809 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/startup/BrokerRecovererTest.java
@@ -47,6 +47,7 @@ import org.apache.qpid.server.model.KeyStore;
import org.apache.qpid.server.model.Plugin;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.TrustStore;
+import org.apache.qpid.server.model.UUIDGenerator;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.model.adapter.AccessControlProviderFactory;
import org.apache.qpid.server.model.adapter.AuthenticationProviderFactory;
@@ -196,11 +197,13 @@ public class BrokerRecovererTest extends TestCase
//Add a couple ports
ConfigurationEntry portEntry1 = mock(ConfigurationEntry.class);
Port port1 = mock(Port.class);
+ when(port1.getId()).thenReturn(UUIDGenerator.generateRandomUUID());
when(port1.getName()).thenReturn("port1");
when(port1.getPort()).thenReturn(5671);
when(port1.getAttribute(Port.AUTHENTICATION_PROVIDER)).thenReturn("authenticationProvider1");
ConfigurationEntry portEntry2 = mock(ConfigurationEntry.class);
Port port2 = mock(Port.class);
+ when(port2.getId()).thenReturn(UUIDGenerator.generateRandomUUID());
when(port2.getName()).thenReturn("port2");
when(port2.getPort()).thenReturn(5672);
when(port2.getAttribute(Port.AUTHENTICATION_PROVIDER)).thenReturn("authenticationProvider2");