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, 4 insertions, 5 deletions

diff --git a/python/qpid/testlib.py b/python/qpid/testlib.py
index 0b2a1b78d6..28c07ba43a 100644
--- a/python/qpid/testlib.py
+++ b/python/qpid/testlib.py
@@ -280,18 +280,17 @@ class TestBase(unittest.TestCase):
                 routing_key=routing_key)
         else:
             self.channel.message_transfer(
-                destination=exchange, body=body,
-                application_headers=properties,
-                routing_key=routing_key)
+                destination=exchange,
+                content=Content(body, properties={'application_headers':properties,'routing_key':routing_key}))
         msg = queue.get(timeout=1)
         if testrunner.use08spec():
             self.assertEqual(body, msg.content.body)
             if (properties):
                 self.assertEqual(properties, msg.content.properties)
         else:
-            self.assertEqual(body, msg.body)
+            self.assertEqual(body, msg.content.body)
             if (properties):
-                self.assertEqual(properties, msg.application_headers)
+                self.assertEqual(properties, msg.content['application_headers'])
 
     def assertPublishConsume(self, queue="", exchange="", routing_key="", properties=None):
         """