1 files changed, 18 insertions, 28 deletions

diff --git a/cpp/test/Glacier2/ssl/Client.cpp b/cpp/test/Glacier2/ssl/Client.cpp
index ea0575b41a0..c4b6a88f646 100644
--- a/cpp/test/Glacier2/ssl/Client.cpp
+++ b/cpp/test/Glacier2/ssl/Client.cpp
@@ -9,39 +9,29 @@
 
 #include <Ice/Ice.h>
 #include <Glacier2/Router.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 using namespace Ice;
-//using namespace Test;
+using namespace Test;
 
-class CallbackClient : public Application
+class Client : public Test::TestHelper
 {
 public:
 
-    virtual int run(int, char*[]);
+    void run(int, char**);
 };
 
-int
-main(int argc, char* argv[])
+void
+Client::run(int argc, char** argv)
 {
-    //
-    // We must disable connection warnings, because we attempt to ping
-    // the router before session establishment, as well as after
-    // session destruction. Both will cause a ConnectionLostException.
-    //
-    Ice::InitializationData initData = getTestInitData(argc, argv);
-    initData.properties->setProperty("Ice.Warn.Connections", "0");
-    CallbackClient app;
-    return app.main(argc, argv, initData);
-}
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->setProperty("Ice.Warn.Connections", "0");
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
 
-int
-CallbackClient::run(int, char**)
-{
     Glacier2::RouterPrx router = Glacier2::RouterPrx::uncheckedCast(
-        communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 0, "tcp")));
-    communicator()->setDefaultRouter(router);
+        communicator->stringToProxy("Glacier2/router:" + getTestEndpoint("tcp")));
+    communicator->setDefaultRouter(router);
 
     //
     // First try to create a non ssl sessions.
@@ -74,10 +64,10 @@ CallbackClient::run(int, char**)
     // Switch to using the SSL router. First, clear the router. Then
     // set a new SSL based router.
     //
-    communicator()->setDefaultRouter(Glacier2::RouterPrx());
+    communicator->setDefaultRouter(Glacier2::RouterPrx());
     router = Glacier2::RouterPrx::uncheckedCast(
-        communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 1, "ssl")));
-    communicator()->setDefaultRouter(router);
+        communicator->stringToProxy("Glacier2/router:" + getTestEndpoint(1, "ssl")));
+    communicator->setDefaultRouter(router);
 
     //
     // Next try to create a non ssl session. This should succeed.
@@ -108,10 +98,10 @@ CallbackClient::run(int, char**)
     }
     cout << "ok" << endl;
 
-    communicator()->setDefaultRouter(0);
+    communicator->setDefaultRouter(0);
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(
-        communicator()->stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(communicator(), 2, "tcp")));
+        communicator->stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(2, "tcp")));
     process->shutdown();
-
-    return EXIT_SUCCESS;
 }
+
+DEFINE_TEST(Client)