You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/02/19 23:21:51 UTC
[08/10] qpid-broker-j git commit: QPID-8091: [Broker-J] Move
transaction timeout protocol test to separate packages - this features is
Broker-J specific.
QPID-8091: [Broker-J] Move transaction timeout protocol test to separate packages - this features is Broker-J specific.
Also refactored the new test broker configuration mechanism so that the configuration of the whole broker can be adjusted,
rather than just the virtualhost.
(cherry picked from commit d57815f89427781bb3cf3d5f6c70b3b13a8604ff. Merge conflicts resolved manually)
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/ba4344f6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/ba4344f6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/ba4344f6
Branch: refs/heads/7.0.x
Commit: ba4344f67ea06e6f87367e00ce42cac56a70860e
Parents: a5a15fc
Author: Keith Wall <kw...@apache.org>
Authored: Fri Feb 9 16:04:27 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Mon Feb 19 23:19:57 2018 +0000
----------------------------------------------------------------------
.../TransactionTimeoutTest.java | 171 +++++++++++++++++++
.../transaction/TransactionalTransferTest.java | 122 +------------
.../apache/qpid/tests/utils/BrokerAdmin.java | 3 -
.../org/apache/qpid/tests/utils/ConfigItem.java | 36 ++++
.../apache/qpid/tests/utils/ConfigItems.java | 33 ++++
.../utils/EmbeddedBrokerPerClassAdminImpl.java | 13 +-
.../utils/ExternalQpidBrokerAdminImpl.java | 6 -
.../apache/qpid/tests/utils/QpidTestRunner.java | 4 +
8 files changed, 252 insertions(+), 136 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ba4344f6/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/qpid/transactiontimeout/TransactionTimeoutTest.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/qpid/transactiontimeout/TransactionTimeoutTest.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/qpid/transactiontimeout/TransactionTimeoutTest.java
new file mode 100644
index 0000000..d8608a4
--- /dev/null
+++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/extensions/qpid/transactiontimeout/TransactionTimeoutTest.java
@@ -0,0 +1,171 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.tests.protocol.v1_0.extensions.qpid.transactiontimeout;
+
+import static org.apache.qpid.tests.utils.BrokerAdmin.KIND_BROKER_J;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+
+import java.net.InetSocketAddress;
+
+import org.hamcrest.Matchers;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.qpid.server.protocol.v1_0.type.UnsignedInteger;
+import org.apache.qpid.server.protocol.v1_0.type.messaging.Accepted;
+import org.apache.qpid.server.protocol.v1_0.type.transaction.TransactionError;
+import org.apache.qpid.server.protocol.v1_0.type.transaction.TransactionalState;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Attach;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Begin;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Close;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Disposition;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Flow;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Open;
+import org.apache.qpid.server.protocol.v1_0.type.transport.ReceiverSettleMode;
+import org.apache.qpid.server.protocol.v1_0.type.transport.Role;
+import org.apache.qpid.tests.protocol.Response;
+import org.apache.qpid.tests.protocol.v1_0.FrameTransport;
+import org.apache.qpid.tests.protocol.v1_0.Interaction;
+import org.apache.qpid.tests.protocol.v1_0.InteractionTransactionalState;
+import org.apache.qpid.tests.utils.BrokerAdmin;
+import org.apache.qpid.tests.utils.BrokerAdminUsingTestBase;
+import org.apache.qpid.tests.utils.BrokerSpecific;
+import org.apache.qpid.tests.utils.ConfigItem;
+
+@BrokerSpecific(kind = KIND_BROKER_J)
+@ConfigItem(name = "virtualhost.storeTransactionOpenTimeoutClose", value = "1000")
+public class TransactionTimeoutTest extends BrokerAdminUsingTestBase
+{
+ private static final String TEST_MESSAGE_CONTENT = "testMessageContent";
+ private InetSocketAddress _brokerAddress;
+
+ @Before
+ public void setUp()
+ {
+ getBrokerAdmin().createQueue(BrokerAdmin.TEST_QUEUE_NAME);
+ _brokerAddress = getBrokerAdmin().getBrokerAddress(BrokerAdmin.PortType.ANONYMOUS_AMQP);
+ }
+
+ @Test
+ public void transactionalPostingTimeout() throws Exception
+ {
+ try (FrameTransport transport = new FrameTransport(_brokerAddress).connect())
+ {
+ final UnsignedInteger linkHandle = UnsignedInteger.ONE;
+
+ final Interaction interaction = transport.newInteraction();
+ final InteractionTransactionalState txnState = interaction.createTransactionalState(UnsignedInteger.ZERO);
+ Disposition responseDisposition = interaction.negotiateProtocol()
+ .consumeResponse()
+ .open()
+ .consumeResponse(Open.class)
+ .begin()
+ .consumeResponse(Begin.class)
+
+ .txnAttachCoordinatorLink(txnState)
+ .txnDeclare(txnState)
+
+ .attachRole(Role.SENDER)
+ .attachTargetAddress(BrokerAdmin.TEST_QUEUE_NAME)
+ .attachHandle(linkHandle)
+ .attach().consumeResponse(Attach.class)
+ .consumeResponse(Flow.class)
+
+ .transferHandle(linkHandle)
+ .transferPayloadData(TEST_MESSAGE_CONTENT)
+ .transferTransactionalState(txnState.getCurrentTransactionId())
+ .transfer()
+ .consumeResponse(Disposition.class)
+ .getLatestResponse(Disposition.class);
+
+ assertThat(responseDisposition.getRole(), is(Role.RECEIVER));
+ assertThat(responseDisposition.getSettled(), is(Boolean.TRUE));
+ assertThat(responseDisposition.getState(), is(instanceOf(TransactionalState.class)));
+ assertThat(((TransactionalState) responseDisposition.getState()).getOutcome(), is(instanceOf(Accepted.class)));
+
+ Close responseClose = interaction.consumeResponse().getLatestResponse(Close.class);
+ assertThat(responseClose.getError(), is(Matchers.notNullValue()));
+ assertThat(responseClose.getError().getCondition(), equalTo(TransactionError.TRANSACTION_TIMEOUT));
+ }
+ }
+
+ @Test
+ public void transactionalRetirementTimeout() throws Exception
+ {
+ getBrokerAdmin().putMessageOnQueue(BrokerAdmin.TEST_QUEUE_NAME, TEST_MESSAGE_CONTENT);
+ try (FrameTransport transport = new FrameTransport(_brokerAddress).connect())
+ {
+ final Interaction interaction = transport.newInteraction();
+ final InteractionTransactionalState txnState = interaction.createTransactionalState(UnsignedInteger.ZERO);
+ interaction.negotiateProtocol()
+ .consumeResponse()
+ .open()
+ .consumeResponse(Open.class)
+ .begin()
+ .consumeResponse(Begin.class)
+
+ .txnAttachCoordinatorLink(txnState)
+ .txnDeclare(txnState)
+
+ .attachRole(Role.RECEIVER)
+ .attachHandle(UnsignedInteger.ONE)
+ .attachSourceAddress(BrokerAdmin.TEST_QUEUE_NAME)
+ .attachRcvSettleMode(ReceiverSettleMode.FIRST)
+ .attach()
+ .consumeResponse(Attach.class)
+
+ .flowIncomingWindow(UnsignedInteger.MAX_VALUE)
+ .flowNextIncomingId(UnsignedInteger.ZERO)
+ .flowOutgoingWindow(UnsignedInteger.ZERO)
+ .flowNextOutgoingId(UnsignedInteger.ZERO)
+ .flowLinkCredit(UnsignedInteger.MAX_VALUE)
+ .flowHandleFromLinkHandle()
+ .flow()
+
+ .receiveDelivery()
+ .decodeLatestDelivery();
+
+ Object data = interaction.getDecodedLatestDelivery();
+ assertThat(data, is(equalTo(TEST_MESSAGE_CONTENT)));
+
+ interaction.dispositionSettled(true)
+ .dispositionRole(Role.RECEIVER)
+ .dispositionTransactionalState(txnState.getCurrentTransactionId(), new Accepted())
+ .disposition()
+ .sync();
+
+ Response<?> response = interaction.consumeResponse(Close.class, Flow.class).getLatestResponse();
+ Close responseClose;
+ if (response.getBody() instanceof Close)
+ {
+ responseClose = (Close) response.getBody();
+ }
+ else
+ {
+ responseClose = interaction.consumeResponse().getLatestResponse(Close.class);
+ }
+ assertThat(responseClose.getError(), is(Matchers.notNullValue()));
+ assertThat(responseClose.getError().getCondition(), equalTo(TransactionError.TRANSACTION_TIMEOUT));
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ba4344f6/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transaction/TransactionalTransferTest.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transaction/TransactionalTransferTest.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transaction/TransactionalTransferTest.java
index a893d76..85b5ecd 100644
--- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transaction/TransactionalTransferTest.java
+++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transaction/TransactionalTransferTest.java
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.tests.protocol.v1_0.transaction;
-import static org.apache.qpid.tests.utils.BrokerAdmin.KIND_BROKER_J;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -33,7 +32,6 @@ import java.net.InetSocketAddress;
import java.util.Collections;
import java.util.List;
-import org.hamcrest.Matchers;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -56,15 +54,14 @@ import org.apache.qpid.server.protocol.v1_0.type.transport.Open;
import org.apache.qpid.server.protocol.v1_0.type.transport.ReceiverSettleMode;
import org.apache.qpid.server.protocol.v1_0.type.transport.Role;
import org.apache.qpid.server.protocol.v1_0.type.transport.Transfer;
+import org.apache.qpid.tests.protocol.Response;
+import org.apache.qpid.tests.protocol.SpecificationTest;
import org.apache.qpid.tests.protocol.v1_0.FrameTransport;
import org.apache.qpid.tests.protocol.v1_0.Interaction;
import org.apache.qpid.tests.protocol.v1_0.InteractionTransactionalState;
-import org.apache.qpid.tests.protocol.SpecificationTest;
import org.apache.qpid.tests.protocol.v1_0.Utils;
-import org.apache.qpid.tests.protocol.Response;
import org.apache.qpid.tests.utils.BrokerAdmin;
import org.apache.qpid.tests.utils.BrokerAdminUsingTestBase;
-import org.apache.qpid.tests.utils.BrokerSpecific;
public class TransactionalTransferTest extends BrokerAdminUsingTestBase
{
@@ -647,121 +644,6 @@ public class TransactionalTransferTest extends BrokerAdminUsingTestBase
}
}
- @Test
- @BrokerSpecific(kind = KIND_BROKER_J)
- public void transactionalPostingTimeout() throws Exception
- {
- int transactionTimeout = 1000;
- getBrokerAdmin().configure("storeTransactionOpenTimeoutClose", transactionTimeout);
-
- try (FrameTransport transport = new FrameTransport(_brokerAddress).connect())
- {
- final UnsignedInteger linkHandle = UnsignedInteger.ONE;
-
- final Interaction interaction = transport.newInteraction();
- final InteractionTransactionalState txnState = interaction.createTransactionalState(UnsignedInteger.ZERO);
- Disposition responseDisposition = interaction.negotiateProtocol()
- .consumeResponse()
- .open()
- .consumeResponse(Open.class)
- .begin()
- .consumeResponse(Begin.class)
-
- .txnAttachCoordinatorLink(txnState)
- .txnDeclare(txnState)
-
- .attachRole(Role.SENDER)
- .attachTargetAddress(BrokerAdmin.TEST_QUEUE_NAME)
- .attachHandle(linkHandle)
- .attach().consumeResponse(Attach.class)
- .consumeResponse(Flow.class)
-
- .transferHandle(linkHandle)
- .transferPayloadData(TEST_MESSAGE_CONTENT)
- .transferTransactionalState(txnState.getCurrentTransactionId())
- .transfer()
- .consumeResponse(Disposition.class)
- .getLatestResponse(Disposition.class);
-
- assertThat(responseDisposition.getRole(), is(Role.RECEIVER));
- assertThat(responseDisposition.getSettled(), is(Boolean.TRUE));
- assertThat(responseDisposition.getState(), is(instanceOf(TransactionalState.class)));
- assertThat(((TransactionalState) responseDisposition.getState()).getOutcome(), is(instanceOf(Accepted.class)));
-
- Thread.sleep(transactionTimeout + 1000);
-
- Close responseClose = interaction.consumeResponse().getLatestResponse(Close.class);
- assertThat(responseClose.getError(), is(Matchers.notNullValue()));
- assertThat(responseClose.getError().getCondition(), equalTo(TransactionError.TRANSACTION_TIMEOUT));
- }
- }
-
- @Test
- @BrokerSpecific(kind = KIND_BROKER_J)
- public void transactionalRetirementTimeout() throws Exception
- {
- int transactionTimeout = 1000;
- getBrokerAdmin().configure("storeTransactionOpenTimeoutClose", transactionTimeout);
-
- getBrokerAdmin().putMessageOnQueue(BrokerAdmin.TEST_QUEUE_NAME, TEST_MESSAGE_CONTENT);
- try (FrameTransport transport = new FrameTransport(_brokerAddress).connect())
- {
- final Interaction interaction = transport.newInteraction();
- final InteractionTransactionalState txnState = interaction.createTransactionalState(UnsignedInteger.ZERO);
- interaction.negotiateProtocol()
- .consumeResponse()
- .open()
- .consumeResponse(Open.class)
- .begin()
- .consumeResponse(Begin.class)
-
- .txnAttachCoordinatorLink(txnState)
- .txnDeclare(txnState)
-
- .attachRole(Role.RECEIVER)
- .attachHandle(UnsignedInteger.ONE)
- .attachSourceAddress(BrokerAdmin.TEST_QUEUE_NAME)
- .attachRcvSettleMode(ReceiverSettleMode.FIRST)
- .attach()
- .consumeResponse(Attach.class)
-
- .flowIncomingWindow(UnsignedInteger.MAX_VALUE)
- .flowNextIncomingId(UnsignedInteger.ZERO)
- .flowOutgoingWindow(UnsignedInteger.ZERO)
- .flowNextOutgoingId(UnsignedInteger.ZERO)
- .flowLinkCredit(UnsignedInteger.MAX_VALUE)
- .flowHandleFromLinkHandle()
- .flow()
-
- .receiveDelivery()
- .decodeLatestDelivery();
-
- Object data = interaction.getDecodedLatestDelivery();
- assertThat(data, is(equalTo(TEST_MESSAGE_CONTENT)));
-
- interaction.dispositionSettled(true)
- .dispositionRole(Role.RECEIVER)
- .dispositionTransactionalState(txnState.getCurrentTransactionId(), new Accepted())
- .disposition()
- .sync();
-
- Thread.sleep(transactionTimeout + 1000);
- Response<?> response = interaction.consumeResponse(Close.class, Flow.class).getLatestResponse();
- Close responseClose;
- if (response.getBody() instanceof Close)
- {
- responseClose = (Close) response.getBody();
- }
- else
- {
- responseClose = interaction.consumeResponse().getLatestResponse(Close.class);
- }
- assertThat(responseClose.getError(), is(Matchers.notNullValue()));
- assertThat(responseClose.getError().getCondition(), equalTo(TransactionError.TRANSACTION_TIMEOUT));
- }
- }
-
-
private void assertUnknownTransactionIdError(final Response<?> response)
{
assertThat(response, is(notNullValue()));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ba4344f6/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/BrokerAdmin.java
----------------------------------------------------------------------
diff --git a/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/BrokerAdmin.java b/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/BrokerAdmin.java
index 476e2b1..8e64adf 100644
--- a/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/BrokerAdmin.java
+++ b/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/BrokerAdmin.java
@@ -59,9 +59,6 @@ public interface BrokerAdmin extends Pluggable
String getKind();
- void configure(String settingName, Object settingValue);
-
-
enum PortType
{
ANONYMOUS_AMQP,
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ba4344f6/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/ConfigItem.java
----------------------------------------------------------------------
diff --git a/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/ConfigItem.java b/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/ConfigItem.java
new file mode 100644
index 0000000..493f865
--- /dev/null
+++ b/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/ConfigItem.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.tests.utils;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(ConfigItems.class)
+@Target({ElementType.TYPE})
+public @interface ConfigItem
+{
+ String name();
+ String value();
+}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ba4344f6/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/ConfigItems.java
----------------------------------------------------------------------
diff --git a/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/ConfigItems.java b/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/ConfigItems.java
new file mode 100644
index 0000000..9f76180
--- /dev/null
+++ b/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/ConfigItems.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.qpid.tests.utils;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+public @interface ConfigItems
+{
+ ConfigItem[] value();
+}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ba4344f6/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/EmbeddedBrokerPerClassAdminImpl.java
----------------------------------------------------------------------
diff --git a/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/EmbeddedBrokerPerClassAdminImpl.java b/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/EmbeddedBrokerPerClassAdminImpl.java
index 293df5b..6dbfc48 100644
--- a/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/EmbeddedBrokerPerClassAdminImpl.java
+++ b/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/EmbeddedBrokerPerClassAdminImpl.java
@@ -35,6 +35,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
import ch.qos.logback.classic.LoggerContext;
import com.google.common.util.concurrent.Futures;
@@ -84,7 +85,11 @@ public class EmbeddedBrokerPerClassAdminImpl implements BrokerAdmin
String timestamp = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date(System.currentTimeMillis()));
_currentWorkDirectory = Files.createTempDirectory(String.format("qpid-work-%s-%s-", timestamp, testClass.getSimpleName())).toString();
- Map<String,String> context = new HashMap<>();
+ Map<String, String> context = new HashMap<>();
+ context.putAll(Arrays.stream((ConfigItem[]) testClass.getAnnotationsByType(ConfigItem.class))
+ .collect(Collectors.toMap(ConfigItem::name,
+ ConfigItem::value,
+ (name, value) -> value)));
context.put("qpid.work_dir", _currentWorkDirectory);
context.put("qpid.port.protocol_handshake_timeout", "1000000");
@@ -390,12 +395,6 @@ public class EmbeddedBrokerPerClassAdminImpl implements BrokerAdmin
}
@Override
- public void configure(final String settingName, final Object settingValue)
- {
- _currentVirtualHostNode.getVirtualHost().setAttributes(Collections.singletonMap(settingName, settingValue));
- }
-
- @Override
public String getType()
{
return "EMBEDDED_BROKER_PER_CLASS";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ba4344f6/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/ExternalQpidBrokerAdminImpl.java
----------------------------------------------------------------------
diff --git a/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/ExternalQpidBrokerAdminImpl.java b/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/ExternalQpidBrokerAdminImpl.java
index 5f24546..5c3e1cc 100644
--- a/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/ExternalQpidBrokerAdminImpl.java
+++ b/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/ExternalQpidBrokerAdminImpl.java
@@ -162,12 +162,6 @@ public class ExternalQpidBrokerAdminImpl implements BrokerAdmin
}
@Override
- public void configure(final String settingName, final Object settingValue)
- {
- throw new UnsupportedOperationException("External Qpid Broker does not support configuring");
- }
-
- @Override
public String getType()
{
return "EXTERNAL_BROKER";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ba4344f6/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/QpidTestRunner.java
----------------------------------------------------------------------
diff --git a/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/QpidTestRunner.java b/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/QpidTestRunner.java
index d3c9be6..a03c129 100644
--- a/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/QpidTestRunner.java
+++ b/systests/systests-utils/src/main/java/org/apache/qpid/tests/utils/QpidTestRunner.java
@@ -64,6 +64,10 @@ public class QpidTestRunner extends BlockJUnit4ClassRunner
protected void runChild(final FrameworkMethod method, final RunNotifier notifier)
{
BrokerSpecific brokerSpecific = method.getAnnotation(BrokerSpecific.class);
+ if (brokerSpecific == null)
+ {
+ brokerSpecific = method.getClass().getAnnotation(BrokerSpecific.class);
+ }
if (brokerSpecific != null && !brokerSpecific.kind().equalsIgnoreCase(_brokerAdmin.getKind()))
{
notifier.fireTestIgnored(describeChild(method));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org