1 files changed, 18 insertions, 41 deletions

diff --git a/cpp/test/Ice/custom/ServerAMD.cpp b/cpp/test/Ice/custom/ServerAMD.cpp
index 1afc87208f5..5cc6de32135 100644
--- a/cpp/test/Ice/custom/ServerAMD.cpp
+++ b/cpp/test/Ice/custom/ServerAMD.cpp
@@ -8,60 +8,37 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <TestAMDI.h>
 #include <WstringAMDI.h>
 #include <StringConverterI.h>
 
 using namespace std;
 
-DEFINE_TEST("serveramd")
+class ServerAMD : public Test::TestHelper
+{
+public:
+
+    void run(int, char**);
+};
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+void
+ServerAMD::run(int argc, char** argv)
 {
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    setProcessStringConverter(ICE_MAKE_SHARED(Test::StringConverterI));
+    setProcessWstringConverter(ICE_MAKE_SHARED(Test::WstringConverterI));
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
+
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    adapter->add(ICE_MAKE_SHARED(TestIntfI,communicator), Ice::stringToIdentity("TEST"));
+    adapter->add(ICE_MAKE_SHARED(TestIntfI), Ice::stringToIdentity("TEST"));
     adapter->add(ICE_MAKE_SHARED(Test1::WstringClassI), Ice::stringToIdentity("WSTRING1"));
     adapter->add(ICE_MAKE_SHARED(Test2::WstringClassI), Ice::stringToIdentity("WSTRING2"));
 
     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
-    {
-        setProcessStringConverter(ICE_MAKE_SHARED(Test::StringConverterI));
-        setProcessWstringConverter(ICE_MAKE_SHARED(Test::WstringConverterI));
-
-        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(ServerAMD)