diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-11-25 13:13:22 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-11-25 13:13:22 +0100 |
| commit | dcdc32af1fced49d80a8ccd93230e15d91ab45d8 (patch) | |
| tree | eb69e2555fbd54496fce8a33f4dd610e1473ff51 /cpp/test/Glacier2/ssl/Client.cpp | |
| parent | C# IceSSL/configuration log expired certificate exceptions. (diff) | |
| download | ice-dcdc32af1fced49d80a8ccd93230e15d91ab45d8.tar.bz2 ice-dcdc32af1fced49d80a8ccd93230e15d91ab45d8.tar.xz ice-dcdc32af1fced49d80a8ccd93230e15d91ab45d8.zip | |
Refactored test scripts
Diffstat (limited to 'cpp/test/Glacier2/ssl/Client.cpp')
| -rw-r--r-- | cpp/test/Glacier2/ssl/Client.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cpp/test/Glacier2/ssl/Client.cpp b/cpp/test/Glacier2/ssl/Client.cpp index 4859e556e16..6ed1c17550a 100644 --- a/cpp/test/Glacier2/ssl/Client.cpp +++ b/cpp/test/Glacier2/ssl/Client.cpp @@ -34,10 +34,8 @@ main(int argc, char* argv[]) // the router before session establishment, as well as after // session destruction. Both will cause a ConnectionLostException. // - Ice::InitializationData initData; - initData.properties = Ice::createProperties(argc, argv); + Ice::InitializationData initData = getTestInitData(argc, argv); initData.properties->setProperty("Ice.Warn.Connections", "0"); - CallbackClient app; return app.main(argc, argv, initData); } @@ -46,7 +44,7 @@ int CallbackClient::run(int, char**) { Glacier2::RouterPrx router = Glacier2::RouterPrx::uncheckedCast( - communicator()->stringToProxy("Glacier2/router:tcp -h 127.0.0.1 -p 12347")); + communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 0, "tcp"))); communicator()->setDefaultRouter(router); // @@ -82,7 +80,7 @@ CallbackClient::run(int, char**) // communicator()->setDefaultRouter(Glacier2::RouterPrx()); router = Glacier2::RouterPrx::uncheckedCast( - communicator()->stringToProxy("Glacier2/router:ssl -h 127.0.0.1 -p 12348")); + communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 1, "ssl"))); communicator()->setDefaultRouter(router); // @@ -116,7 +114,7 @@ CallbackClient::run(int, char**) communicator()->setDefaultRouter(0); Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast( - communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12349")); + communicator()->stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(communicator(), 2, "tcp"))); process->shutdown(); return EXIT_SUCCESS; |