src/tests/SocketProxy.h: proxy between local client & server to simulate network disconnect.

src/qpid/client/Connector.h: remove friend hack for previous flawed disconnect approach.
src/tests/BrokerFixture.h:   ""
src/tests/ClientSessionTest.cpp, exception_test.cpp: use ProxyConnection


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@602980 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 0 insertions, 20 deletions

diff --git a/cpp/src/tests/BrokerFixture.h b/cpp/src/tests/BrokerFixture.h
index ceb8ecb4e6..c7222c03a2 100644
--- a/cpp/src/tests/BrokerFixture.h
+++ b/cpp/src/tests/BrokerFixture.h
@@ -29,16 +29,6 @@
 #include "qpid/client/Session_0_10.h"
 #include "qpid/client/SubscriptionManager.h"
 
-namespace qpid { namespace client {
-/** Back door into private Connector stuff */
-struct TestConnector {
-    static void disconnect(qpid::client::Connector& c) {
-        c.socket.close();
-        c.handleClosed();
-    }
-};
-}}
-
 /**
  * A fixture to create an in-process broker and connect to it for tests.
  */
@@ -86,16 +76,6 @@ struct BrokerFixture {
     void open(qpid::client::Connection& c) {
         c.open("localhost", broker->getPort());
     }
-
-    /** Close a connection's socket */ 
-    static void disconnect(qpid::client::Connection& c) {
-        struct Expose : public qpid::client::Connection {
-            void disconnect() {
-                qpid::client::TestConnector::disconnect(*impl->getConnector());
-            }
-        };
-        static_cast<Expose&>(c).disconnect();
-    }
 };
 
 #endif  /*!TESTS_BROKERFIXTURE_H*/