diff options
author | Rajith Muditha Attapattu <rajith@apache.org> | 2007-01-24 23:21:40 +0000 |
---|---|---|
committer | Rajith Muditha Attapattu <rajith@apache.org> | 2007-01-24 23:21:40 +0000 |
commit | a1bf3981115c397e55cd7fdc195381a10d5f940c (patch) | |
tree | a57f9f3d54d7bcfd8d0d45423a033e6e881daa87 | |
parent | cc7f9b9cae4b4d2abea744dd432436c36d7fc9e0 (diff) | |
download | qpid-python-a1bf3981115c397e55cd7fdc195381a10d5f940c.tar.gz |
This contain fixes for compilation errors in the systests package
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@499612 13f79535-47bb-0310-9956-ffa450edef68
8 files changed, 273 insertions, 103 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java index b8b1203515..04bb8602bf 100644 --- a/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java +++ b/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java @@ -135,7 +135,7 @@ public class JMSMapMessage extends AbstractBytesTypedMessage implements javax.jm public short getShort(String propName) throws JMSException { - Object value = _map.get(propName); + Object value = _map.get(propName); if(value instanceof Short) { 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 2fe9d41050..9c176a0db4 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 @@ -21,7 +21,10 @@ package org.apache.qpid.server.exchange; import junit.framework.TestCase; + +import org.apache.mina.common.ByteBuffer; import org.apache.qpid.AMQException; +import org.apache.qpid.client.message.MessageHeaders; import org.apache.qpid.framing.*; import org.apache.qpid.server.queue.AMQMessage; import org.apache.qpid.server.queue.AMQQueue; @@ -133,29 +136,6 @@ public class AbstractHeadersExchangeTestBase extends TestCase return headers; } - static BasicPublishBody getPublishRequest(String id) - { - // AMQP version change: Hardwire the version to 0-9 (major=0, minor=9) - // TODO: Establish some way to determine the version for the test. - BasicPublishBody request = new BasicPublishBody((byte)0, (byte)9); - request.routingKey = id; - return request; - } - - static ContentHeaderBody getContentHeader(FieldTable headers) - { - ContentHeaderBody header = new ContentHeaderBody(); - header.properties = getProperties(headers); - return header; - } - - static BasicContentHeaderProperties getProperties(FieldTable headers) - { - BasicContentHeaderProperties properties = new BasicContentHeaderProperties(); - properties.setHeaders(headers); - return properties; - } - static class TestQueue extends AMQQueue { final List<HeadersExchangeTest.Message> messages = new ArrayList<HeadersExchangeTest.Message>(); @@ -185,12 +165,42 @@ public class AbstractHeadersExchangeTestBase extends TestCase Message(String id, FieldTable headers) throws AMQException { - this(getPublishRequest(id), getContentHeader(headers), null); - } - - private Message(BasicPublishBody publish, ContentHeaderBody header, List<ContentBody> bodies) throws AMQException - { - super(_messageStore, publish, header, bodies); + this(_messageStore, getMessageTransferBody(id,headers), new ArrayList()); + } + + private static MessageTransferBody getMessageTransferBody(String id,FieldTable headers){ + MessageHeaders messageHeaders = new MessageHeaders(); + MessageTransferBody methodBody = MessageTransferBody.createMethodBody( + (byte)0, (byte)9, // AMQP version (major, minor) + messageHeaders.getAppId(), // String appId + headers, // FieldTable applicationHeaders + new Content(), // Content body + messageHeaders.getEncoding(), // String contentEncoding + messageHeaders.getContentType(), // String contentType + messageHeaders.getCorrelationId(), // String correlationId + (short)1, // short deliveryMode + "someExchange", // String destination + "someExchange", // String exchange + messageHeaders.getExpiration(), // long expiration + false, // boolean immediate + id, // String messageId + (short)0, // short priority + false, // boolean redelivered + messageHeaders.getReplyTo(), // String replyTo + "rk", // String routingKey + new String("abc123").getBytes(), // byte[] securityToken + 0, // int ticket + messageHeaders.getTimestamp(), // long timestamp + messageHeaders.getTransactionId(), // String transactionId + 0, // long ttl + messageHeaders.getUserId()); // String userId + + return methodBody; + } + + Message(MessageStore store, MessageTransferBody transferBody, List<ByteBuffer> contents) throws AMQException + { + super(_messageStore, transferBody, contents); } private Message(AMQMessage msg) throws AMQException @@ -230,7 +240,7 @@ public class AbstractHeadersExchangeTestBase extends TestCase private Object getKey() { - return getPublishBody().routingKey; + return this.getTransferBody().getRoutingKey(); } } } diff --git a/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java b/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java index c01241d11d..53200a517e 100644 --- a/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java +++ b/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java @@ -23,7 +23,6 @@ package org.apache.qpid.server.exchange; import org.apache.qpid.AMQException; import org.apache.qpid.server.registry.ApplicationRegistry; import org.apache.qpid.server.util.TestApplicationRegistry; -import org.apache.qpid.framing.BasicPublishBody; public class HeadersExchangeTest extends AbstractHeadersExchangeTestBase { @@ -54,16 +53,16 @@ public class HeadersExchangeTest extends AbstractHeadersExchangeTestBase Message m7 = new Message("Message7", "XXXXX"); - BasicPublishBody pb7 = m7.getPublishBody(); - pb7.mandatory = true; + // I couldn't find mandatory or the equivalent of mandatory in the transfer method + + //BasicPublishBody pb7 = m7.getPublishBody(); + //pb7.mandatory = true; routeAndTest(m7,true); Message m8 = new Message("Message8", "F0000"); - BasicPublishBody pb8 = m8.getPublishBody(); - pb8.mandatory = true; + //BasicPublishBody pb8 = m8.getPublishBody(); + //pb8.mandatory = true; routeAndTest(m8,false,q1); - - } public void testAny() throws AMQException @@ -87,10 +86,10 @@ public class HeadersExchangeTest extends AbstractHeadersExchangeTestBase bindDefault("F0000"); Message m1 = new Message("Message1", "XXXXX"); Message m2 = new Message("Message2", "F0000"); - BasicPublishBody pb1 = m1.getPublishBody(); - pb1.mandatory = true; - BasicPublishBody pb2 = m2.getPublishBody(); - pb2.mandatory = true; + //BasicPublishBody pb1 = m1.getPublishBody(); + //pb1.mandatory = true; + //BasicPublishBody pb2 = m2.getPublishBody(); + //pb2.mandatory = true; routeAndTest(m1,true); } diff --git a/java/systests/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java b/java/systests/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java index 356c887996..b4372049dd 100644 --- a/java/systests/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java +++ b/java/systests/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java @@ -31,6 +31,7 @@ import org.apache.qpid.server.store.SkeletonMessageStore; import org.apache.qpid.AMQException; import javax.management.JMException; +import javax.management.openmbean.OpenDataException; /** * Test class to test MBean operations for AMQMinaProtocolSession. @@ -50,7 +51,7 @@ public class AMQProtocolSessionMBeanTest extends TestCase // check the channel count is correct int channelCount = _mbean.channels().size(); assertTrue(channelCount == 1); - _protocolSession.addChannel(new AMQChannel(2, _messageStore, null)); + _protocolSession.addChannel(new AMQChannel(2,_protocolSession, _messageStore, null,null)); channelCount = _mbean.channels().size(); assertTrue(channelCount == 2); @@ -59,7 +60,7 @@ public class AMQProtocolSessionMBeanTest extends TestCase assertTrue(_mbean.getMaximumNumberOfChannels() == 1000L); // check APIs - AMQChannel channel3 = new AMQChannel(3, _messageStore, null); + AMQChannel channel3 = new AMQChannel(3,_protocolSession, _messageStore, null,null); channel3.setTransactional(true); _protocolSession.addChannel(channel3); _mbean.rollbackTransactions(2); @@ -79,17 +80,17 @@ public class AMQProtocolSessionMBeanTest extends TestCase } // check if closing of session works - _protocolSession.addChannel(new AMQChannel(5, _messageStore, null)); + _protocolSession.addChannel(new AMQChannel(5,_protocolSession, _messageStore, null,null)); _mbean.closeConnection(); try { - channelCount = _mbean.channels().size(); - assertTrue(channelCount == 0); - // session is now closed so adding another channel should throw an exception - _protocolSession.addChannel(new AMQChannel(6, _messageStore, null)); - fail(); + channelCount = _mbean.channels().size(); + assertTrue(channelCount == 0); + // session is now closed so adding another channel should throw an exception + _protocolSession.addChannel(new AMQChannel(6,_protocolSession, _messageStore, null,null)); + fail(); } - catch(AMQException ex) + catch(OpenDataException ex) { System.out.println("expected exception is thrown :" + ex.getMessage()); } @@ -98,12 +99,12 @@ public class AMQProtocolSessionMBeanTest extends TestCase @Override protected void setUp() throws Exception { - super.setUp(); - _channel = new AMQChannel(1, _messageStore, null); + super.setUp(); _queueRegistry = new DefaultQueueRegistry(); _exchangeRegistry = new DefaultExchangeRegistry(new DefaultExchangeFactory()); _mockIOSession = new MockIoSession(); _protocolSession = new AMQMinaProtocolSession(_mockIOSession, _queueRegistry, _exchangeRegistry, new AMQCodecFactory(true)); + _channel = new AMQChannel(1,_protocolSession, _messageStore, null,null); _protocolSession.addChannel(_channel); _mbean = (AMQProtocolSessionMBean)_protocolSession.getManagedObject(); } 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 1e06c1a476..7c5de67c5e 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 @@ -17,16 +17,20 @@ */ package org.apache.qpid.server.queue; +import java.util.ArrayList; + +import javax.management.JMException; + import junit.framework.TestCase; + import org.apache.qpid.AMQException; -import org.apache.qpid.framing.BasicPublishBody; -import org.apache.qpid.framing.ContentHeaderBody; +import org.apache.qpid.client.message.MessageHeaders; +import org.apache.qpid.framing.Content; +import org.apache.qpid.framing.MessageTransferBody; import org.apache.qpid.server.AMQChannel; import org.apache.qpid.server.store.MessageStore; import org.apache.qpid.server.store.SkeletonMessageStore; -import javax.management.JMException; - /** * Test class to test AMQQueueMBean attribtues and operations */ @@ -61,11 +65,11 @@ public class AMQQueueMBeanTest extends TestCase SubscriptionManager mgr = _queue.getSubscribers(); assertFalse(mgr.hasActiveSubscribers()); assertTrue(_queueMBean.getActiveConsumerCount() == 0); - - _channel = new AMQChannel(1, _messageStore, null); - _protocolSession = new MockProtocolSession(_messageStore); + + _protocolSession = new MockProtocolSession(_messageStore); + _channel = new AMQChannel(1,_protocolSession, _messageStore, null,null); _protocolSession.addChannel(_channel); - + _queue.registerProtocolSession(_protocolSession, 1, "test", false, null); assertTrue(_queueMBean.getActiveConsumerCount() == 1); @@ -150,11 +154,35 @@ public class AMQQueueMBeanTest extends TestCase { // AMQP version change: Hardwire the version to 0-9 (major=0, minor=9) // TODO: Establish some way to determine the version for the test. - BasicPublishBody publish = new BasicPublishBody((byte)0, (byte)9); - publish.immediate = immediate; - ContentHeaderBody contentHeaderBody = new ContentHeaderBody(); - contentHeaderBody.bodySize = 1000; // in bytes - return new AMQMessage(_messageStore, publish, contentHeaderBody, null); + + MessageHeaders messageHeaders = new MessageHeaders(); + + MessageTransferBody methodBody = MessageTransferBody.createMethodBody( + (byte)0, (byte)9, // AMQP version (major, minor) + messageHeaders.getAppId(), // String appId + messageHeaders.getJMSHeaders(), // FieldTable applicationHeaders + new Content(), // Content body + messageHeaders.getEncoding(), // String contentEncoding + messageHeaders.getContentType(), // String contentType + messageHeaders.getCorrelationId(), // String correlationId + (short)1, // short deliveryMode + "someExchange", // String destination + "someExchange", // String exchange + messageHeaders.getExpiration(), // long expiration + immediate, // boolean immediate + "", // String messageId + (short)0, // short priority + false, // boolean redelivered + messageHeaders.getReplyTo(), // String replyTo + "rk", // String routingKey + new String("abc123").getBytes(), // byte[] securityToken + 0, // int ticket + messageHeaders.getTimestamp(), // long timestamp + messageHeaders.getTransactionId(), // String transactionId + 0, // long ttl + messageHeaders.getUserId()); // String userId + + return new AMQMessage(_messageStore, methodBody, new ArrayList()); } @Override 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 6e0479b4a6..c3584e026a 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 @@ -20,22 +20,23 @@ */ package org.apache.qpid.server.queue; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.Map; + +import junit.framework.TestCase; + import org.apache.log4j.Logger; import org.apache.qpid.AMQException; -import org.apache.qpid.framing.BasicContentHeaderProperties; -import org.apache.qpid.framing.BasicPublishBody; -import org.apache.qpid.framing.ContentHeaderBody; +import org.apache.qpid.client.message.MessageHeaders; +import org.apache.qpid.framing.Content; +import org.apache.qpid.framing.MessageTransferBody; import org.apache.qpid.server.AMQChannel; import org.apache.qpid.server.ack.UnacknowledgedMessage; import org.apache.qpid.server.registry.ApplicationRegistry; import org.apache.qpid.server.store.TestableMemoryMessageStore; import org.apache.qpid.server.util.TestApplicationRegistry; -import java.util.Iterator; -import java.util.Map; - -import junit.framework.TestCase; - /** * Tests that acknowledgements are handled correctly. */ @@ -63,11 +64,11 @@ public class AckTest extends TestCase protected void setUp() throws Exception { super.setUp(); - _messageStore = new TestableMemoryMessageStore(); - _channel = new AMQChannel(5, _messageStore, null/*dont need exchange registry*/); + _messageStore = new TestableMemoryMessageStore(); _protocolSession = new MockProtocolSession(_messageStore); + _channel = new AMQChannel(5,_protocolSession, _messageStore, null/*dont need exchange registry*/,null); _protocolSession.addChannel(_channel); - _subscriptionManager = new SubscriptionSet(); + _subscriptionManager = new SubscriptionSet(); _queue = new AMQQueue("myQ", false, "guest", true, new DefaultQueueRegistry(), _subscriptionManager); } @@ -82,23 +83,36 @@ public class AckTest extends TestCase { // AMQP version change: Hardwire the version to 0-9 (major=0, minor=9) // TODO: Establish some way to determine the version for the test. - BasicPublishBody publishBody = new BasicPublishBody((byte)0, (byte)9); - publishBody.routingKey = "rk"; - publishBody.exchange = "someExchange"; - AMQMessage msg = new AMQMessage(_messageStore, publishBody); - if (persistent) - { - BasicContentHeaderProperties b = new BasicContentHeaderProperties(); - //This is DeliveryMode.PERSISTENT - b.setDeliveryMode((byte) 2); - ContentHeaderBody cb = new ContentHeaderBody(); - cb.properties = b; - msg.setContentHeaderBody(cb); - } - else - { - msg.setContentHeaderBody(new ContentHeaderBody()); - } + //AMQMessage(MessageStore store, MessageTransferBody transferBody, List<ByteBuffer> contents) + + MessageHeaders messageHeaders = new MessageHeaders(); + + MessageTransferBody methodBody = MessageTransferBody.createMethodBody( + (byte)0, (byte)9, // AMQP version (major, minor) + messageHeaders.getAppId(), // String appId + messageHeaders.getJMSHeaders(), // FieldTable applicationHeaders + new Content(), // Content body + messageHeaders.getEncoding(), // String contentEncoding + messageHeaders.getContentType(), // String contentType + messageHeaders.getCorrelationId(), // String correlationId + persistent ? (short)2: (short)1, // short deliveryMode + "someExchange", // String destination + "someExchange", // String exchange + messageHeaders.getExpiration(), // long expiration + false, // boolean immediate + "" + i, // String messageId + (short)0, // short priority + false, // boolean redelivered + messageHeaders.getReplyTo(), // String replyTo + "rk", // String routingKey + new String("abc123").getBytes(), // byte[] securityToken + 0, // int ticket + messageHeaders.getTimestamp(), // long timestamp + messageHeaders.getTransactionId(), // String transactionId + 0, // long ttl + messageHeaders.getUserId()); // String userId + + AMQMessage msg = new AMQMessage(_messageStore, methodBody, new ArrayList()); _subscription.send(msg, _queue); } } 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 4da67d490b..5a01506823 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 @@ -20,15 +20,18 @@ */ package org.apache.qpid.server.queue; -import org.apache.qpid.framing.BasicPublishBody; -import org.apache.qpid.framing.ContentHeaderBody; +import java.util.ArrayList; + +import junit.framework.TestCase; + +import org.apache.qpid.AMQException; +import org.apache.qpid.client.message.MessageHeaders; +import org.apache.qpid.framing.Content; +import org.apache.qpid.framing.MessageTransferBody; +import org.apache.qpid.server.registry.ApplicationRegistry; import org.apache.qpid.server.store.MessageStore; import org.apache.qpid.server.store.SkeletonMessageStore; -import org.apache.qpid.server.registry.ApplicationRegistry; import org.apache.qpid.server.util.TestApplicationRegistry; -import org.apache.qpid.AMQException; - -import junit.framework.TestCase; class MessageTestHelper extends TestCase { @@ -48,9 +51,34 @@ class MessageTestHelper extends TestCase { // AMQP version change: Hardwire the version to 0-9 (major=0, minor=9) // TODO: Establish some way to determine the version for the test. - BasicPublishBody publish = new BasicPublishBody((byte)0, (byte)9); - publish.immediate = immediate; - return new AMQMessage(_messageStore, publish, new ContentHeaderBody(), null); + MessageHeaders messageHeaders = new MessageHeaders(); + + MessageTransferBody methodBody = MessageTransferBody.createMethodBody( + (byte)0, (byte)9, // AMQP version (major, minor) + messageHeaders.getAppId(), // String appId + messageHeaders.getJMSHeaders(), // FieldTable applicationHeaders + new Content(), // Content body + messageHeaders.getEncoding(), // String contentEncoding + messageHeaders.getContentType(), // String contentType + messageHeaders.getCorrelationId(), // String correlationId + (short)1, // short deliveryMode + "someExchange", // String destination + "someExchange", // String exchange + messageHeaders.getExpiration(), // long expiration + immediate, // boolean immediate + "", // String messageId + (short)0, // short priority + false, // boolean redelivered + messageHeaders.getReplyTo(), // String replyTo + "rk", // String routingKey + new String("abc123").getBytes(), // byte[] securityToken + 0, // int ticket + messageHeaders.getTimestamp(), // long timestamp + messageHeaders.getTransactionId(), // String transactionId + 0, // long ttl + messageHeaders.getUserId()); // String userId + + return new AMQMessage(_messageStore, methodBody, new ArrayList()); } } diff --git a/java/systests/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java b/java/systests/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java index 87e5c43932..12ae522370 100644 --- a/java/systests/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java +++ b/java/systests/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java @@ -22,9 +22,14 @@ package org.apache.qpid.server.queue; import org.apache.qpid.AMQException; import org.apache.qpid.framing.AMQDataBlock; +import org.apache.qpid.framing.AMQMethodBody; import org.apache.qpid.framing.FieldTable; +import org.apache.qpid.protocol.AMQMethodEvent; +import org.apache.qpid.protocol.AMQMethodListener; import org.apache.qpid.server.AMQChannel; +import org.apache.qpid.server.exchange.ExchangeRegistry; import org.apache.qpid.server.protocol.AMQProtocolSession; +import org.apache.qpid.server.state.AMQStateManager; import org.apache.qpid.server.store.MessageStore; import javax.security.sasl.SaslServer; @@ -131,4 +136,89 @@ public class MockProtocolSession implements AMQProtocolSession public void setClientProperties(FieldTable clientProperties) { } + + public void closeChannelRequest(int channelId, int replyCode, String replyText) throws AMQException { + // TODO Auto-generated method stub + + } + + public void closeChannelResponse(int channelId, long requestId) throws AMQException { + // TODO Auto-generated method stub + + } + + public void closeSessionRequest(int replyCode, String replyText, int classId, int methodId) throws AMQException { + // TODO Auto-generated method stub + + } + + public void closeSessionRequest(int replyCode, String replyText) throws AMQException { + // TODO Auto-generated method stub + + } + + public void closeSessionResponse(long requestId) throws AMQException { + // TODO Auto-generated method stub + + } + + public void setFrameMax(long size) { + // TODO Auto-generated method stub + + } + + public long getFrameMax() { + // TODO Auto-generated method stub + return 0; + } + + public QueueRegistry getQueueRegistry() { + // TODO Auto-generated method stub + return null; + } + + public ExchangeRegistry getExchangeRegistry() { + // TODO Auto-generated method stub + return null; + } + + public AMQStateManager getStateManager() { + // TODO Auto-generated method stub + return null; + } + + public byte getMajor() { + // TODO Auto-generated method stub + return 0; + } + + public byte getMinor() { + // TODO Auto-generated method stub + return 0; + } + + public boolean versionEquals(byte major, byte minor) { + // TODO Auto-generated method stub + return false; + } + + public void checkMethodBodyVersion(AMQMethodBody methodBody) { + // TODO Auto-generated method stub + + } + + public long writeRequest(int channelNum, AMQMethodBody methodBody, AMQMethodListener methodListener) { + // TODO Auto-generated method stub + return 0; + } + + public void writeResponse(int channelNum, long requestId, AMQMethodBody methodBody) { + // TODO Auto-generated method stub + + } + + public void writeResponse(AMQMethodEvent evt, AMQMethodBody response) { + // TODO Auto-generated method stub + + } } |