From 9be58b7519c45c682c36f8d70d8e9c7e1422a440 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 21 Oct 2010 19:05:01 +0000 Subject: Get rid of boost::regex in test code. It was barely being used and it causes portability problems on older versions of boost. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1026103 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/BrokerClusterCalls.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'cpp/src/tests/BrokerClusterCalls.cpp') diff --git a/cpp/src/tests/BrokerClusterCalls.cpp b/cpp/src/tests/BrokerClusterCalls.cpp index 5cc2991c77..6cdd6fc9bf 100644 --- a/cpp/src/tests/BrokerClusterCalls.cpp +++ b/cpp/src/tests/BrokerClusterCalls.cpp @@ -36,14 +36,12 @@ #include "BrokerFixture.h" #include #include -#include using namespace std; using namespace boost; using namespace boost::assign; using namespace qpid::messaging; using boost::format; -using boost::regex; namespace qpid { namespace tests { @@ -297,10 +295,8 @@ QPID_AUTO_TEST_CASE(testFanout) { sender.send(Message("a")); f.s.sync(); BOOST_CHECK_EQUAL(h.at(i++), "routing(a)"); - char const * str = "enqueue(amq.fanout_r"; - int len = strlen(str); - BOOST_CHECK_EQUAL(0, strncmp(str, h.at(i++).c_str(), len)); - BOOST_CHECK_EQUAL(0, strncmp(str, h.at(i++).c_str(), len)); + BOOST_CHECK_EQUAL(0u, h.at(i++).find("enqueue(amq.fanout_r")); + BOOST_CHECK_EQUAL(0u, h.at(i++).find("enqueue(amq.fanout_r")); BOOST_CHECK(h.at(i-1) != h.at(i-2)); BOOST_CHECK_EQUAL(h.at(i++), "routed(a)"); BOOST_CHECK_EQUAL(h.size(), i); -- cgit v1.2.1