forked python tests for 0-10 preview and 0-10 final

fixed result handling in c++ broker
modified testlib in python to allow new 0-10 client to be run as well
converted query tests for final 0-10
added python tests for 0-10 final to automated set for c++ broker (most unconverted still)



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

1 files changed, 19 insertions, 19 deletions

diff --git a/python/tests_0-10/broker.py b/python/tests_0-10/broker.py
index 99936ba742..bfecb5c166 100644
--- a/python/tests_0-10/broker.py
+++ b/python/tests_0-10/broker.py
@@ -19,9 +19,10 @@
 from qpid.client import Closed
 from qpid.queue import Empty
 from qpid.content import Content
-from qpid.testlib import testrunner, TestBase
+from qpid.testlib import TestBase010
+from qpid.datatypes import Message
 
-class BrokerTests(TestBase):
+class BrokerTests(TestBase010):
     """Tests for basic Broker functionality"""
 
     def test_ack_and_no_ack(self):
@@ -57,37 +58,36 @@ class BrokerTests(TestBase):
         """
         Test simple message delivery where consume is issued before publish
         """
-        channel = self.channel
-        self.exchange_declare(channel, exchange="test-exchange", type="direct")
-        self.queue_declare(channel, queue="test-queue") 
-        channel.queue_bind(queue="test-queue", exchange="test-exchange", routing_key="key")
+        session = self.session
+        session.queue_declare(queue="test-queue", exclusive=True, auto_delete=True)
+        session.exchange_bind(queue="test-queue", exchange="amq.fanout")
         consumer_tag = "tag1"
-        self.subscribe(queue="test-queue", destination=consumer_tag)
-        queue = self.client.queue(consumer_tag)
+        session.message_subscribe(queue="test-queue", destination=consumer_tag)
+        session.message_flow(unit = 0, value = 0xFFFFFFFF, destination = consumer_tag)
+        session.message_flow(unit = 1, value = 0xFFFFFFFF, destination = consumer_tag)
+        queue = session.incoming(consumer_tag)
 
         body = "Immediate Delivery"
-        channel.message_transfer(destination="test-exchange", content = Content(body, properties = {"routing_key" : "key"}))
+        session.message_transfer("amq.fanout", None, None, Message(body))
         msg = queue.get(timeout=5)
         self.assert_(msg.content.body == body)
 
-        # TODO: Ensure we fail if immediate=True and there's no consumer.
-
-
     def test_simple_delivery_queued(self):
         """
         Test basic message delivery where publish is issued before consume
         (i.e. requires queueing of the message)
         """
-        channel = self.channel
-        self.exchange_declare(channel, exchange="test-exchange", type="direct")
-        self.queue_declare(channel, queue="test-queue")
-        channel.queue_bind(queue="test-queue", exchange="test-exchange", routing_key="key")
+        session = self.session
+        session.queue_declare(queue="test-queue", exclusive=True, auto_delete=True)
+        session.exchange_bind(queue="test-queue", exchange="amq.fanout")
         body = "Queued Delivery"
-        channel.message_transfer(destination="test-exchange", content = Content(body, properties = {"routing_key" : "key"}))
+        session.message_transfer("amq.fanout", None, None, Message(body))
 
         consumer_tag = "tag1"
-        self.subscribe(queue="test-queue", destination=consumer_tag)
-        queue = self.client.queue(consumer_tag)
+        session.message_subscribe(queue="test-queue", destination=consumer_tag)
+        session.message_flow(unit = 0, value = 0xFFFFFFFF, destination = consumer_tag)
+        session.message_flow(unit = 1, value = 0xFFFFFFFF, destination = consumer_tag)
+        queue = session.incoming(consumer_tag)
         msg = queue.get(timeout=5)
         self.assert_(msg.content.body == body)