From 847ee577e23fbdd2175709a08a7160e8b2c1f464 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 27 Mar 2007 15:36:39 +0000 Subject: Refactored client::Message to be independent of all Basic class concepts and client::IncomingMessage to handle 0-9 style references and appends. * cpp/lib/client/ClientMessage.cpp: Made independent of Basic class. * cpp/lib/client/IncomingMessage.cpp: Refactored to handle references/appends. * cpp/lib/client/BasicMessageChannel.cpp: Refactored to use new IncomingMessage Thread safety fixes: * cpp/lib/client/ResponseHandler.h: Remove stateful functions. * cpp/lib/client/ClientChannel.cpp: use new ResponseHandler interface. Minor cleanup: * cpp/lib/common/framing/BasicHeaderProperties.cpp: use DeliveryMode enum. * cpp/tests/HeaderTest.cpp: use DeliveryMode enum. * cpp/tests/MessageTest.cpp: use DeliveryMode enum. * cpp/lib/common/shared_ptr.h: #include for convenience. * cpp/lib/common/sys/ThreadSafeQueue.h: Changed "stop" "shutdown" * cpp/lib/common/sys/ProducerConsumer.h: Changed "stop" "shutdown" * cpp/tests/ClientChannelTest.cpp (TestCase): Removed debug couts. * cpp/tests/setup: valgrind --demangle=yes by default. * cpp/tests/topictest: sleep to hack around startup race. * cpp/lib/broker/BrokerQueue.cpp (configure): Fixed memory leak. Removed/updated FIXME comments in: * cpp/lib/broker/BrokerMessage.cpp: * cpp/lib/broker/BrokerMessageBase.h: * cpp/lib/broker/InMemoryContent.cpp: * cpp/lib/common/framing/MethodContext.h: git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@522956 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/tests/ClientChannelTest.cpp | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'cpp/tests/ClientChannelTest.cpp') diff --git a/cpp/tests/ClientChannelTest.cpp b/cpp/tests/ClientChannelTest.cpp index 7f7cfeda89..d041106a23 100644 --- a/cpp/tests/ClientChannelTest.cpp +++ b/cpp/tests/ClientChannelTest.cpp @@ -166,20 +166,13 @@ class ClientChannelTest : public CppUnit::TestCase void testGetFragmentedMessage() { string longStr(FRAME_MAX*2, 'x'); // Longer than max frame size. channel.publish(Message(longStr), exchange, qname); - // FIXME aconway 2007-03-21: Remove couts. - cout << "==== Fragmented publish:" << endl - << connection.conversation << endl; Message getMsg; - cout << "==== Fragmented get:" << endl - << connection.conversation << endl; CPPUNIT_ASSERT(channel.get(getMsg, queue)); } void testConsumeFragmentedMessage() { string xx(FRAME_MAX*2, 'x'); channel.publish(Message(xx), exchange, qname); - cout << "==== Fragmented publish:" << endl - << connection.conversation << endl; channel.start(); string tag; channel.consume(queue, tag, &listener); @@ -190,10 +183,6 @@ class ClientChannelTest : public CppUnit::TestCase while (listener.messages.size() != 2) CPPUNIT_ASSERT(listener.monitor.wait(1*TIME_SEC)); } - // FIXME aconway 2007-03-21: - cout << "==== Fragmented consme 2 messages:" << endl - << connection.conversation << endl; - CPPUNIT_ASSERT_EQUAL(xx, listener.messages[0].getData()); CPPUNIT_ASSERT_EQUAL(yy, listener.messages[1].getData()); } -- cgit v1.2.1