summaryrefslogtreecommitdiff
path: root/cpp/src/tests
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/tests')
-rw-r--r--cpp/src/tests/QueueTest.cpp2
-rw-r--r--cpp/src/tests/TopicExchangeTest.cpp16
-rw-r--r--cpp/src/tests/logging.cpp28
-rw-r--r--cpp/src/tests/test_tools.h2
-rw-r--r--cpp/src/tests/unit_test.h1
5 files changed, 23 insertions, 26 deletions
diff --git a/cpp/src/tests/QueueTest.cpp b/cpp/src/tests/QueueTest.cpp
index b1c42f3bcb..70132bce76 100644
--- a/cpp/src/tests/QueueTest.cpp
+++ b/cpp/src/tests/QueueTest.cpp
@@ -36,7 +36,7 @@ using namespace qpid::sys;
class TestConsumer : public virtual Consumer{
public:
- typedef shared_ptr<TestConsumer> shared_ptr;
+ typedef boost::shared_ptr<TestConsumer> shared_ptr;
intrusive_ptr<Message> last;
bool received;
diff --git a/cpp/src/tests/TopicExchangeTest.cpp b/cpp/src/tests/TopicExchangeTest.cpp
index 9e320b76f9..adb937179f 100644
--- a/cpp/src/tests/TopicExchangeTest.cpp
+++ b/cpp/src/tests/TopicExchangeTest.cpp
@@ -21,7 +21,7 @@
using namespace qpid::broker;
-Tokens makeTokens(char** begin, char** end)
+Tokens makeTokens(const char** begin, const char** end)
{
Tokens t;
t.insert(t.end(), begin, end);
@@ -57,34 +57,34 @@ class TokensTest : public CppUnit::TestCase
void testTokens()
{
Tokens tokens("hello.world");
- char* expect[] = {"hello", "world"};
+ const char* expect[] = {"hello", "world"};
CPPUNIT_ASSERT_EQUAL(TOKENS(expect), tokens);
tokens = "a.b.c";
- char* expect2[] = { "a", "b", "c" };
+ const char* expect2[] = { "a", "b", "c" };
CPPUNIT_ASSERT_EQUAL(TOKENS(expect2), tokens);
tokens = "";
CPPUNIT_ASSERT(tokens.empty());
tokens = "x";
- char* expect3[] = { "x" };
+ const char* expect3[] = { "x" };
CPPUNIT_ASSERT_EQUAL(TOKENS(expect3), tokens);
tokens = (".x");
- char* expect4[] = { "", "x" };
+ const char* expect4[] = { "", "x" };
CPPUNIT_ASSERT_EQUAL(TOKENS(expect4), tokens);
tokens = ("x.");
- char* expect5[] = { "x", "" };
+ const char* expect5[] = { "x", "" };
CPPUNIT_ASSERT_EQUAL(TOKENS(expect5), tokens);
tokens = (".");
- char* expect6[] = { "", "" };
+ const char* expect6[] = { "", "" };
CPPUNIT_ASSERT_EQUAL(TOKENS(expect6), tokens);
tokens = ("..");
- char* expect7[] = { "", "", "" };
+ const char* expect7[] = { "", "", "" };
CPPUNIT_ASSERT_EQUAL(TOKENS(expect7), tokens);
}
diff --git a/cpp/src/tests/logging.cpp b/cpp/src/tests/logging.cpp
index 2c0ed08105..201c935319 100644
--- a/cpp/src/tests/logging.cpp
+++ b/cpp/src/tests/logging.cpp
@@ -155,12 +155,6 @@ BOOST_AUTO_TEST_CASE(testLoggerFormat) {
l.select(Selector(critical));
TestOutput* out=new TestOutput(l);
- // Time format is YYY-Month-dd hh:mm:ss
- l.format(Logger::TIME);
- QPID_LOG(critical, "foo");
- string re("\\d\\d\\d\\d-[A-Z][a-z]+-\\d\\d \\d\\d:\\d\\d:\\d\\d foo\n");
- BOOST_CHECK_REGEX(re, out->last());
-
l.format(Logger::FILE);
QPID_LOG(critical, "foo");
BOOST_CHECK_EQUAL(out->last(), string(__FILE__)+": foo\n");
@@ -178,7 +172,7 @@ BOOST_AUTO_TEST_CASE(testLoggerFormat) {
l.format(~0); // Everything
QPID_LOG(critical, "foo");
- re=".* critical \\[[0-9a-f]*] "+string(__FILE__)+":\\d+:void .*testLoggerFormat.*\\(\\): foo\n";
+ string re=".* critical \\[[0-9a-f]*] "+string(__FILE__)+":\\d+:void .*testLoggerFormat.*\\(\\): foo\n";
BOOST_CHECK_REGEX(re, out->last());
}
@@ -259,7 +253,7 @@ Statement statement(
#define ARGC(argv) (sizeof(argv)/sizeof(char*))
BOOST_AUTO_TEST_CASE(testOptionsParse) {
- char* argv[]={
+ const char* argv[]={
0,
"--log-enable", "error+:foo",
"--log-enable", "debug:bar",
@@ -272,7 +266,7 @@ BOOST_AUTO_TEST_CASE(testOptionsParse) {
"--log-function", "YES"
};
qpid::log::Options opts;
- opts.parse(ARGC(argv), argv);
+ opts.parse(ARGC(argv), const_cast<char**>(argv));
vector<string> expect=list_of("error+:foo")("debug:bar")("info");
BOOST_CHECK_EQUAL(expect, opts.selectors);
expect=list_of("x")("y");
@@ -294,14 +288,14 @@ BOOST_AUTO_TEST_CASE(testOptionsDefault) {
}
BOOST_AUTO_TEST_CASE(testSelectorFromOptions) {
- char* argv[]={
+ const char* argv[]={
0,
"--log-enable", "error+:foo",
"--log-enable", "debug:bar",
"--log-enable", "info"
};
qpid::log::Options opts;
- opts.parse(ARGC(argv), argv);
+ opts.parse(ARGC(argv), const_cast<char**>(argv));
vector<string> expect=list_of("error+:foo")("debug:bar")("info");
BOOST_CHECK_EQUAL(expect, opts.selectors);
Selector s(opts);
@@ -317,27 +311,27 @@ BOOST_AUTO_TEST_CASE(testOptionsFormat) {
{
Options opts;
BOOST_CHECK_EQUAL(Logger::TIME|Logger::LEVEL, l.format(opts));
- char* argv[]={
+ const char* argv[]={
0,
"--log-time", "no",
"--log-level", "no",
"--log-source", "1",
"--log-thread", "1"
};
- opts.parse(ARGC(argv), argv);
+ opts.parse(ARGC(argv), const_cast<char**>(argv));
BOOST_CHECK_EQUAL(
Logger::FILE|Logger::LINE|Logger::THREAD, l.format(opts));
}
{
Options opts; // Clear.
- char* argv[]={
+ const char* argv[]={
0,
"--log-level", "no",
"--log-thread", "true",
"--log-function", "YES",
"--log-time", "YES"
};
- opts.parse(ARGC(argv), argv);
+ opts.parse(ARGC(argv), const_cast<char**>(argv));
BOOST_CHECK_EQUAL(
Logger::THREAD|Logger::FUNCTION|Logger::TIME,
l.format(opts));
@@ -348,14 +342,14 @@ BOOST_AUTO_TEST_CASE(testLoggerConfigure) {
Logger& l=Logger::instance();
l.clear();
Options opts;
- char* argv[]={
+ const char* argv[]={
0,
"--log-time", "no",
"--log-source", "yes",
"--log-output", "logging.tmp",
"--log-enable", "critical"
};
- opts.parse(ARGC(argv), argv);
+ opts.parse(ARGC(argv), const_cast<char**>(argv));
l.configure(opts, "test");
QPID_LOG(critical, "foo"); int srcline=__LINE__;
ifstream log("logging.tmp");
diff --git a/cpp/src/tests/test_tools.h b/cpp/src/tests/test_tools.h
index 2de4b6fbc1..c5451643be 100644
--- a/cpp/src/tests/test_tools.h
+++ b/cpp/src/tests/test_tools.h
@@ -19,6 +19,8 @@
*
*/
+#include <limits.h> // Include before boost/test headers.
+
#include <boost/test/test_tools.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/regex.hpp>
diff --git a/cpp/src/tests/unit_test.h b/cpp/src/tests/unit_test.h
index 106d640d25..58ec20d26c 100644
--- a/cpp/src/tests/unit_test.h
+++ b/cpp/src/tests/unit_test.h
@@ -26,6 +26,7 @@
// Remove when we no longer need to support 1.33.
//
#include <boost/version.hpp>
+#include <limits.h> // Must be inclued beofre boost/test headers.
#if (BOOST_VERSION < 103400)
View Lorry Controller Status