1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/src/tests/MessageTest.cpp b/cpp/src/tests/MessageTest.cpp
index 775d251349..f56d5e829e 100644
--- a/cpp/src/tests/MessageTest.cpp
+++ b/cpp/src/tests/MessageTest.cpp
@@ -19,12 +19,15 @@
  *
  */
 #include "qpid/broker/Message.h"
-#include "qpid_test_plugin.h"
-#include <iostream>
 #include "qpid/framing/AMQP_HighestVersion.h"
 #include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/FieldValue.h"
 #include "MockChannel.h"
 
+#include "qpid_test_plugin.h"
+
+#include <iostream>
+
 using namespace boost;
 using namespace qpid::broker;
 using namespace qpid::framing;
@@ -81,7 +84,7 @@ class MessageTest : public CppUnit::TestCase
         CPPUNIT_ASSERT_EQUAL((uint64_t) data1.size() + data2.size(), msg->contentSize());
         CPPUNIT_ASSERT_EQUAL((uint64_t) data1.size() + data2.size(), msg->getProperties<MessageProperties>()->getContentLength());
         CPPUNIT_ASSERT_EQUAL(messageId, msg->getProperties<MessageProperties>()->getMessageId());
-        CPPUNIT_ASSERT_EQUAL(string("xyz"), msg->getProperties<MessageProperties>()->getApplicationHeaders().getString("abc"));
+        CPPUNIT_ASSERT(StringValue("xyz") == *msg->getProperties<MessageProperties>()->getApplicationHeaders().get("abc"));
         CPPUNIT_ASSERT_EQUAL((uint8_t) PERSISTENT, msg->getProperties<DeliveryProperties>()->getDeliveryMode());
         CPPUNIT_ASSERT(msg->isPersistent());
     }