* AMQRequestBody.cpp: encode/decode bug - added missing reserved 4 byte word.

* BrokerSingleton: allow broker to run in-process.
* RequestResponseTest: skeleton test for request-response round-trip.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@498646 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 63 insertions, 1 deletions

diff --git a/cpp/tests/Makefile.am b/cpp/tests/Makefile.am
index 8fb0350d2b..b1bbe70ae7 100644
--- a/cpp/tests/Makefile.am
+++ b/cpp/tests/Makefile.am
@@ -41,6 +41,10 @@ broker_tests =		\
   ValueTest		\
   MessageHandlerTest 
 
+# Tests that use the in-process BrokerSingleton to test client-broker
+# interaction. Not strictly unit tests.
+round_trip_tests =		#  TODO aconway 2007-01-22: RequestResponseTest
+
 framing_tests =		\
   FieldTableTest	\
   FramingTest		\
@@ -56,7 +60,8 @@ posix_tests =		\
 unit_tests =		\
   $(broker_tests)	\
   $(framing_tests)	\
-  $(misc_tests)
+  $(misc_tests) 	\
+  $(round_trip_tests)
 
 noinst_PROGRAMS = $(client_exe_tests)
 
diff --git a/cpp/tests/RequestResponseTest.cpp b/cpp/tests/RequestResponseTest.cpp
new file mode 100644
index 0000000000..a6e4a4be19
--- /dev/null
+++ b/cpp/tests/RequestResponseTest.cpp
@@ -0,0 +1,57 @@
+/*
+ *
+ * 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_test_plugin.h>
+#include "BrokerSingleton.h"
+
+using namespace qpid::framing;
+using namespace qpid::broker;
+
+/**
+ * Round trip test using in-process broker.
+ * Verify request/response IDs
+ */
+class RequestResponseTest : public CppUnit::TestCase  
+{
+    CPPUNIT_TEST_SUITE(RequestResponseTest);
+    CPPUNIT_TEST(testAsRequester);
+    CPPUNIT_TEST(testAsResponder);
+    CPPUNIT_TEST_SUITE_END();
+
+    BrokerSingleton broker;
+
+  public:
+        
+    void testAsRequester() {
+        CPPUNIT_FAIL("unfinished");
+    }
+    void testAsResponder() {
+        CPPUNIT_FAIL("unfinished");
+    }
+};
+
+
+// Make this test suite a plugin.
+CPPUNIT_PLUGIN_IMPLEMENT();
+CPPUNIT_TEST_SUITE_REGISTRATION(RequestResponseTest);
+
+
+