diff options
| author | Jose <jose@zeroc.com> | 2015-01-28 10:35:55 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-01-28 10:35:55 +0100 |
| commit | 093b3ec0741c50462ffd2cd5afd9d07dbf6e42be (patch) | |
| tree | c22963fd0fb80c832d7f6ef70a323d57765f65d5 /cpp/test/Ice/exceptions/AllTests.cpp | |
| parent | Added test for ICE-5833, generated #include in headers files (diff) | |
| download | ice-093b3ec0741c50462ffd2cd5afd9d07dbf6e42be.tar.bz2 ice-093b3ec0741c50462ffd2cd5afd9d07dbf6e42be.tar.xz ice-093b3ec0741c50462ffd2cd5afd9d07dbf6e42be.zip | |
Fixed (ICE-6190) - Improve WinRT ssl/wss testing
Diffstat (limited to 'cpp/test/Ice/exceptions/AllTests.cpp')
| -rw-r--r-- | cpp/test/Ice/exceptions/AllTests.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index 51cb490216e..f82840a5b6d 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -498,7 +498,9 @@ allTests(const Ice::CommunicatorPtr& communicator) // Expected } - communicator->getProperties()->setProperty("TestAdapter0.Endpoints", "default"); + string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ? + "127.0.0.1" : "0:0:0:0:0:0:0:1"; + communicator->getProperties()->setProperty("TestAdapter0.Endpoints", "default -h " + host); first = communicator->createObjectAdapter("TestAdapter0"); try { @@ -538,7 +540,9 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing servant registration exceptions... " << flush; { - communicator->getProperties()->setProperty("TestAdapter1.Endpoints", "default"); + string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ? + "127.0.0.1" : "0:0:0:0:0:0:0:1"; + communicator->getProperties()->setProperty("TestAdapter1.Endpoints", "default -h " + host); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter1"); Ice::ObjectPtr obj = new EmptyI; adapter->add(obj, communicator->stringToIdentity("x")); @@ -605,7 +609,9 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing servant locator registrations exceptions... " << flush; { - communicator->getProperties()->setProperty("TestAdapter2.Endpoints", "default"); + string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ? + "127.0.0.1" : "0:0:0:0:0:0:0:1"; + communicator->getProperties()->setProperty("TestAdapter2.Endpoints", "default -h " + host); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter2"); Ice::ServantLocatorPtr loc = new ServantLocatorI; adapter->addServantLocator(loc, "x"); |