QPIDJMS-482: update to proton-j 0.33.3, and update tests for QPIDJMS-481.
diff --git a/pom.xml b/pom.xml
index 2723642..4476714 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<!-- Dependency Versions for this Project -->
- <proton-version>0.33.2</proton-version>
+ <proton-version>0.33.3</proton-version>
<netty-version>4.1.43.Final</netty-version>
<slf4j-version>1.7.25</slf4j-version>
<geronimo.jms.2.spec.version>1.0-alpha-2</geronimo.jms.2.spec.version>
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/TransactionsIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/TransactionsIntegrationTest.java
index 42dbada..5eeecdb 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/TransactionsIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/TransactionsIntegrationTest.java
@@ -65,6 +65,7 @@
import org.apache.qpid.jms.test.testpeer.describedtypes.TransactionalState;
import org.apache.qpid.jms.test.testpeer.describedtypes.sections.AmqpValueDescribedType;
import org.apache.qpid.jms.test.testpeer.matchers.AcceptedMatcher;
+import org.apache.qpid.jms.test.testpeer.matchers.ErrorMatcher;
import org.apache.qpid.jms.test.testpeer.matchers.ModifiedMatcher;
import org.apache.qpid.jms.test.testpeer.matchers.ReleasedMatcher;
import org.apache.qpid.jms.test.testpeer.matchers.SourceMatcher;
@@ -1706,12 +1707,10 @@
// Expect declare, reply declared but without a txn-id, which is illegal.
testPeer.expectDeclare(null);
- // TODO: swap this in for below after PROTON-2142 fix is available:
- // ErrorMatcher errorMatcher = new ErrorMatcher()
- // .withCondition(equalTo(AmqpError.DECODE_ERROR))
- // .withDescription(equalTo("The txn-id field cannot be omitted"));
- // testPeer.expectClose(errorMatcher, false);
- testPeer.expectClose(false);
+ ErrorMatcher errorMatcher = new ErrorMatcher()
+ .withCondition(equalTo(AmqpError.DECODE_ERROR))
+ .withDescription(equalTo("The txn-id field cannot be omitted"));
+ testPeer.expectClose(errorMatcher, false);
testPeer.setSuppressReadExceptionOnClose(true);
try {
@@ -1725,12 +1724,8 @@
JMSException ex = failure.get();
assertTrue("Unexpected exception type: " + ex, ex instanceof JmsConnectionFailedException);
- // TODO: swap this in for below after PROTON-2142 fix is available:
- // MatcherAssert.assertThat("Unexpected exception type: ", ex.getMessage(),
- // equalTo("The JMS connection has failed: Error in proton Transport: The txn-id field cannot be omitted [condition = amqp:decode-error]"));
MatcherAssert.assertThat("Unexpected exception type: ", ex.getMessage(),
- equalTo("The JMS connection has failed: Error in proton Transport: org.apache.qpid.proton.engine.TransportException: "
- + "org.apache.qpid.proton.codec.DecodeException: The txn-id field cannot be omitted [condition = amqp:connection:framing-error]"));
+ equalTo("The JMS connection has failed: Error in proton Transport: The txn-id field cannot be omitted [condition = amqp:decode-error]"));
testPeer.waitForAllHandlersToComplete(1000);
