diff options
Diffstat (limited to 'cpp/test/Ice/proxy/AllTests.cpp')
| -rw-r--r-- | cpp/test/Ice/proxy/AllTests.cpp | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp index 405c53e4ab2..2222b8ce7e9 100644 --- a/cpp/test/Ice/proxy/AllTests.cpp +++ b/cpp/test/Ice/proxy/AllTests.cpp @@ -10,7 +10,6 @@ #include <Ice/Ice.h> #include <Ice/Locator.h> #include <Ice/Router.h> -#include <Ice/EndpointI.h> #include <TestCommon.h> #include <Test.h> @@ -680,24 +679,12 @@ allTests(const Ice::CommunicatorPtr& communicator) Ice::EndpointSeq endpts1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10000")->ice_getEndpoints(); Ice::EndpointSeq endpts2 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10001")->ice_getEndpoints(); - auto eq = [](const shared_ptr<Ice::Endpoint>& lhs, const shared_ptr<Ice::Endpoint>& rhs) - { - return Ice::targetEquals(dynamic_pointer_cast<IceInternal::EndpointI>(lhs), - dynamic_pointer_cast<IceInternal::EndpointI>(rhs)); - }; - - auto less = [](const shared_ptr<Ice::Endpoint>& lhs, const shared_ptr<Ice::Endpoint>& rhs) - { - return Ice::targetLess(dynamic_pointer_cast<IceInternal::EndpointI>(lhs), - dynamic_pointer_cast<IceInternal::EndpointI>(rhs)); - }; - - test(!equal(endpts1.begin(), endpts1.end(), endpts2.begin(), endpts2.end(), eq)); - test(lexicographical_compare(endpts1.begin(), endpts1.end(), endpts2.begin(), endpts2.end(), less)); - test(!lexicographical_compare(endpts2.begin(), endpts2.end(), endpts1.begin(), endpts1.end(), less)); + test(!equal(endpts1.begin(), endpts1.end(), endpts2.begin(), endpts2.end(), Ice::TargetEquals<shared_ptr<Ice::Endpoint>>())); + test(lexicographical_compare(endpts1.begin(), endpts1.end(), endpts2.begin(), endpts2.end(), Ice::TargetLess<shared_ptr<Ice::Endpoint>>())); + test(!lexicographical_compare(endpts2.begin(), endpts2.end(), endpts1.begin(), endpts1.end(), Ice::TargetLess<shared_ptr<Ice::Endpoint>>())); Ice::EndpointSeq endpts3 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10000")->ice_getEndpoints(); - test(equal(endpts1.begin(), endpts1.end(), endpts3.begin(), endpts3.end(), eq)); + test(equal(endpts1.begin(), endpts1.end(), endpts3.begin(), endpts3.end(), Ice::TargetEquals<shared_ptr<Ice::Endpoint>>())); test(Ice::targetEquals(compObj1->ice_encodingVersion(Ice::Encoding_1_0), compObj1->ice_encodingVersion(Ice::Encoding_1_0))); test(!Ice::targetEquals(compObj1->ice_encodingVersion(Ice::Encoding_1_0), compObj1->ice_encodingVersion(Ice::Encoding_1_1))); |