diff options
author | Jose <jose@zeroc.com> | 2016-03-01 15:12:26 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2016-03-01 15:12:26 +0100 |
commit | 1419f188bf7d06ba0131cfd94a82f5d43ec0c7dd (patch) | |
tree | 38929143a6575d23e4438e590a20f525a829e194 /cpp/test | |
parent | Fix LMDB nuget package version (diff) | |
parent | Ice::identityToString/Ice::stringToIdentity php/ruby/python implementations (diff) | |
download | ice-1419f188bf7d06ba0131cfd94a82f5d43ec0c7dd.tar.bz2 ice-1419f188bf7d06ba0131cfd94a82f5d43ec0c7dd.tar.xz ice-1419f188bf7d06ba0131cfd94a82f5d43ec0c7dd.zip |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/test')
-rw-r--r-- | cpp/test/Ice/proxy/AllTests.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp index 7803c3957f0..16fd5d7138b 100644 --- a/cpp/test/Ice/proxy/AllTests.cpp +++ b/cpp/test/Ice/proxy/AllTests.cpp @@ -260,11 +260,15 @@ allTests(const Ice::CommunicatorPtr& communicator) Ice::Identity id = { "test", ",X2QNUAzSBcJ_e$AV;E\\" }; Ice::Identity id2 = communicator->stringToIdentity(communicator->identityToString(id)); test(id == id2); + id2 = Ice::stringToIdentity(Ice::identityToString(id)); + test(id == id2); id.name = "test"; id.category = ",X2QNUAz\\SB\\/cJ_e$AV;E\\\\"; id2 = communicator->stringToIdentity(communicator->identityToString(id)); test(id == id2); + id2 = Ice::stringToIdentity(Ice::identityToString(id)); + test(id == id2); cout << "ok" << endl; @@ -446,6 +450,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing proxy methods... " << flush; test(communicator->identityToString(base->ice_identity(communicator->stringToIdentity("other"))->ice_getIdentity()) == "other"); + test(Ice::identityToString(base->ice_identity(Ice::stringToIdentity("other"))->ice_getIdentity()) == "other"); test(base->ice_facet("facet")->ice_getFacet() == "facet"); test(base->ice_adapterId("id")->ice_getAdapterId() == "id"); test(base->ice_twoway()->ice_isTwoway()); |