1 files changed, 17 insertions, 40 deletions

diff --git a/cpp/test/IceSSL/configuration/Server.cpp b/cpp/test/IceSSL/configuration/Server.cpp
index 51237ea3e77..0cd538506a1 100644
--- a/cpp/test/IceSSL/configuration/Server.cpp
+++ b/cpp/test/IceSSL/configuration/Server.cpp
@@ -9,68 +9,45 @@
 
 #include <Ice/Ice.h>
 #include <TestI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 #if defined(ICE_USE_OPENSSL)
 #  include <IceSSL/OpenSSL.h>
 #endif
 
-DEFINE_TEST("server")
-
 using namespace std;
 
-int
-run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
+class Server : public Test::TestHelper
 {
+public:
+
+    void run(int, char**);
+};
+
+void
+Server::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     string testdir;
 #if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
     if(argc < 2)
     {
-        cerr << "Usage: " << argv[0] << " testdir" << endl;
-        return 1;
+        ostringstream os;
+        os << "Usage: " << argv[0] << " testdir";
+        throw invalid_argument(os.str());
     }
     testdir = string(argv[1]) + "/../certs";
 #else
     testdir = "certs";
 #endif
 
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0, "tcp"));
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint("tcp"));
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::Identity id = Ice::stringToIdentity("factory");
     adapter->add(ICE_MAKE_SHARED(ServerFactoryI, testdir), id);
     adapter->activate();
-    TEST_READY
+    serverReady();
     communicator->waitForShutdown();
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    int status;
-    Ice::CommunicatorPtr communicator;
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        communicator = Ice::initialize(argc, argv, initData);
-        status = run(argc, argv, communicator);
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        status = EXIT_FAILURE;
-    }
-
-    if(communicator)
-    {
-        communicator->destroy();
-    }
-
-    return status;
-}
+DEFINE_TEST(Server)