You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2007/01/25 00:21:41 UTC

svn commit: r499612 - in /incubator/qpid/branches/qpid.0-9/java: client/src/main/java/org/apache/qpid/client/message/ systests/src/test/java/org/apache/qpid/server/exchange/ systests/src/test/java/org/apache/qpid/server/protocol/ systests/src/test/java...

Author: rajith
Date: Wed Jan 24 15:21:40 2007
New Revision: 499612

URL: http://svn.apache.org/viewvc?view=rev&rev=499612
Log:
This contain fixes for compilation errors in the systests package

Modified:
    incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
    incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
    incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
    incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
    incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
    incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java
    incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
    incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java

Modified: incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java?view=diff&rev=499612&r1=499611&r2=499612
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/client/src/main/java/org/apache/qpid/client/message/JMSMapMessage.java Wed Jan 24 15:21:40 2007
@@ -135,7 +135,7 @@
 
     public short getShort(String propName) throws JMSException
     {
-        Object value = _map.get(propName);
+        Object value = _map.get(propName);       
 
         if(value instanceof Short)
         {

Modified: incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java?view=diff&rev=499612&r1=499611&r2=499612
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java Wed Jan 24 15:21:40 2007
@@ -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 @@
         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 @@
 
         Message(String id, FieldTable headers) throws AMQException
         {
-            this(getPublishRequest(id), getContentHeader(headers), null);
+        	this(_messageStore, getMessageTransferBody(id,headers), new ArrayList());
         }
-
-        private Message(BasicPublishBody publish, ContentHeaderBody header, List<ContentBody> bodies) throws AMQException
+        
+        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, publish, header, bodies);
+            super(_messageStore, transferBody, contents);
         }
 
         private Message(AMQMessage msg) throws AMQException
@@ -230,7 +240,7 @@
 
         private Object getKey()
         {
-            return getPublishBody().routingKey;
+            return this.getTransferBody().getRoutingKey();
         }
     }
 }

Modified: incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java?view=diff&rev=499612&r1=499611&r2=499612
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/exchange/HeadersExchangeTest.java Wed Jan 24 15:21:40 2007
@@ -23,7 +23,6 @@
 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 @@
 
         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 @@
         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);
     }
 

Modified: incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java?view=diff&rev=499612&r1=499611&r2=499612
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java Wed Jan 24 15:21:40 2007
@@ -31,6 +31,7 @@
 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 @@
         // 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 @@
         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 @@
         }
 
         // 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 @@
     @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();
     }

Modified: incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java?view=diff&rev=499612&r1=499611&r2=499612
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java Wed Jan 24 15:21:40 2007
@@ -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 @@
         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 @@
     {
         // 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

Modified: incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java?view=diff&rev=499612&r1=499611&r2=499612
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/AckTest.java Wed Jan 24 15:21:40 2007
@@ -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 @@
     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 @@
         {
             // 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);
         }
     }

Modified: incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java?view=diff&rev=499612&r1=499611&r2=499612
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/MessageTestHelper.java Wed Jan 24 15:21:40 2007
@@ -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 @@
     {
         // 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()); 
     }
 
 }

Modified: incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java?view=diff&rev=499612&r1=499611&r2=499612
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java (original)
+++ incubator/qpid/branches/qpid.0-9/java/systests/src/test/java/org/apache/qpid/server/queue/MockProtocolSession.java Wed Jan 24 15:21:40 2007
@@ -22,9 +22,14 @@
 
 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 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
+		
+	}
 }