1 files changed, 11 insertions, 0 deletions
diff --git a/qpid/cpp/src/tests/Uuid.cpp b/qpid/cpp/src/tests/Uuid.cpp
index 97e7518c85..43d1cbcbba 100644
--- a/qpid/cpp/src/tests/Uuid.cpp
+++ b/qpid/cpp/src/tests/Uuid.cpp
@@ -17,6 +17,7 @@
  */
 
 #include "qpid/framing/Uuid.h"
+#include "qpid/framing/Buffer.h"
 
 #define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
@@ -58,3 +59,13 @@ BOOST_AUTO_TEST_CASE(testUuidOstream) {
     BOOST_CHECK(out.good());
     BOOST_CHECK_EQUAL(out.str(), sampleStr);
 }
+
+BOOST_AUTO_TEST_CASE(testUuidEncodeDecode) {
+    Buffer buf(Uuid::size());
+    Uuid uuid;
+    uuid.encode(buf);
+    buf.flip();
+    Uuid decoded;
+    decoded.decode(buf);
+    BOOST_CHECK(uuid==decoded);
+}