* Summary: new Frame type to replace AMQFrame. Instead of holding

	  a shared_ptr to a heap-allocated AMQBody subclass, it holds the
	  body in-line in a boost::variant of all the concrete AMQBody
	  subclasses. Actually there are nested variants, the compiler
	  does not cope well with a single variant of 130-some types.

	  Creating, encoding and decoding a local Frame doess 0 heap
	  allocation apart from that done by the concrete
	  AMQBody::encode/decode - e.g. method bodies with std::string
	  fields.  for method bodies

	  All variants contain type boost::blank. This guarantees 0 heap
	  alloocation by the variant and represents the "uninitialized"
	  state. variant.h provides NoBlankVisitor to help write visitors
	  for variants containing blank. 
	
	* src/qpid/framing/MethodHolder.h, .cpp: Holds a variant
	  containing a method body. 

	* src/qpid/framing/Frame.h, .cpp: New Frame holds body in a
	  variant rather than via heap allocation.

	* src/qpid/framing/variant.h: Utilities for using boost::variant.

	* src/qpid/framing/amqp_types.h: Added FrameType typedef.

	* src/qpid/framing/AMQMethodBody.h: Friends with MethodHolder.

	* src/Makefile.am:
	 - Improved ruby generation rule.
	 - Run method_variants template.
	 - Added new source files
	 - Pre-compiled header rule for method_variants.h

	* rubygen/templates/method_variants.rb: Generate variants
	  to hold methods of each class, and MethodVariant to hold all
	  the class variants.

	* rubygen/cppgen.rb: variant, tuple methods.

	* MethodBodyClass.h.tmpl: Added default constructor to method bodies.

	* amqpgen.rb (AmqpRoot::merge): fix bug in merge.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@563683 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 77 insertions, 0 deletions

diff --git a/cpp/src/tests/Frame.cpp b/cpp/src/tests/Frame.cpp
new file mode 100644
index 0000000000..f02564f5da
--- /dev/null
+++ b/cpp/src/tests/Frame.cpp
@@ -0,0 +1,77 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * 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
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+#include "qpid/framing/Frame.h"
+
+#define BOOST_AUTO_TEST_MAIN    // Must come before #include<boost/test/*>
+#include <boost/test/auto_unit_test.hpp>
+#include <boost/lexical_cast.hpp>
+
+using namespace std;
+using namespace qpid::framing;
+using namespace boost;
+
+BOOST_AUTO_TEST_CASE(testContentBody) {
+    Frame f(42, AMQContentBody("foobar"));
+    AMQBody* body=f.getBody();
+    BOOST_CHECK(dynamic_cast<AMQContentBody*>(body));
+    Buffer b(f.size());
+    f.encode(b);
+    b.flip();
+    Frame g;
+    g.decode(b);
+    AMQContentBody* content=dynamic_cast<AMQContentBody*>(g.getBody());
+    BOOST_REQUIRE(content);
+    BOOST_CHECK_EQUAL(content->getData(), "foobar");
+}
+
+BOOST_AUTO_TEST_CASE(testMethodBody) {
+    FieldTable args;
+    args.setString("foo", "bar");
+    Frame f(
+        42, QueueDeclareBody(ProtocolVersion(), 1, "q", "altex",
+                             true, false, true, false, true, args));
+    BOOST_CHECK_EQUAL(f.getChannel(), 42);
+    Buffer b(f.size());
+    f.encode(b);
+    b.flip();
+    Frame g;
+    g.decode(b);
+    BOOST_CHECK_EQUAL(f.getChannel(), g.getChannel());
+    QueueDeclareBody* declare=dynamic_cast<QueueDeclareBody*>(g.getBody());
+    BOOST_REQUIRE(declare);
+    BOOST_CHECK_EQUAL(declare->getAlternateExchange(), "altex");
+    BOOST_CHECK_EQUAL(lexical_cast<string>(*f.getBody()), lexical_cast<string>(*g.getBody()));
+}
+
+BOOST_AUTO_TEST_CASE(testLoop) {
+    // Run in a loop so heap profiler can spot any allocations.
+    Buffer b(1024);
+    for (int i = 0; i < 100; ++i) {
+        Frame ctor(2, AccessRequestOkBody(ProtocolVersion(), 42));
+        Frame assign(3);
+        assign.body = AccessRequestOkBody(ProtocolVersion(), 42);
+        assign.encode(b);
+        b.flip();
+        Frame g;
+        g.decode(b);
+        BOOST_REQUIRE(dynamic_cast<AccessRequestOkBody*>(g.getBody())->getTicket() == 42);
+    }
+}