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/qpid@1664479 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 3 deletions

diff --git a/cpp/src/tests/Variant.cpp b/cpp/src/tests/Variant.cpp
index d6605f9fe5..5ae7fc89eb 100644
--- a/cpp/src/tests/Variant.cpp
+++ b/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());
 }