1 files changed, 13 insertions, 30 deletions
diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp
index ff1dababfc4..38ebf725525 100644
--- a/cpp/test/Ice/facets/Server.cpp
+++ b/cpp/test/Ice/facets/Server.cpp
@@ -8,49 +8,32 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestI.h>
 
-DEFINE_TEST("server")
+class Server : public Test::TestHelper
+{
+public:
 
-using namespace std;
+    void run(int, char**);
+};
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+void
+Server::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectPtr d = ICE_MAKE_SHARED(DI);
     adapter->add(d, Ice::stringToIdentity("d"));
     adapter->addFacet(d, Ice::stringToIdentity("d"), "facetABCD");
     Ice::ObjectPtr f = ICE_MAKE_SHARED(FI);
     adapter->addFacet(f, Ice::stringToIdentity("d"), "facetEF");
-    Ice::ObjectPtr h = ICE_MAKE_SHARED(HI, communicator);
+    Ice::ObjectPtr h = ICE_MAKE_SHARED(HI);
     adapter->addFacet(h, Ice::stringToIdentity("d"), "facetGH");
-    TEST_READY
+    serverReady();
     adapter->activate();
     communicator->waitForShutdown();
-
-    return EXIT_SUCCESS;
 }
 
-int
-main(int argc, char* argv[])
-{
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
-    try
-    {
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        Ice::CommunicatorHolder ich(argc, argv, initData);
-        return run(argc, argv, ich.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return  EXIT_FAILURE;
-    }
-}
+DEFINE_TEST(Server)