From 04f90cff6570c8f035eaa2a86fa31ebd1caf3f0f Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 15 Apr 2008 18:23:55 +0000 Subject: Correct Struct32 encoding: size/code/data. Proper re-encoding for unknown struct codes. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@648362 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/amqp_0_10/serialize.cpp | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'cpp/src/tests') diff --git a/cpp/src/tests/amqp_0_10/serialize.cpp b/cpp/src/tests/amqp_0_10/serialize.cpp index f533590622..1c569e4ae8 100644 --- a/cpp/src/tests/amqp_0_10/serialize.cpp +++ b/cpp/src/tests/amqp_0_10/serialize.cpp @@ -221,10 +221,10 @@ BOOST_AUTO_TEST_CASE(testStruct32) { string data; Codec::encode(back_inserter(data))(s); -// uint32_t structSize; // Starts with size -// Codec::decode(data.begin())(structSize); -// BOOST_CHECK_EQUAL(structSize, Codec::size(dp) + 4); // code+pack -// BOOST_CHECK_EQUAL(structSize, data.size()-4); + uint32_t structSize; // Starts with size + Codec::decode(data.begin())(structSize); + BOOST_CHECK_EQUAL(structSize, Codec::size(dp) + 2); // +2 for code + BOOST_CHECK_EQUAL(structSize, data.size()-4); // encoded body BOOST_CHECK_EQUAL(data.size(), Codec::size(s)); Struct32 s2; @@ -233,15 +233,19 @@ BOOST_AUTO_TEST_CASE(testStruct32) { BOOST_REQUIRE(dp2); BOOST_CHECK_EQUAL(dp2->priority, message::MEDIUM); BOOST_CHECK_EQUAL(dp2->routingKey, "foo"); +} +BOOST_AUTO_TEST_CASE(testStruct32Unknown) { // Verify we can recode an unknown struct unchanged. -// data.clear(); -// Codec::encode(back_inserter(data))(uint32_t(10)); -// data.append(10, 'X'); -// Codec::decode(data.begin())(s2); -// string data2; -// Codec::decode(back_inserter(data2)); - // BOOST_CHECK_EQUAL(data, data2); + Struct32 s; + string data; + Codec::encode(back_inserter(data))(uint32_t(10)); + data.append(10, 'X'); + Codec::decode(data.begin())(s); + string data2; + Codec::encode(back_inserter(data2))(s); + BOOST_CHECK_EQUAL(data.size(), data2.size()); + BOOST_CHECK_EQUAL(data, data2); } struct DummyPacked { -- cgit v1.2.1