diff options
author | Joe George <joe@zeroc.com> | 2016-01-18 12:13:42 -0500 |
---|---|---|
committer | Joe George <joe@zeroc.com> | 2016-01-18 12:13:42 -0500 |
commit | 7dbcaa359ff944918cd6af9f5a15aa057c4c3798 (patch) | |
tree | 984c4331b9927eb66571a42e4a44c315fcb4778e /cpp | |
parent | Fix ICE-6956 - C++ ValueFactoryManagerF.h bug (diff) | |
download | ice-7dbcaa359ff944918cd6af9f5a15aa057c4c3798.tar.bz2 ice-7dbcaa359ff944918cd6af9f5a15aa057c4c3798.tar.xz ice-7dbcaa359ff944918cd6af9f5a15aa057c4c3798.zip |
Fix IEE-162 - multiple bluetooth test failures
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/test/Ice/objects/AllTests.cpp | 4 | ||||
-rw-r--r-- | cpp/test/Ice/servantLocator/AllTests.cpp | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp index 4ebfc56e6cb..300bd4484ed 100644 --- a/cpp/test/Ice/objects/AllTests.cpp +++ b/cpp/test/Ice/objects/AllTests.cpp @@ -345,8 +345,8 @@ allTests(const Ice::CommunicatorPtr& communicator) try { - string ref = "test:default -p 12010"; - TestIntfPrxPtr p = ICE_CHECKED_CAST(TestIntfPrx, communicator->stringToProxy(ref)); + TestIntfPrxPtr p = ICE_CHECKED_CAST(TestIntfPrx, + communicator->stringToProxy("test:" + getTestEndpoint(communicator, 0))); cout << "testing Object factory registration... " << flush; { diff --git a/cpp/test/Ice/servantLocator/AllTests.cpp b/cpp/test/Ice/servantLocator/AllTests.cpp index fab408d7368..ad432198e0d 100644 --- a/cpp/test/Ice/servantLocator/AllTests.cpp +++ b/cpp/test/Ice/servantLocator/AllTests.cpp @@ -141,7 +141,7 @@ testExceptions(const TestIntfPrxPtr& obj) { test(false); } - + try { obj->unknownExceptionWithServantException(); @@ -269,7 +269,8 @@ allTests(const CommunicatorPtr& communicator) obj = ICE_CHECKED_CAST(TestIntfPrx, base); try { - ICE_CHECKED_CAST(TestIntfPrx, communicator->stringToProxy("category/unknown:default -p 12010")); + ICE_CHECKED_CAST(TestIntfPrx, + communicator->stringToProxy("category/unknown:" + getTestEndpoint(communicator, 0))); } catch(const ObjectNotExistException&) { @@ -283,7 +284,8 @@ allTests(const CommunicatorPtr& communicator) obj = ICE_CHECKED_CAST(TestIntfPrx, base); try { - ICE_CHECKED_CAST(TestIntfPrx, communicator->stringToProxy("anothercategory/unknown:default -p 12010")); + ICE_CHECKED_CAST(TestIntfPrx, + communicator->stringToProxy("anothercategory/unknown:" + getTestEndpoint(communicator, 0))); } catch(const ObjectNotExistException&) { |