From d7c68d138a1151db2b0d133c94f8b1843850e867 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Wed, 27 Jun 2007 15:29:17 +0000 Subject: Fixes and tests: * ExchangeRegistry::get() caused a pair to be inserted with a 'null' pointer if the xchange didn't exist * HeadersExchange::isBound() didn't check queue param git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@551197 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/ExchangeTest.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'cpp/src/tests/ExchangeTest.cpp') diff --git a/cpp/src/tests/ExchangeTest.cpp b/cpp/src/tests/ExchangeTest.cpp index 0033aa7529..595b025e86 100644 --- a/cpp/src/tests/ExchangeTest.cpp +++ b/cpp/src/tests/ExchangeTest.cpp @@ -19,10 +19,12 @@ * */ +#include "qpid/Exception.h" #include "qpid/broker/BrokerExchange.h" #include "qpid/broker/BrokerQueue.h" #include "qpid/broker/DeliverableMessage.h" #include "qpid/broker/DirectExchange.h" +#include "qpid/broker/ExchangeRegistry.h" #include "qpid/broker/FanOutExchange.h" #include "qpid/broker/HeadersExchange.h" #include "qpid/broker/TopicExchange.h" @@ -33,12 +35,14 @@ using namespace qpid::broker; using namespace qpid::framing; using namespace qpid::sys; +using namespace qpid; class ExchangeTest : public CppUnit::TestCase { CPPUNIT_TEST_SUITE(ExchangeTest); CPPUNIT_TEST(testMe); CPPUNIT_TEST(testIsBound); + CPPUNIT_TEST(testDeleteGetAndRedeclare); CPPUNIT_TEST_SUITE_END(); public: @@ -158,6 +162,18 @@ class ExchangeTest : public CppUnit::TestCase CPPUNIT_ASSERT(!headers.isBound(d, 0, &args2)); CPPUNIT_ASSERT(!headers.isBound(d, 0, &args3)); } + + void testDeleteGetAndRedeclare() { + ExchangeRegistry exchanges; + exchanges.declare("my-exchange", "direct", false, FieldTable()); + exchanges.destroy("my-exchange"); + try { + exchanges.get("my-exchange"); + } catch (const ChannelException&) {} + std::pair response = exchanges.declare("my-exchange", "direct", false, FieldTable()); + CPPUNIT_ASSERT_EQUAL(string("direct"), response.first->getType()); + + } }; // Make this test suite a plugin. -- cgit v1.2.1