From 5129ac060aed57d8e31a62c3cd64ff0ad8995949 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Fri, 22 Dec 2006 17:00:28 +0000 Subject: AMQP version using new generator - Part 1. In these changes, all places where version-specific info is required, it has been hard-wired to major=8, minor=0. The next phase of changes will connect the version info to that obtained from ProtocolInitiation for the current session. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489691 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java | 4 +++- .../src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java | 4 +++- java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java | 4 +++- .../src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) (limited to 'java/systests') diff --git a/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java index bcf1602433..23f7f3d53b 100644 --- a/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java +++ b/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java @@ -140,7 +140,9 @@ public class AbstractHeadersExchangeTestBase extends TestCase static BasicPublishBody getPublishRequest(String id) { - BasicPublishBody request = new BasicPublishBody(); + // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0) + // TODO: Establish some way to determine the version for the test. + BasicPublishBody request = new BasicPublishBody((byte)8, (byte)0); request.routingKey = id; return request; } diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java b/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java index 8de3c8bf33..fafb87abd5 100644 --- a/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java +++ b/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java @@ -148,7 +148,9 @@ public class AMQQueueMBeanTest extends TestCase private AMQMessage message(boolean immediate) throws AMQException { - BasicPublishBody publish = new BasicPublishBody(); + // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0) + // TODO: Establish some way to determine the version for the test. + BasicPublishBody publish = new BasicPublishBody((byte)8, (byte)0); publish.immediate = immediate; ContentHeaderBody contentHeaderBody = new ContentHeaderBody(); contentHeaderBody.bodySize = 1000; // in bytes diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java b/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java index c2511f0a99..11bae0d9f6 100644 --- a/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java +++ b/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java @@ -80,7 +80,9 @@ public class AckTest extends TestCase { for (int i = 1; i <= count; i++) { - BasicPublishBody publishBody = new BasicPublishBody(); + // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0) + // TODO: Establish some way to determine the version for the test. + BasicPublishBody publishBody = new BasicPublishBody((byte)8, (byte)0); publishBody.routingKey = "rk"; publishBody.exchange = "someExchange"; AMQMessage msg = new AMQMessage(_messageStore, publishBody); diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java b/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java index 8570e6521f..6b764acd54 100644 --- a/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java +++ b/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java @@ -46,7 +46,9 @@ class MessageTestHelper extends TestCase AMQMessage message(boolean immediate) throws AMQException { - BasicPublishBody publish = new BasicPublishBody(); + // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0) + // TODO: Establish some way to determine the version for the test. + BasicPublishBody publish = new BasicPublishBody((byte)8, (byte)0); publish.immediate = immediate; return new AMQMessage(_messageStore, publish, new ContentHeaderBody(), null); } -- cgit v1.2.1