diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-01-09 11:12:16 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-01-09 11:12:16 +0100 |
| commit | 27f45794866bc600abcc3aa6207e0468660f908d (patch) | |
| tree | 4b9ff5f33b84948a01258d8008b743fbc4013a18 /cpp/test/IceSSL/configuration/TestI.cpp | |
| parent | Renamed Slice/keyword test to clash, and added identifier-clash test (diff) | |
| download | ice-27f45794866bc600abcc3aa6207e0468660f908d.tar.bz2 ice-27f45794866bc600abcc3aa6207e0468660f908d.tar.xz ice-27f45794866bc600abcc3aa6207e0468660f908d.zip | |
Added support for SSL with automated UWP tests
Diffstat (limited to 'cpp/test/IceSSL/configuration/TestI.cpp')
| -rw-r--r-- | cpp/test/IceSSL/configuration/TestI.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/test/IceSSL/configuration/TestI.cpp b/cpp/test/IceSSL/configuration/TestI.cpp index b467dc264ee..dec6aea05e3 100644 --- a/cpp/test/IceSSL/configuration/TestI.cpp +++ b/cpp/test/IceSSL/configuration/TestI.cpp @@ -83,10 +83,13 @@ ServerI::checkCipher(ICE_IN(string) cipher, const Ice::Current& c) void ServerI::destroy() { - string defaultDir = _communicator->getProperties()->getProperty("IceSSL.DefaultDir"); _communicator->destroy(); } +ServerFactoryI::ServerFactoryI(const string& defaultDir) : _defaultDir(defaultDir) +{ +} + Test::ServerPrxPtr ServerFactoryI::createServer(ICE_IN(Test::Properties) props, const Current&) { @@ -96,6 +99,7 @@ ServerFactoryI::createServer(ICE_IN(Test::Properties) props, const Current&) { initData.properties->setProperty(p->first, p->second); } + initData.properties->setProperty("IceSSL.DefaultDir", _defaultDir); CommunicatorPtr communicator = initialize(initData); ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("ServerAdapter", "ssl"); |