Updated message.transfer encoding to use header and content segments (including new structs).

Unified more between the basic and message classes messages.



git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@570538 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 6 insertions, 6 deletions

diff --git a/python/tests_0-10/exchange.py b/python/tests_0-10/exchange.py
index 3a47ffff8c..4137eb7a51 100644
--- a/python/tests_0-10/exchange.py
+++ b/python/tests_0-10/exchange.py
@@ -61,10 +61,10 @@ class StandardExchangeVerifier:
         self.assertPublishGet(q, ex, "a.x.b.x")
         self.assertPublishGet(q, ex, "a.x.x.b.x")
         # Shouldn't match
-        self.channel.message_transfer(destination=ex, routing_key="a.b", body="")        
-        self.channel.message_transfer(destination=ex, routing_key="a.b.x.y", body="")        
-        self.channel.message_transfer(destination=ex, routing_key="x.a.b.x", body="")        
-        self.channel.message_transfer(destination=ex, routing_key="a.b", body="")
+        self.channel.message_transfer(destination=ex, content=Content(properties={'routing_key':"a.b"}))        
+        self.channel.message_transfer(destination=ex, content=Content(properties={'routing_key':"a.b.x.y"}))        
+        self.channel.message_transfer(destination=ex, content=Content(properties={'routing_key':"x.a.b.x"}))        
+        self.channel.message_transfer(destination=ex, content=Content(properties={'routing_key':"a.b"}))
         self.assert_(q.empty())
 
     def verifyHeadersExchange(self, ex):
@@ -74,7 +74,7 @@ class StandardExchangeVerifier:
         q = self.consume("q")
         headers = {"name":"fred", "age":3}
         self.assertPublishGet(q, exchange=ex, properties=headers)
-        self.channel.message_transfer(destination=ex, body="") # No headers, won't deliver
+        self.channel.message_transfer(destination=ex) # No headers, won't deliver
         self.assertEmpty(q);                 
         
 
@@ -275,7 +275,7 @@ class HeadersExchangeTests(TestBase):
         self.assertPublishGet(self.q, exchange="amq.match", properties=headers)
 
     def myBasicPublish(self, headers):
-        self.channel.message_transfer(destination="amq.match", body="foobar", application_headers=headers)
+        self.channel.message_transfer(destination="amq.match", content=Content("foobar", properties={'application_headers':headers}))
         
     def testMatchAll(self):
         self.channel.queue_bind(queue="q", exchange="amq.match", arguments={ 'x-match':'all', "name":"fred", "age":3})