From 248f1fe188fe2307b9dcf2c87a83b653eaa1920c Mon Sep 17 00:00:00 2001
From: "Rafael H. Schloming" <rhs@apache.org>
Date: Sat, 26 Dec 2009 12:42:57 +0000
Subject: synchronized with trunk except for ruby dir

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid.rnr@893970 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/tests/HeaderTest.cpp | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'cpp/src/tests/HeaderTest.cpp')

diff --git a/cpp/src/tests/HeaderTest.cpp b/cpp/src/tests/HeaderTest.cpp
index c3b64419ed..4b16f3c793 100644
--- a/cpp/src/tests/HeaderTest.cpp
+++ b/cpp/src/tests/HeaderTest.cpp
@@ -7,9 +7,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -26,9 +26,12 @@
 using namespace qpid::framing;
 using namespace std;
 
+namespace qpid {
+namespace tests {
+
 QPID_AUTO_TEST_SUITE(HeaderTestSuite)
 
-QPID_AUTO_TEST_CASE(testGenericProperties) 
+QPID_AUTO_TEST_CASE(testGenericProperties)
 {
     AMQHeaderBody body;
     body.get<MessageProperties>(true)->getApplicationHeaders().setString(
@@ -39,7 +42,7 @@ QPID_AUTO_TEST_CASE(testGenericProperties)
 
     Buffer rbuffer(buff, 100);
     AMQHeaderBody body2;
-    body2.decode(rbuffer, body.size());
+    body2.decode(rbuffer, body.encodedSize());
     MessageProperties* props =
         body2.get<MessageProperties>(true);
     BOOST_CHECK_EQUAL(
@@ -47,10 +50,10 @@ QPID_AUTO_TEST_CASE(testGenericProperties)
         props->getApplicationHeaders().get("A")->get<string>());
 }
 
-QPID_AUTO_TEST_CASE(testMessageProperties) 
+QPID_AUTO_TEST_CASE(testMessageProperties)
 {
-    AMQFrame out(in_place<AMQHeaderBody>());
-    MessageProperties* props1 = 
+    AMQFrame out((AMQHeaderBody()));
+    MessageProperties* props1 =
         out.castBody<AMQHeaderBody>()->get<MessageProperties>(true);
 
     props1->setContentLength(42);
@@ -82,10 +85,10 @@ QPID_AUTO_TEST_CASE(testMessageProperties)
 
 }
 
-QPID_AUTO_TEST_CASE(testDeliveryProperies) 
+QPID_AUTO_TEST_CASE(testDeliveryProperies)
 {
-    AMQFrame out(in_place<AMQHeaderBody>());
-    DeliveryProperties* props1 = 
+    AMQFrame out((AMQHeaderBody()));
+    DeliveryProperties* props1 =
         out.castBody<AMQHeaderBody>()->get<DeliveryProperties>(true);
 
     props1->setDiscardUnroutable(true);
@@ -108,3 +111,4 @@ QPID_AUTO_TEST_CASE(testDeliveryProperies)
 
 QPID_AUTO_TEST_SUITE_END()
 
+}} // namespace qpid::tests
-- 
cgit v1.2.1