From 93a87010ba58b42e2fe153504b4781978d128a6c Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 7 Dec 2007 19:13:09 +0000 Subject: Summary: - Replaced InProcessBroker with BrokerFixture, uses a full loopback broker for more realistic tests. - Extracted non-generated parts of Session_0_10 into SessionBase. - Sundry small fixes. src/tests/BrokerFixture.h - in process broker with loopback connections. - tests can force a disorderly disconnect. src/qpid/client/Connector.h - back door to private members for BrokerFixture. - close() in destructor to avoid leaks. src/qpid/client/ConnectionImpl.h,cpp: - close() in destructor, to fix hang when destroyed without being closed. src/qpid/client/CompletionTracker.h,.cpp: - Fixed race in close/add. src/qpid/client/SessionBase.h,cpp: - Extracted all non-generated code from Session_0_10 into SessionBase - Added sync() src/tests/exception_test.cpp: Converted to boost & BrokerFixture src/tests/ClientChannelTest.cpp, ClientSessionTest.cpp: Use BrokerFixture git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@602182 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/ClientChannelTest.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'qpid/cpp/src/tests/ClientChannelTest.cpp') diff --git a/qpid/cpp/src/tests/ClientChannelTest.cpp b/qpid/cpp/src/tests/ClientChannelTest.cpp index 454b9ca56d..bd8f5af6be 100644 --- a/qpid/cpp/src/tests/ClientChannelTest.cpp +++ b/qpid/cpp/src/tests/ClientChannelTest.cpp @@ -20,7 +20,7 @@ */ #include #include "qpid_test_plugin.h" -#include "InProcessBroker.h" +#include "BrokerFixture.h" #include "qpid/client/Channel.h" #include "qpid/client/Message.h" #include "qpid/client/Queue.h" @@ -44,7 +44,7 @@ const size_t FRAME_MAX = 256; * The test base defines the tests methods, derived classes * instantiate the channel in Basic or Message mode. */ -class ChannelTestBase : public CppUnit::TestCase +class ChannelTestBase : public CppUnit::TestCase, public BrokerFixture { struct Listener: public qpid::client::MessageListener { vector messages; @@ -56,7 +56,6 @@ class ChannelTestBase : public CppUnit::TestCase } }; - qpid::InProcessBrokerClient connection; const std::string qname; const std::string data; Queue queue; @@ -69,8 +68,7 @@ class ChannelTestBase : public CppUnit::TestCase public: ChannelTestBase() - : connection(FRAME_MAX), - qname("testq"), data("hello"), + : qname("testq"), data("hello"), queue(qname, true), exchange("", Exchange::DIRECT_EXCHANGE) {} -- cgit v1.2.1