1 files changed, 15 insertions, 30 deletions

diff --git a/cpp/test/Ice/servantLocator/Collocated.cpp b/cpp/test/Ice/servantLocator/Collocated.cpp
index 6f9b63d5035..7cab9ea5c8b 100644
--- a/cpp/test/Ice/servantLocator/Collocated.cpp
+++ b/cpp/test/Ice/servantLocator/Collocated.cpp
@@ -7,14 +7,11 @@
 //
 // **********************************************************************
 
-#include <Ice/Application.h>
 #include <ServantLocatorI.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <TestI.h>
 
-DEFINE_TEST("collocated")
-
 using namespace std;
 using namespace Ice;
 
@@ -87,11 +84,19 @@ public:
     }
 };
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+class Collocated : public Test::TestHelper
 {
+public:
+
+    void run(int, char**);
+};
+
+void
+Collocated::run(int argc, char** argv)
+{
+    Ice::CommunicatorHolder communicator = initialize(argc, argv);
     communicator->getProperties()->setProperty("Ice.Warn.Dispatch", "0");
-    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+    communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint());
 
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     adapter->addServantLocator(ICE_MAKE_SHARED(ServantLocatorI, ""), "");
@@ -99,28 +104,8 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     adapter->add(ICE_MAKE_SHARED(TestI), Ice::stringToIdentity("asm"));
     adapter->add(ICE_MAKE_SHARED(TestActivationI), Ice::stringToIdentity("test/activation"));
 
-    Test::TestIntfPrxPtr allTests(const CommunicatorPtr&);
-    allTests(communicator);
-
-    return EXIT_SUCCESS;
+    Test::TestIntfPrxPtr allTests(Test::TestHelper*);
+    allTests(this);
 }
 
-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(Collocated)