Refactored test scripts

1 files changed, 4 insertions, 4 deletions

diff --git a/cpp/test/Glacier2/sessionControl/Client.cpp b/cpp/test/Glacier2/sessionControl/Client.cpp
index 3e1bd96b9ba..4c437886367 100644
--- a/cpp/test/Glacier2/sessionControl/Client.cpp
+++ b/cpp/test/Glacier2/sessionControl/Client.cpp
@@ -31,8 +31,7 @@ main(int argc, char* argv[])
     Ice::registerIceSSL();
 #endif
 
-    Ice::InitializationData initData;
-    initData.properties = Ice::createProperties(argc, argv);
+    Ice::InitializationData initData = getTestInitData(argc, argv);
 
     //
     // We want to check whether the client retries for evicted
@@ -49,7 +48,7 @@ int
 SessionControlClient::run(int, char**)
 {
     cout << "getting router... " << flush;
-    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347");
+    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 10));
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
     test(router);
     communicator()->setDefaultRouter(router);
@@ -103,7 +102,8 @@ SessionControlClient::run(int, char**)
     session = Test::SessionPrx::uncheckedCast(router->createSession("userid", "abc123"));
     session->shutdown();
     communicator()->setDefaultRouter(0);
-    ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -p 12348");
+    ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
+                                                          getTestEndpoint(communicator(), 11, "tcp"));
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
     test(process);
     process->shutdown();