You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2007/01/22 16:20:55 UTC
svn commit: r498646 - in /incubator/qpid/branches/qpid.0-9/cpp:
lib/broker/BrokerSingleton.cpp lib/broker/BrokerSingleton.h
lib/broker/Makefile.am lib/common/framing/AMQRequestBody.cpp
tests/Makefile.am tests/RequestResponseTest.cpp
Author: aconway
Date: Mon Jan 22 07:20:54 2007
New Revision: 498646
URL: http://svn.apache.org/viewvc?view=rev&rev=498646
Log:
* 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.
Added:
incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerSingleton.cpp (with props)
incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerSingleton.h (with props)
incubator/qpid/branches/qpid.0-9/cpp/tests/RequestResponseTest.cpp (with props)
Modified:
incubator/qpid/branches/qpid.0-9/cpp/lib/broker/Makefile.am
incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQRequestBody.cpp
incubator/qpid/branches/qpid.0-9/cpp/tests/Makefile.am
Added: incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerSingleton.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerSingleton.cpp?view=auto&rev=498646
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerSingleton.cpp (added)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerSingleton.cpp Mon Jan 22 07:20:54 2007
@@ -0,0 +1,36 @@
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed 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 "BrokerSingleton.h"
+
+namespace qpid {
+namespace broker {
+
+BrokerSingleton::BrokerSingleton() {
+ if (broker.get() == 0)
+ broker = Broker::create();
+ Broker::shared_ptr::operator=(broker);
+}
+
+BrokerSingleton::~BrokerSingleton() {
+ broker->shutdown();
+}
+
+Broker::shared_ptr BrokerSingleton::broker;
+
+}} // namespace qpid::broker
Propchange: incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerSingleton.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerSingleton.cpp
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerSingleton.h
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerSingleton.h?view=auto&rev=498646
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerSingleton.h (added)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerSingleton.h Mon Jan 22 07:20:54 2007
@@ -0,0 +1,52 @@
+#ifndef _broker_BrokerSingleton_h
+#define _broker_BrokerSingleton_h
+
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed 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 "Broker.h"
+
+namespace qpid {
+namespace broker {
+
+/**
+ * BrokerSingleton is a smart pointer to a process-wide singleton broker
+ * started on an os-chosen port. The broker starts the first time
+ * an instance of BrokerSingleton is created and runs untill the process exits.
+ *
+ * Useful for unit tests that want to share a broker between multiple
+ * tests to reduce overhead of starting/stopping a broker for every test.
+ *
+ * Tests that need a new broker can call Broker::create directly.
+ *
+ * THREAD UNSAFE.
+ */
+class BrokerSingleton : public Broker::shared_ptr
+{
+ public:
+ BrokerSingleton();
+ ~BrokerSingleton();
+ private:
+ static Broker::shared_ptr broker;
+};
+
+}} // namespace qpid::broker
+
+
+
+#endif /*!_broker_BrokerSingleton_h*/
Propchange: incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerSingleton.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/qpid.0-9/cpp/lib/broker/BrokerSingleton.h
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/broker/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/broker/Makefile.am?view=diff&rev=498646&r1=498645&r2=498646
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/broker/Makefile.am (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/broker/Makefile.am Mon Jan 22 07:20:54 2007
@@ -16,6 +16,8 @@
Binding.h \
Broker.cpp \
Broker.h \
+ BrokerSingleton.cpp \
+ BrokerSingleton.h \
BrokerChannel.cpp \
BrokerChannel.h \
BrokerExchange.h \
Modified: incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQRequestBody.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQRequestBody.cpp?view=diff&rev=498646&r1=498645&r2=498646
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQRequestBody.cpp (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/lib/common/framing/AMQRequestBody.cpp Mon Jan 22 07:20:54 2007
@@ -25,11 +25,13 @@
void AMQRequestBody::Data::encode(Buffer& buffer) const {
buffer.putLongLong(requestId);
buffer.putLongLong(responseMark);
+ buffer.putLong(0); // Reserved long in spec.
}
void AMQRequestBody::Data::decode(Buffer& buffer) {
requestId = buffer.getLongLong();
responseMark = buffer.getLongLong();
+ buffer.getLong(); // Ignore reserved long.
}
void AMQRequestBody::encode(Buffer& buffer) const {
Modified: incubator/qpid/branches/qpid.0-9/cpp/tests/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/tests/Makefile.am?view=diff&rev=498646&r1=498645&r2=498646
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/tests/Makefile.am (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/tests/Makefile.am Mon Jan 22 07:20:54 2007
@@ -41,6 +41,10 @@
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 @@
unit_tests = \
$(broker_tests) \
$(framing_tests) \
- $(misc_tests)
+ $(misc_tests) \
+ $(round_trip_tests)
noinst_PROGRAMS = $(client_exe_tests)
Added: incubator/qpid/branches/qpid.0-9/cpp/tests/RequestResponseTest.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/tests/RequestResponseTest.cpp?view=auto&rev=498646
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/tests/RequestResponseTest.cpp (added)
+++ incubator/qpid/branches/qpid.0-9/cpp/tests/RequestResponseTest.cpp Mon Jan 22 07:20:54 2007
@@ -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);
+
+
+
Propchange: incubator/qpid/branches/qpid.0-9/cpp/tests/RequestResponseTest.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/branches/qpid.0-9/cpp/tests/RequestResponseTest.cpp
------------------------------------------------------------------------------
svn:keywords = Rev Date