diff options
author | Andrew Stitcher <astitcher@apache.org> | 2009-09-09 19:46:56 +0000 |
---|---|---|
committer | Andrew Stitcher <astitcher@apache.org> | 2009-09-09 19:46:56 +0000 |
commit | 9259c46ecb8c5f3e98441080a26914bdea59bffe (patch) | |
tree | 67c894abe2f15175c1af01c832300250d3243611 /qpid/cpp/src/tests/exception_test.cpp | |
parent | 52ab3087da04c4faf8908690c3a07b4e99237c32 (diff) | |
download | qpid-python-9259c46ecb8c5f3e98441080a26914bdea59bffe.tar.gz |
Tidied up namespace usage
Miscelleneous whitespace fixes
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@813094 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/exception_test.cpp')
-rw-r--r-- | qpid/cpp/src/tests/exception_test.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/qpid/cpp/src/tests/exception_test.cpp b/qpid/cpp/src/tests/exception_test.cpp index 379e957ef1..0e9a948f00 100644 --- a/qpid/cpp/src/tests/exception_test.cpp +++ b/qpid/cpp/src/tests/exception_test.cpp @@ -7,9 +7,9 @@ * 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 @@ -28,6 +28,9 @@ #include "qpid/sys/Thread.h" #include "qpid/framing/reply_exceptions.h" +namespace qpid { +namespace tests { + QPID_AUTO_TEST_SUITE(exception_test) // FIXME aconway 2008-06-12: need to update our exception handling to @@ -49,12 +52,12 @@ struct Catcher : public Runnable { function<void ()> f; bool caught; Thread thread; - + Catcher(function<void ()> f_) : f(f_), caught(false), thread(this) {} ~Catcher() { join(); } - + void run() { - try { + try { ScopedSuppressLogging sl; // Suppress messages for expected errors. f(); } @@ -110,7 +113,7 @@ QPID_AUTO_TEST_CASE(DisconnectedListen) { Catcher<TransportFailure> runner(bind(&SubscriptionManager::run, boost::ref(fix.subs))); fix.connection.proxy.close(); runner.join(); - BOOST_CHECK_THROW(fix.session.close(), TransportFailure); + BOOST_CHECK_THROW(fix.session.close(), TransportFailure); } QPID_AUTO_TEST_CASE(NoSuchQueueTest) { @@ -120,3 +123,5 @@ QPID_AUTO_TEST_CASE(NoSuchQueueTest) { } QPID_AUTO_TEST_SUITE_END() + +}} // namespace qpid::tests |