You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2009/11/16 12:58:46 UTC

svn commit: r880718 - in /qpid/trunk/qpid/cpp: examples/messaging/ include/qpid/messaging/ src/ src/qpid/client/amqp0_10/ src/qpid/messaging/ src/tests/

Author: gsim
Date: Mon Nov 16 11:58:45 2009
New Revision: 880718

URL: http://svn.apache.org/viewvc?rev=880718&view=rev
Log:
Merge branch 'next_receiver_changes' into trunk

Removed:
    qpid/trunk/qpid/cpp/examples/messaging/queue_listener.cpp
    qpid/trunk/qpid/cpp/examples/messaging/topic_listener.cpp
    qpid/trunk/qpid/cpp/include/qpid/messaging/MessageListener.h
Modified:
    qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt
    qpid/trunk/qpid/cpp/examples/messaging/Makefile.am
    qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h
    qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h
    qpid/trunk/qpid/cpp/src/Makefile.am
    qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
    qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
    qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
    qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.h
    qpid/trunk/qpid/cpp/src/qpid/messaging/Receiver.cpp
    qpid/trunk/qpid/cpp/src/qpid/messaging/ReceiverImpl.h
    qpid/trunk/qpid/cpp/src/qpid/messaging/Session.cpp
    qpid/trunk/qpid/cpp/src/qpid/messaging/SessionImpl.h
    qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp

Modified: qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt?rev=880718&r1=880717&r2=880718&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt Mon Nov 16 11:58:45 2009
@@ -17,11 +17,9 @@
 # under the License.
 #
 
-add_example(messaging queue_listener)
 add_example(messaging queue_receiver)
 add_example(messaging queue_sender)
 
-add_example(messaging topic_listener)
 add_example(messaging topic_receiver)
 add_example(messaging topic_sender)
 

Modified: qpid/trunk/qpid/cpp/examples/messaging/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/messaging/Makefile.am?rev=880718&r1=880717&r2=880718&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/messaging/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/examples/messaging/Makefile.am Mon Nov 16 11:58:45 2009
@@ -21,23 +21,17 @@
 MAKELDFLAGS=$(CLIENTFLAGS)
 include $(top_srcdir)/examples/makedist.mk
 
-noinst_PROGRAMS=queue_sender queue_listener queue_receiver topic_sender topic_listener topic_receiver client server map_sender map_receiver
+noinst_PROGRAMS=queue_sender queue_receiver topic_sender topic_receiver client server map_sender map_receiver
 
 queue_sender_SOURCES=queue_sender.cpp
 queue_sender_LDADD=$(CLIENT_LIB)
 
-queue_listener_SOURCES=queue_listener.cpp
-queue_listener_LDADD=$(CLIENT_LIB)
-
 queue_receiver_SOURCES=queue_receiver.cpp
 queue_receiver_LDADD=$(CLIENT_LIB)
 
 topic_sender_SOURCES=topic_sender.cpp
 topic_sender_LDADD=$(CLIENT_LIB)
 
-topic_listener_SOURCES=topic_listener.cpp
-topic_listener_LDADD=$(CLIENT_LIB)
-
 topic_receiver_SOURCES=topic_receiver.cpp
 topic_receiver_LDADD=$(CLIENT_LIB)
 

Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h?rev=880718&r1=880717&r2=880718&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h Mon Nov 16 11:58:45 2009
@@ -36,7 +36,6 @@
 namespace messaging {
 
 class Message;
-class MessageListener;
 class ReceiverImpl;
 
 /**
@@ -121,13 +120,6 @@
      * Cancels this receiver.
      */
     QPID_CLIENT_EXTERN void cancel();
-
-    /**
-     * Set a message listener for this receiver.
-     * 
-     * @see Session::dispatch()
-     */
-    QPID_CLIENT_EXTERN void setListener(MessageListener* listener);
   private:
   friend class qpid::client::PrivateImplRef<Receiver>;
 };

Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h?rev=880718&r1=880717&r2=880718&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Session.h Mon Nov 16 11:58:45 2009
@@ -45,7 +45,7 @@
 
 /**
  * A session represents a distinct 'conversation' which can involve
- * sending and receiving messages from different sources and sinks.
+ * sending and receiving messages to and from different addresses.
  */
 class Session : public qpid::client::Handle<SessionImpl>
 {
@@ -85,10 +85,22 @@
      * has not yet been confirmed as processed by the server.
      */
     QPID_CLIENT_EXTERN uint32_t pendingAck();
-    QPID_CLIENT_EXTERN bool fetch(Message& message, qpid::sys::Duration timeout=qpid::sys::TIME_INFINITE);
-    QPID_CLIENT_EXTERN Message fetch(qpid::sys::Duration timeout=qpid::sys::TIME_INFINITE);
-    QPID_CLIENT_EXTERN bool dispatch(qpid::sys::Duration timeout=qpid::sys::TIME_INFINITE);
+    /**
+     * Retrieves the receiver for the next available message. If there
+     * are no available messages at present the call will block for up
+     * to the specified timeout waiting for one to arrive. Returns
+     * true if a message was available at the point of return, in
+     * which case the passed in receiver reference will be set to the
+     * receiver for that message or fals if no message was available.
+     */
     QPID_CLIENT_EXTERN bool nextReceiver(Receiver&, qpid::sys::Duration timeout=qpid::sys::TIME_INFINITE);
+    /**
+     * Returns the receiver for the next available message. If there
+     * are no available messages at present the call will block for up
+     * to the specified timeout waiting for one to arrive. Will throw
+     * Receiver::NoMessageAvailable if no message became available in
+     * time.
+     */
     QPID_CLIENT_EXTERN Receiver nextReceiver(qpid::sys::Duration timeout=qpid::sys::TIME_INFINITE);
     
 

Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=880718&r1=880717&r2=880718&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Mon Nov 16 11:58:45 2009
@@ -799,7 +799,6 @@
   ../include/qpid/messaging/MapContent.h 	\
   ../include/qpid/messaging/MapView.h 		\
   ../include/qpid/messaging/Message.h 		\
-  ../include/qpid/messaging/MessageListener.h 	\
   ../include/qpid/messaging/Sender.h 		\
   ../include/qpid/messaging/Receiver.h 	        \
   ../include/qpid/messaging/Session.h 		\

Modified: qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp?rev=880718&r1=880717&r2=880718&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp Mon Nov 16 11:58:45 2009
@@ -22,7 +22,6 @@
 #include "AddressResolution.h"
 #include "MessageSource.h"
 #include "SessionImpl.h"
-#include "qpid/messaging/MessageListener.h"
 #include "qpid/messaging/Receiver.h"
 
 namespace qpid {
@@ -115,8 +114,6 @@
     }
 }
 
-void ReceiverImpl::setListener(qpid::messaging::MessageListener* l) { listener = l; }
-qpid::messaging::MessageListener* ReceiverImpl::getListener() { return listener; }
 
 const std::string& ReceiverImpl::getName() const { return destination; }
 
@@ -139,7 +136,7 @@
                            const qpid::messaging::Address& a) : 
 
     parent(p), destination(name), address(a), byteCredit(0xFFFFFFFF), 
-    state(UNRESOLVED), capacity(0), listener(0), window(0) {}
+    state(UNRESOLVED), capacity(0), window(0) {}
 
 bool ReceiverImpl::getImpl(qpid::messaging::Message& message, qpid::sys::Duration timeout)
 {

Modified: qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h?rev=880718&r1=880717&r2=880718&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h Mon Nov 16 11:58:45 2009
@@ -62,8 +62,6 @@
     uint32_t getCapacity();
     uint32_t available();
     uint32_t pendingAck();
-    void setListener(qpid::messaging::MessageListener* listener);
-    qpid::messaging::MessageListener* getListener();
     void received(qpid::messaging::Message& message);
   private:
     SessionImpl& parent;

Modified: qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp?rev=880718&r1=880717&r2=880718&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp Mon Nov 16 11:58:45 2009
@@ -30,7 +30,6 @@
 #include "qpid/messaging/Address.h"
 #include "qpid/messaging/Message.h"
 #include "qpid/messaging/MessageImpl.h"
-#include "qpid/messaging/MessageListener.h"
 #include "qpid/messaging/Sender.h"
 #include "qpid/messaging/Receiver.h"
 #include "qpid/messaging/Session.h"
@@ -177,13 +176,6 @@
     return sender;
 }
 
-qpid::messaging::Address SessionImpl::createTempQueue(const std::string& baseName)
-{
-    std::string name = baseName + std::string("_") + session.getId().getName();
-    session.queueDeclare(arg::queue=name, arg::exclusive=true, arg::autoDelete=true);
-    return qpid::messaging::Address(name);
-}
-
 SessionImpl& SessionImpl::convert(qpid::messaging::Session& s)
 {
     boost::intrusive_ptr<SessionImpl> impl = getImplPtr<qpid::messaging::Session, SessionImpl>(s);
@@ -225,16 +217,10 @@
 
 bool SessionImpl::accept(ReceiverImpl* receiver, 
                          qpid::messaging::Message* message, 
-                         bool isDispatch, 
                          IncomingMessages::MessageTransfer& transfer)
 {
     if (receiver->getName() == transfer.getDestination()) {
         transfer.retrieve(message);
-        if (isDispatch) {
-            qpid::sys::Mutex::ScopedUnlock u(lock);
-            qpid::messaging::MessageListener* listener = receiver->getListener();
-            if (listener) listener->received(*message);
-        }
         receiver->received(*message);
         return true;
     } else {
@@ -242,18 +228,6 @@
     }
 }
 
-bool SessionImpl::acceptAny(qpid::messaging::Message* message, bool isDispatch, IncomingMessages::MessageTransfer& transfer)
-{
-    Receivers::iterator i = receivers.find(transfer.getDestination());
-    if (i == receivers.end()) {
-        QPID_LOG(error, "Received message for unknown destination " << transfer.getDestination());
-        return false;
-    } else {
-        boost::intrusive_ptr<ReceiverImpl> receiver = getImplPtr<Receiver, ReceiverImpl>(i->second);
-        return receiver && (!isDispatch || receiver->getListener()) && accept(receiver.get(), message, isDispatch, transfer);
-    }
-}
-
 bool SessionImpl::getIncoming(IncomingMessages::Handler& handler, qpid::sys::Duration timeout)
 {
     return incoming.get(handler, timeout);
@@ -261,37 +235,10 @@
 
 bool SessionImpl::get(ReceiverImpl& receiver, qpid::messaging::Message& message, qpid::sys::Duration timeout)
 {
-    IncomingMessageHandler handler(boost::bind(&SessionImpl::accept, this, &receiver, &message, false, _1));
+    IncomingMessageHandler handler(boost::bind(&SessionImpl::accept, this, &receiver, &message, _1));
     return getIncoming(handler, timeout);
 }
 
-bool SessionImpl::dispatch(qpid::sys::Duration timeout)
-{
-    qpid::sys::Mutex::ScopedLock l(lock);
-    while (true) {
-        try {
-            qpid::messaging::Message message;
-            IncomingMessageHandler handler(boost::bind(&SessionImpl::acceptAny, this, &message, true, _1));
-            return getIncoming(handler, timeout);
-        } catch (TransportFailure&) {
-            reconnect();
-        }
-    }
-}
-
-bool SessionImpl::fetch(qpid::messaging::Message& message, qpid::sys::Duration timeout)
-{
-    qpid::sys::Mutex::ScopedLock l(lock);
-    while (true) {
-        try {
-            IncomingMessageHandler handler(boost::bind(&SessionImpl::acceptAny, this, &message, false, _1));
-            return getIncoming(handler, timeout);
-        } catch (TransportFailure&) {
-            reconnect();
-        }
-    }
-}
-
 bool SessionImpl::nextReceiver(qpid::messaging::Receiver& receiver, qpid::sys::Duration timeout)
 {
     qpid::sys::Mutex::ScopedLock l(lock);
@@ -418,13 +365,6 @@
     session.messageReject(set);
 }
 
-qpid::messaging::Message SessionImpl::fetch(qpid::sys::Duration timeout) 
-{
-    qpid::messaging::Message result;
-    if (!fetch(result, timeout)) throw Receiver::NoMessageAvailable();
-    return result;
-}
-
 void SessionImpl::receiverCancelled(const std::string& name)
 {
     receivers.erase(name);
@@ -442,14 +382,4 @@
     connection.reconnect();    
 }
 
-void* SessionImpl::getLastConfirmedSent()
-{
-    return 0;
-}
-
-void* SessionImpl::getLastConfirmedAcknowledged()
-{
-    return 0;
-}
-
 }}} // namespace qpid::client::amqp0_10

Modified: qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.h?rev=880718&r1=880717&r2=880718&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.h Mon Nov 16 11:58:45 2009
@@ -62,21 +62,12 @@
     void close();
     void sync();
     void flush();
-    qpid::messaging::Address createTempQueue(const std::string& baseName);
     qpid::messaging::Sender createSender(const qpid::messaging::Address& address);
     qpid::messaging::Receiver createReceiver(const qpid::messaging::Address& address);
 
-    void* getLastConfirmedSent();
-    void* getLastConfirmedAcknowledged();
-
-    bool fetch(qpid::messaging::Message& message, qpid::sys::Duration timeout);
-    qpid::messaging::Message fetch(qpid::sys::Duration timeout);
-    bool dispatch(qpid::sys::Duration timeout);
-
     bool nextReceiver(qpid::messaging::Receiver& receiver, qpid::sys::Duration timeout);
     qpid::messaging::Receiver nextReceiver(qpid::sys::Duration timeout);
 
-
     bool get(ReceiverImpl& receiver, qpid::messaging::Message& message, qpid::sys::Duration timeout);    
 
     void receiverCancelled(const std::string& name);
@@ -116,8 +107,7 @@
     Receivers receivers;
     Senders senders;
 
-    bool acceptAny(qpid::messaging::Message*, bool, IncomingMessages::MessageTransfer&);
-    bool accept(ReceiverImpl*, qpid::messaging::Message*, bool, IncomingMessages::MessageTransfer&);
+    bool accept(ReceiverImpl*, qpid::messaging::Message*, IncomingMessages::MessageTransfer&);
     bool getIncoming(IncomingMessages::Handler& handler, qpid::sys::Duration timeout);
     bool getNextReceiver(qpid::messaging::Receiver* receiver, IncomingMessages::MessageTransfer& transfer);
     void reconnect();

Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/Receiver.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/Receiver.cpp?rev=880718&r1=880717&r2=880718&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/Receiver.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/Receiver.cpp Mon Nov 16 11:58:45 2009
@@ -49,6 +49,5 @@
 uint32_t Receiver::available() { return impl->available(); }
 uint32_t Receiver::pendingAck() { return impl->pendingAck(); }
 void Receiver::cancel() { impl->cancel(); }
-void Receiver::setListener(MessageListener* listener) { impl->setListener(listener); }
 
 }} // namespace qpid::messaging

Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/ReceiverImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/ReceiverImpl.h?rev=880718&r1=880717&r2=880718&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/ReceiverImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/ReceiverImpl.h Mon Nov 16 11:58:45 2009
@@ -48,7 +48,6 @@
     virtual uint32_t available() = 0;
     virtual uint32_t pendingAck() = 0;
     virtual void cancel() = 0;
-    virtual void setListener(MessageListener*) = 0;
 };
 }} // namespace qpid::messaging
 

Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/Session.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/Session.cpp?rev=880718&r1=880717&r2=880718&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/Session.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/Session.cpp Mon Nov 16 11:58:45 2009
@@ -75,21 +75,6 @@
     impl->flush();
 }
 
-bool Session::fetch(Message& message, qpid::sys::Duration timeout)
-{
-    return impl->fetch(message, timeout);
-}
-
-Message Session::fetch(qpid::sys::Duration timeout)
-{
-    return impl->fetch(timeout);
-}
-
-bool Session::dispatch(qpid::sys::Duration timeout)
-{
-    return impl->dispatch(timeout);
-}
-
 bool Session::nextReceiver(Receiver& receiver, qpid::sys::Duration timeout)
 {
     return impl->nextReceiver(receiver, timeout);

Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/SessionImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/SessionImpl.h?rev=880718&r1=880717&r2=880718&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/SessionImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/SessionImpl.h Mon Nov 16 11:58:45 2009
@@ -48,9 +48,6 @@
     virtual void close() = 0;
     virtual void sync() = 0;
     virtual void flush() = 0;
-    virtual bool fetch(Message& message, qpid::sys::Duration timeout) = 0;
-    virtual Message fetch(qpid::sys::Duration timeout) = 0;
-    virtual bool dispatch(qpid::sys::Duration timeout) = 0;
     virtual Sender createSender(const Address& address) = 0;
     virtual Receiver createReceiver(const Address& address) = 0;
     virtual bool nextReceiver(Receiver& receiver, qpid::sys::Duration timeout) = 0;

Modified: qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp?rev=880718&r1=880717&r2=880718&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp Mon Nov 16 11:58:45 2009
@@ -28,7 +28,6 @@
 #include "qpid/messaging/MapContent.h"
 #include "qpid/messaging/MapView.h"
 #include "qpid/messaging/Message.h"
-#include "qpid/messaging/MessageListener.h"
 #include "qpid/messaging/Receiver.h"
 #include "qpid/messaging/Sender.h"
 #include "qpid/messaging/Session.h"
@@ -187,16 +186,6 @@
     }
 
 };
-
-struct MessageDataCollector : MessageListener
-{
-    std::vector<std::string> messageData;
-
-    void received(Message& message) {
-        messageData.push_back(message.getContent());
-    }
-};
-
 std::vector<std::string> fetch(Receiver& receiver, int count, qpid::sys::Duration timeout=qpid::sys::TIME_SEC*5)
 {
     std::vector<std::string> data;
@@ -308,52 +297,6 @@
     //TODO: check pending messages...
 }
 
-QPID_AUTO_TEST_CASE(testSessionFetch)
-{
-    MultiQueueFixture fix;
-
-    for (uint i = 0; i < fix.queues.size(); i++) {
-        Receiver r = fix.session.createReceiver(fix.queues[i]);
-        r.setCapacity(10u);
-        r.start();//TODO: add Session::start
-    }
-
-    for (uint i = 0; i < fix.queues.size(); i++) {
-        Sender s = fix.session.createSender(fix.queues[i]);
-        Message msg((boost::format("Message_%1%") % (i+1)).str());
-        s.send(msg);
-    }
-
-    for (uint i = 0; i < fix.queues.size(); i++) {
-        Message msg;
-        BOOST_CHECK(fix.session.fetch(msg, qpid::sys::TIME_SEC));
-        BOOST_CHECK_EQUAL(msg.getContent(), (boost::format("Message_%1%") % (i+1)).str());
-    }
-}
-
-QPID_AUTO_TEST_CASE(testSessionDispatch)
-{
-    MultiQueueFixture fix;
-
-    MessageDataCollector collector;
-    for (uint i = 0; i < fix.queues.size(); i++) {
-        Receiver r = fix.session.createReceiver(fix.queues[i]);
-        r.setListener(&collector);
-        r.setCapacity(10u);
-        r.start();//TODO: add Session::start
-    }
-
-    for (uint i = 0; i < fix.queues.size(); i++) {
-        Sender s = fix.session.createSender(fix.queues[i]);
-        Message msg((boost::format("Message_%1%") % (i+1)).str());
-        s.send(msg);
-    }
-
-    while (fix.session.dispatch(qpid::sys::TIME_SEC)) ;
-
-    BOOST_CHECK_EQUAL(collector.messageData, boost::assign::list_of<std::string>("Message_1")("Message_2")("Message_3"));
-}
-
 QPID_AUTO_TEST_CASE(testNextReceiver)
 {
     MultiQueueFixture fix;



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org