From 0c3f1084652f7d81f1ca992676e90c158eeb3e65 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Mon, 6 Nov 2006 16:43:31 +0000 Subject: Minor source reorg, see README. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@471789 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/test/unit/qpid/broker/ChannelTest.cpp | 2 +- cpp/test/unit/qpid/broker/ExchangeTest.cpp | 2 +- cpp/test/unit/qpid/broker/MessageBuilderTest.cpp | 2 +- cpp/test/unit/qpid/broker/MessageTest.cpp | 4 +-- cpp/test/unit/qpid/broker/QueueTest.cpp | 2 +- cpp/test/unit/qpid/concurrent/APRBaseTest.cpp | 44 ------------------------ cpp/test/unit/qpid/sys/APRBaseTest.cpp | 44 ++++++++++++++++++++++++ 7 files changed, 50 insertions(+), 50 deletions(-) delete mode 100644 cpp/test/unit/qpid/concurrent/APRBaseTest.cpp create mode 100644 cpp/test/unit/qpid/sys/APRBaseTest.cpp (limited to 'cpp/test/unit/qpid') diff --git a/cpp/test/unit/qpid/broker/ChannelTest.cpp b/cpp/test/unit/qpid/broker/ChannelTest.cpp index 5052d4127d..796c949363 100644 --- a/cpp/test/unit/qpid/broker/ChannelTest.cpp +++ b/cpp/test/unit/qpid/broker/ChannelTest.cpp @@ -24,7 +24,7 @@ using namespace boost; using namespace qpid::broker; using namespace qpid::framing; -using namespace qpid::concurrent; +using namespace qpid::sys; struct DummyHandler : OutputHandler{ std::vector frames; diff --git a/cpp/test/unit/qpid/broker/ExchangeTest.cpp b/cpp/test/unit/qpid/broker/ExchangeTest.cpp index 14fb6fc097..d20b7c171a 100644 --- a/cpp/test/unit/qpid/broker/ExchangeTest.cpp +++ b/cpp/test/unit/qpid/broker/ExchangeTest.cpp @@ -25,7 +25,7 @@ #include using namespace qpid::broker; -using namespace qpid::concurrent; +using namespace qpid::sys; class ExchangeTest : public CppUnit::TestCase { diff --git a/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp b/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp index c432de7785..c04226647f 100644 --- a/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp +++ b/cpp/test/unit/qpid/broker/MessageBuilderTest.cpp @@ -24,7 +24,7 @@ using namespace boost; using namespace qpid::broker; using namespace qpid::framing; -using namespace qpid::concurrent; +using namespace qpid::sys; class MessageBuilderTest : public CppUnit::TestCase { diff --git a/cpp/test/unit/qpid/broker/MessageTest.cpp b/cpp/test/unit/qpid/broker/MessageTest.cpp index 9b4040a8ca..1dbbeda827 100644 --- a/cpp/test/unit/qpid/broker/MessageTest.cpp +++ b/cpp/test/unit/qpid/broker/MessageTest.cpp @@ -15,14 +15,14 @@ * limitations under the License. * */ -#include "qpid/concurrent/APRBase.h" +#include "qpid/sys/APRBase.h" #include "qpid/broker/Message.h" #include #include using namespace qpid::broker; using namespace qpid::framing; -using namespace qpid::concurrent; +using namespace qpid::sys; class MessageTest : public CppUnit::TestCase { diff --git a/cpp/test/unit/qpid/broker/QueueTest.cpp b/cpp/test/unit/qpid/broker/QueueTest.cpp index ba1427a087..ee64854dbb 100644 --- a/cpp/test/unit/qpid/broker/QueueTest.cpp +++ b/cpp/test/unit/qpid/broker/QueueTest.cpp @@ -21,7 +21,7 @@ #include using namespace qpid::broker; -using namespace qpid::concurrent; +using namespace qpid::sys; class TestBinding : public virtual Binding{ diff --git a/cpp/test/unit/qpid/concurrent/APRBaseTest.cpp b/cpp/test/unit/qpid/concurrent/APRBaseTest.cpp deleted file mode 100644 index 0b4fd94e10..0000000000 --- a/cpp/test/unit/qpid/concurrent/APRBaseTest.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/* - * - * 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 "qpid/concurrent/APRBase.h" -#include -#include - -using namespace qpid::concurrent; - -class APRBaseTest : public CppUnit::TestCase -{ - CPPUNIT_TEST_SUITE(APRBaseTest); - CPPUNIT_TEST(testMe); - CPPUNIT_TEST_SUITE_END(); - - public: - - void testMe() - { - APRBase::increment(); - APRBase::increment(); - APRBase::decrement(); - APRBase::decrement(); - } -}; - -// Make this test suite a plugin. -CPPUNIT_PLUGIN_IMPLEMENT(); -CPPUNIT_TEST_SUITE_REGISTRATION(APRBaseTest); - diff --git a/cpp/test/unit/qpid/sys/APRBaseTest.cpp b/cpp/test/unit/qpid/sys/APRBaseTest.cpp new file mode 100644 index 0000000000..fc0c7dd9e1 --- /dev/null +++ b/cpp/test/unit/qpid/sys/APRBaseTest.cpp @@ -0,0 +1,44 @@ +/* + * + * 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 "qpid/sys/APRBase.h" +#include +#include + +using namespace qpid::sys; + +class APRBaseTest : public CppUnit::TestCase +{ + CPPUNIT_TEST_SUITE(APRBaseTest); + CPPUNIT_TEST(testMe); + CPPUNIT_TEST_SUITE_END(); + + public: + + void testMe() + { + APRBase::increment(); + APRBase::increment(); + APRBase::decrement(); + APRBase::decrement(); + } +}; + +// Make this test suite a plugin. +CPPUNIT_PLUGIN_IMPLEMENT(); +CPPUNIT_TEST_SUITE_REGISTRATION(APRBaseTest); + -- cgit v1.2.1