1 files changed, 14 insertions, 10 deletions

diff --git a/cpp/test/Glacier2/sessionHelper/Client.cpp b/cpp/test/Glacier2/sessionHelper/Client.cpp
index 29363f71a1f..7bb1649f1f4 100644
--- a/cpp/test/Glacier2/sessionHelper/Client.cpp
+++ b/cpp/test/Glacier2/sessionHelper/Client.cpp
@@ -211,7 +211,7 @@ public:
             cout << "ok" << endl;
             instance->notify();
         }
-        catch(...)
+        catch(const Ice::LocalException&)
         {
             test(false);
         }
@@ -273,10 +273,11 @@ public:
     int run(int argc, char* argv[])
     {
         instance = this;
-        string protocol = communicator()->getProperties()->getPropertyWithDefault("Ice.Default.Protocol", "tcp");
-        string host = communicator()->getProperties()->getPropertyWithDefault("Ice.Default.Host", "127.0.0.1");
+        string protocol = getTestProtocol(communicator()->getProperties());
+        string host = getTestHost(communicator()->getProperties());
         _initData.properties = Ice::createProperties(argc, argv, communicator()->getProperties());
-        _initData.properties->setProperty("Ice.Default.Router", "Glacier2/router:default -p 12347");
+        _initData.properties->setProperty("Ice.Default.Router", "Glacier2/router:" +
+                                          getTestEndpoint(communicator(), 10));
 
         DispatcherPtr dispatcher = new Dispatcher();
         dispatcher->start();
@@ -313,7 +314,7 @@ public:
             IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
             cout << "testing SessionHelper connect interrupt... " << flush;
             _factory->setRouterHost(host);
-            _factory->setPort(12011);
+            _factory->setPort(getTestPort(_initData.properties, 1));
             _factory->setProtocol(protocol);
             _session = _factory->connect("userid", "abc123");
 
@@ -333,7 +334,7 @@ public:
             IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
             cout << "testing SessionHelper connect... " << flush;
             _factory->setRouterHost(host);
-            _factory->setPort(12347);
+            _factory->setPort(getTestPort(_initData.properties, 10));
             _factory->setProtocol(protocol);
             _session = _factory->connect("userid", "abc123");
 
@@ -367,7 +368,8 @@ public:
 //             }
 
             cout << "testing stringToProxy for server object... " << flush;
-            Ice::ObjectPrx base = _session->communicator()->stringToProxy("callback:default -p 12010");
+            Ice::ObjectPrx base = _session->communicator()->stringToProxy("callback:" +
+                                                                          getTestEndpoint(_session->communicator(), 0));
             cout << "ok" << endl;
 
             cout << "pinging server after session creation... " << flush;
@@ -450,7 +452,8 @@ public:
             Ice::ObjectPrx processBase;
             {
                 cout << "testing stringToProxy for process object... " << flush;
-                processBase = communicator()->stringToProxy("Glacier2/admin -f Process:default -h \"" + host + "\" -p 12348");
+                processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
+                                                            getTestEndpoint(communicator(), 11, "tcp"));
                 cout << "ok" << endl;
             }
 
@@ -490,7 +493,7 @@ public:
             IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
             cout << "testing SessionHelper connect after router shutdown... " << flush;
             _factory->setRouterHost(host);
-            _factory->setPort(12347);
+            _factory->setPort(getTestPort(_initData.properties, 10));
             _factory->setProtocol(protocol);
             _session = _factory->connect("userid", "abc123");
 
@@ -557,5 +560,6 @@ main(int argc, char* argv[])
 #endif
 
     SessionHelperClient c;
-    return c.main(argc, argv);
+    Ice::InitializationData initData = getTestInitData(argc, argv);
+    return c.main(argc, argv, initData);
 }