This is an automated email from the ASF dual-hosted git repository.

orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git

commit 455f23254b204ffc2704ebb7b60cc71c452580f4
Author: Alex Rudyy <[email protected]>
AuthorDate: Wed Aug 21 17:14:17 2019 +0100

    QPID-8350: [Tests][AMQP 1.0] Remove BrokerSpecific annotation from 
DecodeErrorTest#illegalMessage()
---
 .../qpid/tests/protocol/v1_0/DecodeErrorTest.java  | 34 +++++++++-------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git 
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/DecodeErrorTest.java
 
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/DecodeErrorTest.java
index b079122..ce604c9 100644
--- 
a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/DecodeErrorTest.java
+++ 
b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/DecodeErrorTest.java
@@ -35,7 +35,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -59,13 +58,11 @@ import 
org.apache.qpid.server.protocol.v1_0.type.transport.End;
 import org.apache.qpid.server.protocol.v1_0.type.transport.Error;
 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.SpecificationTest;
 import org.apache.qpid.tests.utils.BrokerAdmin;
 import org.apache.qpid.tests.utils.BrokerAdminUsingTestBase;
-import org.apache.qpid.tests.utils.BrokerSpecific;
 
 public class DecodeErrorTest extends BrokerAdminUsingTestBase
 {
@@ -82,28 +79,25 @@ public class DecodeErrorTest extends 
BrokerAdminUsingTestBase
     @SpecificationTest(section = "3.2",
             description = "Altogether a message consists of the following 
sections: Zero or one header,"
                           + " Zero or one delivery-annotations, [...]")
-    @BrokerSpecific(kind = BrokerAdmin.KIND_BROKER_J)
     public void illegalMessage() throws Exception
     {
         try (FrameTransport transport = new 
FrameTransport(_brokerAddress).connect())
         {
             final Interaction interaction = transport.newInteraction();
-            final Attach attach = interaction.negotiateProtocol()
-                                             .consumeResponse()
-                                             .open()
-                                             .consumeResponse(Open.class)
-                                             .begin()
-                                             .consumeResponse(Begin.class)
-                                             .attachRole(Role.SENDER)
-                                             
.attachTargetAddress(BrokerAdmin.TEST_QUEUE_NAME)
-                                             
.attachRcvSettleMode(ReceiverSettleMode.SECOND)
-                                             .attach()
-                                             .consumeResponse(Attach.class)
-                                             .getLatestResponse(Attach.class);
-            assumeThat(attach.getRcvSettleMode(), 
is(equalTo(ReceiverSettleMode.SECOND)));
-
-            final Flow flow = 
interaction.consumeResponse(Flow.class).getLatestResponse(Flow.class);
-            assumeThat(flow.getLinkCredit(), 
is(greaterThan(UnsignedInteger.ZERO)));
+            interaction.negotiateProtocol()
+                       .consumeResponse()
+                       .open()
+                       .consumeResponse(Open.class)
+                       .begin()
+                       .consumeResponse(Begin.class)
+                       .attachRole(Role.SENDER)
+                       .attachTargetAddress(BrokerAdmin.TEST_QUEUE_NAME)
+                       .attach()
+                       .consumeResponse(Attach.class)
+                       .consumeResponse(Flow.class)
+                       .assertLatestResponse(Flow.class,
+                                             flow -> 
assumeThat(flow.getLinkCredit(),
+                                                                
is(greaterThan(UnsignedInteger.ZERO))));
 
             final List<QpidByteBuffer> payloads = buildInvalidMessage();
             try


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to