2 files changed, 6 insertions, 0 deletions
diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp
index 950bb3da412..aef5e5fbdf8 100644
--- a/cpp/test/Ice/operations/Twoways.cpp
+++ b/cpp/test/Ice/operations/Twoways.cpp
@@ -598,15 +598,18 @@ twoways(const Test::MyClassPrx& p)
 	ctx["two"] = "TWO";
 	ctx["three"] = "THREE";
 	{
+	    test(p->ice_getContext().empty());
 	    Test::StringStringD r = p->opContext();
 	    test(r != ctx);
 	}
 	{
+	    test(p->ice_getContext().empty());
 	    Test::StringStringD r = p->opContext(ctx);
 	    test(r == ctx);
 	}
 	{
 	    Test::MyClassPrx p2 = Test::MyClassPrx::checkedCast(p->ice_newContext(ctx));
+	    test(p2->ice_getContext() == ctx);
 	    Test::StringStringD r = p2->opContext();
 	    test(r == ctx);
 	    r = p2->opContext(ctx);
diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp
index deb351d5d6e..09283bcbfa1 100644
--- a/cpp/test/Ice/operations/TwowaysAMI.cpp
+++ b/cpp/test/Ice/operations/TwowaysAMI.cpp
@@ -1096,16 +1096,19 @@ twowaysAMI(const Test::MyClassPrx& p)
 	ctx["two"] = "TWO";
 	ctx["three"] = "THREE";
 	{
+	    test(p->ice_getContext().empty());
 	    AMI_MyClass_opContextNotEqualIPtr cb = new AMI_MyClass_opContextNotEqualI(ctx);
 	    p->opContext_async(cb);
 	    test(cb->check());
 	}
 	{
+	    test(p->ice_getContext().empty());
 	    AMI_MyClass_opContextEqualIPtr cb = new AMI_MyClass_opContextEqualI(ctx);
 	    p->opContext_async(cb, ctx);
 	    test(cb->check());
 	}
 	Test::MyClassPrx p2 = Test::MyClassPrx::checkedCast(p->ice_newContext(ctx));
+	test(p2->ice_getContext() == ctx);
 	{
 	    AMI_MyClass_opContextEqualIPtr cb = new AMI_MyClass_opContextEqualI(ctx);
 	    p2->opContext_async(cb);