From 9d6db01fc03225403d3e3b00e93b3060ec1c3d1c Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Fri, 1 Dec 2006 13:14:15 +0000 Subject: Fix to test. Throw exception where previously printed warning. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@481235 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/lib/broker/BrokerMessage.cpp | 1 + qpid/cpp/tests/MessageBuilderTest.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'qpid/cpp') diff --git a/qpid/cpp/lib/broker/BrokerMessage.cpp b/qpid/cpp/lib/broker/BrokerMessage.cpp index 7fa1444a9e..50bf319797 100644 --- a/qpid/cpp/lib/broker/BrokerMessage.cpp +++ b/qpid/cpp/lib/broker/BrokerMessage.cpp @@ -140,6 +140,7 @@ void Message::decodeContent(Buffer& buffer, u_int32_t chunkSize) u_int64_t expected = expectedContentSize(); if (expected != buffer.available()) { std::cout << "WARN: Expected " << expectedContentSize() << " bytes, got " << buffer.available() << std::endl; + throw Exception("Cannot decode content, buffer not large enough."); } if (!chunkSize || chunkSize > expected) { diff --git a/qpid/cpp/tests/MessageBuilderTest.cpp b/qpid/cpp/tests/MessageBuilderTest.cpp index d609fb9b75..3f84142461 100644 --- a/qpid/cpp/tests/MessageBuilderTest.cpp +++ b/qpid/cpp/tests/MessageBuilderTest.cpp @@ -62,9 +62,9 @@ class MessageBuilderTest : public CppUnit::TestCase } } - void appendContent(u_int64_t msgId, const string& data) + void appendContent(Message* msg, const string& data) { - if (msgId == 1) { + if (msg) { content->putRawData(data); } else { throw qpid::Exception("Invalid message id!"); -- cgit v1.2.1