1 files changed, 22 insertions, 0 deletions
diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp
index 3fc8b6cc167..950bb3da412 100644
--- a/cpp/test/Ice/operations/Twoways.cpp
+++ b/cpp/test/Ice/operations/Twoways.cpp
@@ -591,4 +591,26 @@ twoways(const Test::MyClassPrx& p)
 	    }
 	}
     }
+
+    {
+	Ice::Context ctx;
+	ctx["one"] = "ONE";
+	ctx["two"] = "TWO";
+	ctx["three"] = "THREE";
+	{
+	    Test::StringStringD r = p->opContext();
+	    test(r != ctx);
+	}
+	{
+	    Test::StringStringD r = p->opContext(ctx);
+	    test(r == ctx);
+	}
+	{
+	    Test::MyClassPrx p2 = Test::MyClassPrx::checkedCast(p->ice_newContext(ctx));
+	    Test::StringStringD r = p2->opContext();
+	    test(r == ctx);
+	    r = p2->opContext(ctx);
+	    test(r == ctx);
+	}
+    }
 }