subject:"qpid\-broker\-j git commit\: QPID\-8091\: \[Broker\-J\] Move transaction timeout protocol test to separate packages \- this features is Broker\-J specific."

[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.

2018-02-19 Thread orudyy

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 
Authored: Fri Feb 9 16:04:27 2018 +
Committer: Alex Rudyy 
Committed: Mon Feb 19 23:19:57 2018 +

--
 .../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 000..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

qpid-broker-j git commit: QPID-8091: [Broker-J] Move transaction timeout protocol test to separate packages - this features is Broker-J specific.

2018-02-09 Thread kwall

Repository: qpid-broker-j
Updated Branches:
  refs/heads/master 63c315f07 -> d57815f89


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.


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/d57815f8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/d57815f8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/d57815f8

Branch: refs/heads/master
Commit: d57815f89427781bb3cf3d5f6c70b3b13a8604ff
Parents: 63c315f
Author: Keith Wall 
Authored: Fri Feb 9 16:04:27 2018 +
Committer: Keith Wall 
Committed: Fri Feb 9 16:04:31 2018 +

--
 .../tests/protocol/v0_10/TransactionTest.java   | 132 --
 .../TransactionTimeoutTest.java | 171 +++
 .../protocol/v0_8/ConnectionInteraction.java|  11 ++
 .../tests/protocol/v0_8/TransactionTest.java|  82 -
 .../TransactionTimeoutTest.java | 139 +++
 .../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 +
 13 files changed, 573 insertions(+), 350 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d57815f8/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/TransactionTest.java
--
diff --git 
a/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/TransactionTest.java
 
b/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/TransactionTest.java
index 7c48e36..443aede 100644
--- 
a/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/TransactionTest.java
+++ 
b/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/TransactionTest.java
@@ -21,11 +21,8 @@
 package org.apache.qpid.tests.protocol.v0_10;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.qpid.tests.utils.BrokerAdmin.KIND_BROKER_J;
-import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.net.InetSocketAddress;
@@ -33,20 +30,10 @@ import java.net.InetSocketAddress;
 import org.junit.Before;
 import org.junit.Test;
 
-import org.apache.qpid.server.protocol.v0_10.transport.ConnectionClose;
-import org.apache.qpid.server.protocol.v0_10.transport.ConnectionCloseCode;
-import org.apache.qpid.server.protocol.v0_10.transport.MessageAcceptMode;
-import org.apache.qpid.server.protocol.v0_10.transport.MessageAcquireMode;
-import org.apache.qpid.server.protocol.v0_10.transport.MessageCreditUnit;
-import org.apache.qpid.server.protocol.v0_10.transport.MessageTransfer;
-import org.apache.qpid.server.protocol.v0_10.transport.Range;
-import org.apache.qpid.server.protocol.v0_10.transport.RangeSet;
 import org.apache.qpid.server.protocol.v0_10.transport.SessionCompleted;
-import org.apache.qpid.tests.protocol.Response;
 import org.apache.qpid.tests.protocol.SpecificationTest;
 import org.apache.qpid.tests.utils.BrokerAdmin;
 import org.apache.qpid.tests.utils.BrokerAdminUsingTestBase;
-import org.apache.qpid.tests.utils.BrokerSpecific;
 
 public class TransactionTest extends BrokerAdminUsingTestBase
 {
@@ -102,123 +89,4 @@ public class TransactionTest extends 
BrokerAdminUsingTestBase
 assertThat(queueDepthMessages, is(equalTo(1)));
 }
 }
-
-@Test
-@BrokerSpecific(kind = KIND_BROKER_J)
-public void publishTransactionTimeout() throws Exception
-{
-int transactionTimeout = 1000;
-getBrokerAdmin().configure("storeTransactionOpenTimeoutClose", 
transactionTimeout);
-
-try (FrameTransport transport = new 
FrameTransport(_brokerAddress).connect())
-{
-final Interaction interaction = transport.newInteraction();
-byte[] sessionName = "test".getBytes(UTF_8);
-interaction.openAnonymousConnection()
-

[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-broker-j git commit: QPID-8091: [Broker-J] Move transaction timeout protocol test to separate packages - this features is Broker-J specific.

2 matches

Site Navigation

Mail list logo

Footer information