Do not use Ice::Application for Ice testsuite

1 files changed, 14 insertions, 26 deletions

diff --git a/cpp/test/Ice/logger/Client2.cpp b/cpp/test/Ice/logger/Client2.cpp
index 299791408b9..b7ee10f4763 100644
--- a/cpp/test/Ice/logger/Client2.cpp
+++ b/cpp/test/Ice/logger/Client2.cpp
@@ -8,34 +8,20 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
-#include <TestCommon.h>
+#include <TestHelper.h>
 
 using namespace std;
 
-namespace
-{
-
-class Client : public Ice::Application
+class Client2 : public Test::TestHelper
 {
 public:
-    virtual int
-    run(int, char*[])
-    {
-        communicator()->getLogger()->trace("info", "XXX");
-        return EXIT_SUCCESS;
-    };
-};
 
-}
+    void run(int, char**);
+};
 
-int
-main(int argc, char* argv[])
+void
+Client2::run(int argc, char** argv)
 {
-#ifdef ICE_STATIC_LIBS
-    Ice::registerIceSSL(false);
-    Ice::registerIceWS(true);
-#endif
-
 #ifdef _WIN32
     int cp = GetConsoleOutputCP();
     //
@@ -46,14 +32,16 @@ main(int argc, char* argv[])
 #else
     setProcessStringConverter(Ice::createIconvStringConverter<char>("ISO8859-15"));
 #endif
-    Ice::InitializationData id;
-    id.properties = Ice::createProperties();
-    id.properties->load("config.client");
-    Client c;
-    int status = c.main(argc, argv, id);
+
+    Ice::PropertiesPtr properties = createTestProperties(argc, argv);
+    properties->load("config.client");
+
+    Ice::CommunicatorHolder communicator = initialize(argc, argv, properties);
+    communicator->getLogger()->trace("info", "XXX");
 
 #ifdef _WIN32
     SetConsoleOutputCP(cp);
 #endif
-    return status;
 }
+
+DEFINE_TEST(Client2)