1 files changed, 33 insertions, 11 deletions

diff --git a/cpp/src/tests/exception_test.cpp b/cpp/src/tests/exception_test.cpp
index 1cbe35fff4..4dac8ee965 100644
--- a/cpp/src/tests/exception_test.cpp
+++ b/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
@@ -20,12 +20,17 @@
  */
 
 #include "unit_test.h"
+#include "test_tools.h"
 #include "BrokerFixture.h"
 #include "qpid/client/SubscriptionManager.h"
+#include "qpid/client/MessageListener.h"
 #include "qpid/sys/Runnable.h"
 #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
@@ -38,6 +43,7 @@ using namespace sys;
 using namespace client;
 using namespace framing;
 
+using qpid::broker::Broker;
 using boost::bind;
 using boost::function;
 
@@ -46,12 +52,15 @@ 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 { f(); }
+        try {
+            ScopedSuppressLogging sl; // Suppress messages for expected errors.
+            f();
+        }
         catch(const Ex& e) {
             caught=true;
             BOOST_MESSAGE(string("Caught expected exception: ")+e.what()+"["+typeid(e).name()+"]");
@@ -73,12 +82,21 @@ struct Catcher : public Runnable {
     }
 };
 
+QPID_AUTO_TEST_CASE(TestSessionBusy) {
+    SessionFixture f;
+    try {
+        ScopedSuppressLogging sl; // Suppress messages for expected errors.
+        f.connection.newSession(f.session.getId().getName());
+        BOOST_FAIL("Expected SessionBusyException for " << f.session.getId().getName());
+    } catch (const SessionBusyException&) {} // FIXME aconway 2008-09-22: client is not throwing correct exception.
+}
+
 QPID_AUTO_TEST_CASE(DisconnectedPop) {
     ProxySessionFixture fix;
-    ProxyConnection c(fix.broker->getPort());
+    ProxyConnection c(fix.broker->getPort(Broker::TCP_TRANSPORT));
     fix.session.queueDeclare(arg::queue="q");
     fix.subs.subscribe(fix.lq, "q");
-    Catcher<Exception> pop(bind(&LocalQueue::pop, boost::ref(fix.lq)));
+    Catcher<TransportFailure> pop(bind(&LocalQueue::pop, &fix.lq, sys::TIME_SEC));
     fix.connection.proxy.close();
     BOOST_CHECK(pop.join());
 }
@@ -88,18 +106,22 @@ QPID_AUTO_TEST_CASE(DisconnectedListen) {
     struct NullListener : public MessageListener {
         void received(Message&) { BOOST_FAIL("Unexpected message"); }
     } l;
-    ProxyConnection c(fix.broker->getPort());
+    ProxyConnection c(fix.broker->getPort(Broker::TCP_TRANSPORT));
     fix.session.queueDeclare(arg::queue="q");
     fix.subs.subscribe(l, "q");
-    Thread t(fix.subs);
+
+    Catcher<TransportFailure> runner(bind(&SubscriptionManager::run, boost::ref(fix.subs)));
     fix.connection.proxy.close();
-    t.join();
-    BOOST_CHECK_THROW(fix.session.close(), ConnectionException);    
+    runner.join();    
+    BOOST_CHECK_THROW(fix.session.queueDeclare(arg::queue="x"), TransportFailure);
 }
 
 QPID_AUTO_TEST_CASE(NoSuchQueueTest) {
     ProxySessionFixture fix;
+    ScopedSuppressLogging sl; // Suppress messages for expected errors.
     BOOST_CHECK_THROW(fix.subs.subscribe(fix.lq, "no such queue"), NotFoundException);
 }
 
 QPID_AUTO_TEST_SUITE_END()
+
+}} // namespace qpid::tests