You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2010/10/21 21:05:02 UTC
svn commit: r1026103 - in /qpid/trunk/qpid/cpp/src/tests:
BrokerClusterCalls.cpp CMakeLists.txt Makefile.am cluster.mk logging.cpp
test_tools.h
Author: aconway
Date: Thu Oct 21 19:05:01 2010
New Revision: 1026103
URL: http://svn.apache.org/viewvc?rev=1026103&view=rev
Log:
Get rid of boost::regex in test code.
It was barely being used and it causes portability problems on older versions of boost.
Modified:
qpid/trunk/qpid/cpp/src/tests/BrokerClusterCalls.cpp
qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
qpid/trunk/qpid/cpp/src/tests/Makefile.am
qpid/trunk/qpid/cpp/src/tests/cluster.mk
qpid/trunk/qpid/cpp/src/tests/logging.cpp
qpid/trunk/qpid/cpp/src/tests/test_tools.h
Modified: qpid/trunk/qpid/cpp/src/tests/BrokerClusterCalls.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/BrokerClusterCalls.cpp?rev=1026103&r1=1026102&r2=1026103&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/BrokerClusterCalls.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/BrokerClusterCalls.cpp Thu Oct 21 19:05:01 2010
@@ -36,14 +36,12 @@
#include "BrokerFixture.h"
#include <boost/assign.hpp>
#include <boost/format.hpp>
-#include <boost/regex.hpp>
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);
Modified: qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt?rev=1026103&r1=1026102&r2=1026103&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/tests/CMakeLists.txt Thu Oct 21 19:05:01 2010
@@ -62,7 +62,6 @@ endif (MSVC)
# Like this to work with cmake 2.4 on Unix
set (qpid_test_boost_libs
- ${Boost_REGEX_LIBRARY}
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
# Macro to make it easier to remember where the tests are built
Modified: qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=1026103&r1=1026102&r2=1026103&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/tests/Makefile.am Thu Oct 21 19:05:01 2010
@@ -66,7 +66,7 @@ tmodule_LTLIBRARIES=
TESTS+=unit_test
check_PROGRAMS+=unit_test
-unit_test_LDADD=-lboost_unit_test_framework -lboost_regex \
+unit_test_LDADD=-lboost_unit_test_framework \
$(lib_messaging) $(lib_broker) $(lib_console) $(lib_qmf2)
unit_test_SOURCES= unit_test.cpp unit_test.h \
Modified: qpid/trunk/qpid/cpp/src/tests/cluster.mk
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/cluster.mk?rev=1026103&r1=1026102&r2=1026103&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/cluster.mk (original)
+++ qpid/trunk/qpid/cpp/src/tests/cluster.mk Thu Oct 21 19:05:01 2010
@@ -77,7 +77,7 @@ cluster_test_SOURCES = \
PartialFailure.cpp \
ClusterFailover.cpp
-cluster_test_LDADD=$(lib_client) $(lib_broker) $(lib_messaging) ../cluster.la -lboost_unit_test_framework -lboost_regex
+cluster_test_LDADD=$(lib_client) $(lib_broker) $(lib_messaging) ../cluster.la -lboost_unit_test_framework
qpidtest_SCRIPTS += run_cluster_tests cluster_tests.py run_long_cluster_tests long_cluster_tests.py testlib.py cluster_tests.fail
Modified: qpid/trunk/qpid/cpp/src/tests/logging.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/logging.cpp?rev=1026103&r1=1026102&r2=1026103&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/logging.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/logging.cpp Thu Oct 21 19:05:01 2010
@@ -172,7 +172,7 @@ QPID_AUTO_TEST_CASE(testLoggerFormat) {
l.format(Logger::FILE|Logger::LINE);
QPID_LOG(critical, "foo");
- BOOST_CHECK_REGEX(string(__FILE__)+":\\d+: foo\n", out->last());
+ BOOST_CHECK_EQUAL(out->last().find(__FILE__), 0u);
l.format(Logger::FUNCTION);
QPID_LOG(critical, "foo");
Modified: qpid/trunk/qpid/cpp/src/tests/test_tools.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/test_tools.h?rev=1026103&r1=1026102&r2=1026103&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/test_tools.h (original)
+++ qpid/trunk/qpid/cpp/src/tests/test_tools.h Thu Oct 21 19:05:01 2010
@@ -23,7 +23,6 @@
#include <limits.h> // Include before boost/test headers.
#include <boost/test/test_tools.hpp>
#include <boost/assign/list_of.hpp>
-#include <boost/regex.hpp>
#include <boost/assign/list_of.hpp>
#include <vector>
#include <set>
@@ -75,21 +74,6 @@ bool operator == (const boost::assign_de
namespace qpid {
namespace tests {
-/** NB: order of parameters is regex first, in line with
- * CHECK(expected, actual) convention.
- */
-inline bool regexPredicate(const std::string& re, const std::string& text) {
- return boost::regex_match(text, boost::regex(re));
-}
-
-/** Check for regular expression match. You must #include <boost/regex.hpp> */
-#if (BOOST_VERSION < 103300)
- #define BOOST_CHECK_REGEX(re, text)
-#else
- #define BOOST_CHECK_REGEX(re, text) \
- BOOST_CHECK_PREDICATE(regexPredicate, (re)(text))
-#endif
-
/** Check if types of two objects (as given by typeinfo::name()) match. */
#define BOOST_CHECK_TYPEID_EQUAL(a,b) BOOST_CHECK_EQUAL(typeid(a).name(),typeid(b).name())
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org