Template visitors for amqp_0_10::Command, Control and Struct.

Serialization for all str/vbin types.


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

3 files changed, 105 insertions, 19 deletions

diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index 4a47797350..d25378a519 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -39,7 +39,7 @@ unit_test_SOURCES= unit_test.cpp unit_test.h \
 	ISList.cpp IList.cpp \
 	ClientSessionTest.cpp \
 	serialize.cpp \
-	ProxyTemplate.cpp
+	ProxyTemplate.cpp apply.cpp
 # FIXME aconway 2008-02-20: removed RefCountedMap.cpp  due to valgrind error.
 
 check_LTLIBRARIES += libshlibtest.la
diff --git a/cpp/src/tests/apply.cpp b/cpp/src/tests/apply.cpp
new file mode 100644
index 0000000000..553026a35c
--- /dev/null
+++ b/cpp/src/tests/apply.cpp
@@ -0,0 +1,92 @@
+/*
+ *
+ * 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 "unit_test.h"
+#include "qpid/amqp_0_10/specification.h"
+#include "qpid/amqp_0_10/ApplyControl.h"
+
+QPID_AUTO_TEST_SUITE(VisitorTestSuite)
+
+using  namespace qpid::amqp_0_10;
+
+struct GetCode {
+    typedef uint8_t result_type;
+    template <class T> uint8_t operator()(const T&) const { return T::CODE; }
+};
+
+struct TestFunctor {
+    typedef bool result_type;
+    bool operator()(const connection::Tune& tune) {
+        BOOST_CHECK_EQUAL(tune.channelMax, 1u);
+        BOOST_CHECK_EQUAL(tune.maxFrameSize, 2u);
+        BOOST_CHECK_EQUAL(tune.heartbeatMin, 3u);
+        BOOST_CHECK_EQUAL(tune.heartbeatMax, 4u);
+        return true;
+    }
+    template <class T>
+    bool operator()(const T&) { return false; }
+};
+
+BOOST_AUTO_TEST_CASE(testApply) {
+    connection::Tune tune(1,2,3,4);
+    Control* p = &tune;
+
+    // boost oddity - without the cast we get undefined symbol errors.
+    BOOST_CHECK_EQUAL(apply(GetCode(), *p), (uint8_t)connection::Tune::CODE); 
+    
+    TestFunctor tf; 
+    BOOST_CHECK(apply(tf, *p));
+
+    connection::Start start;
+    p = &start;
+    BOOST_CHECK(!apply(tf, *p));
+}
+
+struct VoidTestFunctor {
+    typedef void result_type;
+
+    int code;
+    VoidTestFunctor() : code() {}
+    
+    void operator()(const connection::Tune& tune) {
+        BOOST_CHECK_EQUAL(tune.channelMax, 1u);
+        BOOST_CHECK_EQUAL(tune.maxFrameSize, 2u);
+        BOOST_CHECK_EQUAL(tune.heartbeatMin, 3u);
+        BOOST_CHECK_EQUAL(tune.heartbeatMax, 4u);
+        code=connection::Tune::CODE;        
+    }
+    template <class T>
+    void operator()(const T&) { code=0xFF; }
+};
+
+BOOST_AUTO_TEST_CASE(testApplyVoid) {
+    connection::Tune tune(1,2,3,4);
+    Control* p = &tune;
+    VoidTestFunctor tf;
+    apply(tf, *p);
+    BOOST_CHECK_EQUAL(uint8_t(connection::Tune::CODE), tf.code);
+
+    connection::Start start;
+    p = &start;
+    apply(tf, *p);
+    BOOST_CHECK_EQUAL(0xFF, tf.code);
+}
+
+QPID_AUTO_TEST_SUITE_END()
diff --git a/cpp/src/tests/serialize.cpp b/cpp/src/tests/serialize.cpp
index a120be6458..8de2d4ca58 100644
--- a/cpp/src/tests/serialize.cpp
+++ b/cpp/src/tests/serialize.cpp
@@ -31,7 +31,7 @@
 #include <boost/mpl/empty_sequence.hpp>
 #include <iterator>
 #include <string>
-#include <ostream>
+#include <iostream>
 #include <netinet/in.h>
 
 // Missing operators needed for tests.
@@ -52,15 +52,6 @@ std::ostream& operator<<(std::ostream& out, const AbsTime& t) {
 }
 }
 
-namespace amqp_0_10 {
-template <class T, class SizeType>
-std::ostream& operator<<(std::ostream& out, const CodableString<T,SizeType>& str) {
-    std::ostream_iterator<T> o(out, " ");
-    std::copy(str.begin(), str.end(), o);
-    return out;
-}
-}
-
 } // qpid
 
 
@@ -90,34 +81,37 @@ typedef concat2<FixedSizeTypes, VariableSizeTypes>::type AllTypes;
 BOOST_AUTO_TEST_CASE(testNetworkByteOrder) {
     string data;
 
-    uint32_t l = 1234567890;
+    uint32_t l = 0x11223344;
     Codec::encode(std::back_inserter(data), l);
     uint32_t enc=reinterpret_cast<const uint32_t&>(*data.data());
     uint32_t l2 = ntohl(enc);
     BOOST_CHECK_EQUAL(l, l2);
 
     data.clear();
-    uint16_t s = 12345;
+    uint16_t s = 0x1122;
     Codec::encode(std::back_inserter(data), s);
     uint32_t s2 = ntohs(*reinterpret_cast<const uint32_t*>(data.data()));
     BOOST_CHECK_EQUAL(s, s2);
 }
 
+// Assign test values to the various types.
 void testValue(bool& b) { b = true; }
 template <class T> typename boost::enable_if<boost::is_arithmetic<T> >::type testValue(T& n) { n=42; }
-void testValue(long long& l) { l = 12345; }
+void testValue(long long& l) { l = 0x012345; }
 void testValue(Datetime& dt) { dt = qpid::sys::now(); }
 void testValue(Uuid& uuid) { uuid=Uuid(true); }
-template <class E, class M> void testValue(Decimal<E,M>& d) { d.exponent=2; d.mantissa=1234; }
+template <class E, class M> void testValue(Decimal<E,M>& d) { d.exponent=2; d.mantissa=0x1122; }
 void testValue(SequenceNo& s) { s = 42; }
-template <class T, size_t N> void testValue(boost::array<T,N>& a) { a.assign(42); }
-template <class T, class SizeType> void testValue(CodableString<T, SizeType>& s) {
+template <size_t N> void testValue(Bin<N>& a) { a.assign(42); }
+template <class T, class S> void testValue(SerializableString<T, S>& s) {
     char msg[]="foobar";
     s.assign(msg, msg+sizeof(msg));
 }
+void testValue(Str16& s) { s = "the quick brown fox jumped over the lazy dog"; }
+void testValue(Str8& s) { s = "foobar"; }
 
-// FIXME aconway 2008-02-20: test AllTypes
-BOOST_AUTO_TEST_CASE_TEMPLATE(testEncodeDecode, T, FixedSizeTypes)
+//typedef mpl::vector<Str8, Str16>::type TestTypes;
+BOOST_AUTO_TEST_CASE_TEMPLATE(testEncodeDecode, T, AllTypes)
 {
     string data;
     T t;