diff options
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/Ice/operations/Twoways.cpp | 47 | ||||
| -rw-r--r-- | cpp/test/Ice/operations/TwowaysAMI.cpp | 92 |
2 files changed, 0 insertions, 139 deletions
diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp index b629b82c7a9..6c79d5a3706 100644 --- a/cpp/test/Ice/operations/Twoways.cpp +++ b/cpp/test/Ice/operations/Twoways.cpp @@ -696,52 +696,6 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { // - // Test that default context is obtained correctly from communicator. - // -/* DEPRECATED - Ice::Context dflt; - dflt["a"] = "b"; - communicator->setDefaultContext(dflt); - test(p->opContext() != dflt); - - Test::MyClassPrx p2 = Test::MyClassPrx::uncheckedCast(p->ice_context(Ice::Context())); - test(p2->opContext().empty()); - - p2 = Test::MyClassPrx::uncheckedCast(p->ice_defaultContext()); - test(p2->opContext() == dflt); - - communicator->setDefaultContext(Ice::Context()); - test(!p2->opContext().empty()); - - communicator->setDefaultContext(dflt); - Test::MyClassPrx c = Test::MyClassPrx::checkedCast( - communicator->stringToProxy("test:default -p 12010")); - test(c->opContext() == dflt); - - dflt["a"] = "c"; - Test::MyClassPrx c2 = Test::MyClassPrx::uncheckedCast(c->ice_context(dflt)); - test(c2->opContext()["a"] == "c"); - - dflt.clear(); - Test::MyClassPrx c3 = Test::MyClassPrx::uncheckedCast(c2->ice_context(dflt)); - Ice::Context tmp = c3->opContext(); - test(tmp.find("a") == tmp.end()); - - Test::MyClassPrx c4 = Test::MyClassPrx::uncheckedCast(c2->ice_defaultContext()); - test(c4->opContext()["a"] == "b"); - - dflt["a"] = "d"; - communicator->setDefaultContext(dflt); - - Test::MyClassPrx c5 = Test::MyClassPrx::uncheckedCast(c->ice_defaultContext()); - test(c5->opContext()["a"] == "d"); - - communicator->setDefaultContext(Ice::Context()); -*/ - } - - { - // // Test implicit context propagation // @@ -804,7 +758,6 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) ic->destroy(); } } - } { diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp index 5e24b1c2c25..87477254af6 100644 --- a/cpp/test/Ice/operations/TwowaysAMI.cpp +++ b/cpp/test/Ice/operations/TwowaysAMI.cpp @@ -1308,96 +1308,6 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { // - // Test that default context is obtained correctly from communicator. - // -/* DEPRECATED - Ice::Context dflt; - dflt["a"] = "b"; - communicator->setDefaultContext(dflt); - { - AMI_MyClass_opContextNotEqualIPtr cb = new AMI_MyClass_opContextNotEqualI(dflt); - p->opContext_async(cb); - cb->check(); - } - - Test::MyClassPrx p2 = Test::MyClassPrx::uncheckedCast(p->ice_context(Ice::Context())); - { - AMI_MyClass_opContextEqualIPtr cb = new AMI_MyClass_opContextEqualI(Ice::Context()); - p2->opContext_async(cb); - cb->check(); - } - - p2 = Test::MyClassPrx::uncheckedCast(p->ice_defaultContext()); - { - AMI_MyClass_opContextEqualIPtr cb = new AMI_MyClass_opContextEqualI(dflt); - p2->opContext_async(cb); - cb->check(); - } - - communicator->setDefaultContext(Ice::Context()); - { - AMI_MyClass_opContextNotEqualIPtr cb = new AMI_MyClass_opContextNotEqualI(Ice::Context()); - p2->opContext_async(cb); - cb->check(); - } - - communicator->setDefaultContext(dflt); - Test::MyClassPrx c = Test::MyClassPrx::checkedCast( - communicator->stringToProxy("test:default -p 12010")); - { - Ice::Context tmp; - tmp["a"] = "b"; - AMI_MyClass_opContextEqualIPtr cb = new AMI_MyClass_opContextEqualI(tmp); - c->opContext_async(cb); - cb->check(); - } - - dflt["a"] = "c"; - Test::MyClassPrx c2 = Test::MyClassPrx::uncheckedCast(c->ice_context(dflt)); - { - Ice::Context tmp; - tmp["a"] = "c"; - AMI_MyClass_opContextEqualIPtr cb = new AMI_MyClass_opContextEqualI(tmp); - c2->opContext_async(cb); - cb->check(); - } - - dflt.clear(); - Test::MyClassPrx c3 = Test::MyClassPrx::uncheckedCast(c2->ice_context(dflt)); - { - Ice::Context tmp; - AMI_MyClass_opContextEqualIPtr cb = new AMI_MyClass_opContextEqualI(tmp); - c3->opContext_async(cb); - cb->check(); - } - - Test::MyClassPrx c4 = Test::MyClassPrx::uncheckedCast(c2->ice_defaultContext()); - { - Ice::Context tmp; - tmp["a"] = "b"; - AMI_MyClass_opContextEqualIPtr cb = new AMI_MyClass_opContextEqualI(tmp); - c4->opContext_async(cb); - cb->check(); - } - - dflt["a"] = "d"; - communicator->setDefaultContext(dflt); - - Test::MyClassPrx c5 = Test::MyClassPrx::uncheckedCast(c->ice_defaultContext()); - { - Ice::Context tmp; - tmp["a"] = "d"; - AMI_MyClass_opContextEqualIPtr cb = new AMI_MyClass_opContextEqualI(tmp); - c5->opContext_async(cb); - cb->check(); - } - - communicator->setDefaultContext(Ice::Context()); -*/ - } - - { - // // Test implicit context propagation // @@ -1465,8 +1375,6 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) ic->destroy(); } } - - } { |