diff options
| author | Keith Wall <kwall@apache.org> | 2014-07-04 16:31:46 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-07-04 16:31:46 +0000 |
| commit | 3ba1473aa117bebb333c6189695cb356c9cb434b (patch) | |
| tree | 66252e3499b65f3c9a9d032f2af3e62b6332a43a /qpid/java | |
| parent | d81afd50fd46c5df219b8515bb95c1d640f6d5aa (diff) | |
| download | qpid-python-3ba1473aa117bebb333c6189695cb356c9cb434b.tar.gz | |
QPID-5873: Exclude new ACL system tests from Json profile; fix BDBHARemoteReplicationNodeTest unit test wrt monitor attribute
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1607889 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java | 4 | ||||
| -rw-r--r-- | qpid/java/test-profiles/JavaJsonExcludes | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java index ffefc65484..6259b49d61 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java @@ -32,7 +32,6 @@ import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor; import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.ConfiguredObjectFactory; -import org.apache.qpid.server.model.RemoteReplicationNode; import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.security.SecurityManager; import org.apache.qpid.server.security.access.Operation; @@ -149,7 +148,8 @@ public class BDBHARemoteReplicationNodeTest extends QpidTestCase private BDBHARemoteReplicationNode createRemoteReplicationNode(final String replicationNodeName) { Map<String, Object> attributes = new HashMap<>(); - attributes.put(RemoteReplicationNode.NAME, replicationNodeName); + attributes.put(BDBHARemoteReplicationNode.NAME, replicationNodeName); + attributes.put(BDBHARemoteReplicationNode.MONITOR, Boolean.FALSE); BDBHARemoteReplicationNodeImpl node = new BDBHARemoteReplicationNodeImpl(_virtualHostNode, attributes, _facade); node.create(); diff --git a/qpid/java/test-profiles/JavaJsonExcludes b/qpid/java/test-profiles/JavaJsonExcludes index 48613b5082..1c4524987b 100644 --- a/qpid/java/test-profiles/JavaJsonExcludes +++ b/qpid/java/test-profiles/JavaJsonExcludes @@ -20,6 +20,7 @@ org.apache.qpid.server.store.berkeleydb.* org.apache.qpid.server.store.berkeleydb.replication.* org.apache.qpid.server.store.SplitStoreTest#* +org.apache.qpid.systest.rest.acl.VirtualHostACLTest#* org.apache.qpid.systest.rest.VirtualHostNodeRestTest#testCreateAndDeleteVirtualHostNode org.apache.qpid.systest.rest.VirtualHostRestTest#testPutCreateVirtualHostUsingProfileNodeType org.apache.qpid.server.BrokerStartupTest#testStartupWithNoConfig |