summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraconway <aconway@unknown>2015-03-05 20:44:49 +0000
committeraconway <aconway@unknown>2015-03-05 20:44:49 +0000
commit7fc4b15721a31af5bf064c8acd1f2c092603292b (patch)
tree9d89aa9f5fce145c233a9169046442ccaae443af
parent4b5a3c5d7ae9f144d15ad8c51503bc66de7b1ecf (diff)
downloadqpid-python-7fc4b15721a31af5bf064c8acd1f2c092603292b.tar.gz
QPID-6427: Fixed unit test build problem on RHEL 5.
RHEL5 compiler choked on some boost template magic, simplified the test. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1664479 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/cpp/src/tests/Variant.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/Variant.cpp b/qpid/cpp/src/tests/Variant.cpp
index d6605f9fe5..5ae7fc89eb 100644
--- a/qpid/cpp/src/tests/Variant.cpp
+++ b/qpid/cpp/src/tests/Variant.cpp
@@ -815,12 +815,16 @@ QPID_AUTO_TEST_CASE(described)
BOOST_CHECK(!a.isDescribed());
a.getDescriptors().push_back("foo");
BOOST_CHECK(a.isDescribed());
- BOOST_CHECK_EQUAL(a.getDescriptors(), list_of<Variant>("foo"));
+ BOOST_CHECK_EQUAL(a.getDescriptors().size(), 1U);
+ BOOST_CHECK_EQUAL(a.getDescriptors().front(), Variant("foo"));
a = 42;
BOOST_CHECK(a.isDescribed());
- BOOST_CHECK_EQUAL(a.getDescriptors(), list_of<Variant>("foo"));
+ BOOST_CHECK_EQUAL(a.getDescriptors().size(), 1U);
+ BOOST_CHECK_EQUAL(a.getDescriptors().front(), Variant("foo"));
a.getDescriptors().push_back(33);
- BOOST_CHECK_EQUAL(a.getDescriptors(), list_of<Variant>("foo")(33));
+ BOOST_CHECK_EQUAL(a.getDescriptors().size(), 2U);
+ BOOST_CHECK_EQUAL(a.getDescriptors().front(), Variant("foo"));
+ BOOST_CHECK_EQUAL(*(++a.getDescriptors().begin()), Variant(33));
a.getDescriptors().clear();
BOOST_CHECK(!a.isDescribed());
}