Do not use Ice::Application for Ice testsuite

1 files changed, 35 insertions, 47 deletions

diff --git a/cpp/test/Ice/retry/Collocated.cpp b/cpp/test/Ice/retry/Collocated.cpp
index d77c6b65de0..00a90a31b77 100644
--- a/cpp/test/Ice/retry/Collocated.cpp
+++ b/cpp/test/Ice/retry/Collocated.cpp
@@ -8,13 +8,11 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 #include <Test.h>
 #include <TestI.h>
 #include <InstrumentationI.h>
 
-DEFINE_TEST("collocated")
-
 using namespace std;
 using namespace Test;
 
@@ -26,59 +24,49 @@ setupObjectAdapter(const Ice::CommunicatorPtr& communicator)
     //adapter->activate(); // Don't activate OA to ensure collocation is used.
 }
 
-int
-run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& communicator2)
+class Collocated : public Test::TestHelper
 {
-    setupObjectAdapter(communicator);
-    setupObjectAdapter(communicator2);
+public:
 
-    RetryPrxPtr allTests(const Ice::CommunicatorPtr&, const Ice::CommunicatorPtr&, const string&);
-    RetryPrxPtr retry = allTests(communicator, communicator2, "retry");
-    retry->shutdown();
-    return EXIT_SUCCESS;
-}
+    void run(int, char**);
+};
 
-int
-main(int argc, char* argv[])
+void
+Collocated::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-    try
-    {
-        initCounts();
+    initCounts();
 
-        Ice::InitializationData initData = getTestInitData(argc, argv);
-        initData.observer = getObserver();
+    Ice::InitializationData initData;
+    initData.properties = createTestProperties(argc, argv);
+    initData.observer = getObserver();
 
-        initData.properties->setProperty("Ice.RetryIntervals", "0 1 10 1");
+    initData.properties->setProperty("Ice.RetryIntervals", "0 1 10 1");
 
-        //
-        // This test kills connections, so we don't want warnings.
-        //
-        initData.properties->setProperty("Ice.Warn.Connections", "0");
-        initData.properties->setProperty("Ice.Warn.Dispatch", "0");
+    //
+    // This test kills connections, so we don't want warnings.
+    //
+    initData.properties->setProperty("Ice.Warn.Connections", "0");
+    initData.properties->setProperty("Ice.Warn.Dispatch", "0");
 
-        Ice::CommunicatorHolder ich(argc, argv, initData);
+    Ice::CommunicatorHolder ich1 = Ice::initialize(argc, argv, initData);
 
-        //
-        // Configure a second communicator for the invocation timeout
-        // + retry test, we need to configure a large retry interval
-        // to avoid time-sensitive failures.
-        //
-        Ice::InitializationData initData2;
-        initData2.properties = initData.properties->clone();
-        initData2.properties->setProperty("Ice.RetryIntervals", "0 1 10000");
-        initData2.observer = getObserver();
+    //
+    // Configure a second communicator for the invocation timeout
+    // + retry test, we need to configure a large retry interval
+    // to avoid time-sensitive failures.
+    //
+    initData.properties = initData.properties->clone();
+    initData.properties->setProperty("Ice.RetryIntervals", "0 1 10000");
+    initData.observer = getObserver();
 
-        Ice::CommunicatorHolder ich2(initData2);
+    Ice::CommunicatorHolder ich2 = Ice::initialize(initData);;
 
-        return run(argc, argv, ich.communicator(), ich2.communicator());
-    }
-    catch(const Ice::Exception& ex)
-    {
-        cerr << ex << endl;
-        return EXIT_FAILURE;
-    }
+    setupObjectAdapter(ich1.communicator());
+    setupObjectAdapter(ich2.communicator());
+
+    RetryPrxPtr allTests(const Ice::CommunicatorPtr&, const Ice::CommunicatorPtr&, const string&);
+    RetryPrxPtr retry = allTests(ich1.communicator(), ich2.communicator(), "retry");
+    retry->shutdown();
 }
+
+DEFINE_TEST(Collocated)