Bug 3878 - remove some deprecated features

2 files changed, 0 insertions, 136 deletions

diff --git a/java/test/Ice/operations/Twoways.java b/java/test/Ice/operations/Twoways.java
index 712086d32e5..20c99f1057a 100644
--- a/java/test/Ice/operations/Twoways.java
+++ b/java/test/Ice/operations/Twoways.java
@@ -697,50 +697,6 @@ class Twoways
                 r = p2.opContext(ctx);
                 test(r.equals(ctx));
             }
-            {
-                //
-                // Test that default context is obtained correctly from communicator.
-                //
-/* DEPRECATED
-                java.util.HashMap dflt = new java.util.HashMap();
-                dflt.put("a", "b");
-                communicator.setDefaultContext(dflt);
-                test(!p.opContext().equals(dflt));
-
-                MyClassPrx p2 = MyClassPrxHelper.uncheckedCast(p.ice_context(new java.util.HashMap()));
-                test(p2.opContext().isEmpty());
-
-                p2 = MyClassPrxHelper.uncheckedCast(p.ice_defaultContext());
-                test(p2.opContext().equals(dflt));
-
-                communicator.setDefaultContext(new java.util.HashMap());
-                test(!p2.opContext().isEmpty());
-
-                communicator.setDefaultContext(dflt);
-                MyClassPrx c = MyClassPrxHelper.checkedCast(
-                                        communicator.stringToProxy("test:default -p 12010"));
-                test(c.opContext().equals(dflt));
-
-                dflt.put("a", "c");
-                MyClassPrx c2 = MyClassPrxHelper.uncheckedCast(c.ice_context(dflt));
-                test(c2.opContext().get("a").equals("c"));
-
-                dflt.clear();
-                MyClassPrx c3 = MyClassPrxHelper.uncheckedCast(c2.ice_context(dflt));
-                test(c3.opContext().get("a") == null);
-
-                MyClassPrx c4 = MyClassPrxHelper.uncheckedCast(c2.ice_defaultContext());
-                test(c4.opContext().get("a").equals("b"));
-
-                dflt.put("a", "d");
-                communicator.setDefaultContext(dflt);
-
-                MyClassPrx c5 = MyClassPrxHelper.uncheckedCast(c2.ice_defaultContext());
-                test(c5.opContext().get("a").equals("d"));
-
-                communicator.setDefaultContext(new java.util.HashMap());
-*/
-            }
         }
         {
             //
diff --git a/java/test/Ice/operations/TwowaysAMI.java b/java/test/Ice/operations/TwowaysAMI.java
index 55187ff821f..a7328294568 100644
--- a/java/test/Ice/operations/TwowaysAMI.java
+++ b/java/test/Ice/operations/TwowaysAMI.java
@@ -1559,98 +1559,6 @@ class TwowaysAMI
                 p2.opContext_async(cb, ctx);
                 cb.check();
             }
-
-            {
-                //
-                // Test that default context is obtained correctly from communicator.
-                //
-/* DEPRECATED
-                java.util.HashMap<String, String> dflt = new java.util.HashMap<String, String>();
-                dflt.put("a", "b");
-                communicator.setDefaultContext(dflt);
-                {
-                    AMI_MyClass_opContextNotEqualI cb = new AMI_MyClass_opContextNotEqualI(dflt);
-                    p.opContext_async(cb);
-                    cb.check();
-                }
-
-                p2 = MyClassPrxHelper.uncheckedCast(p.ice_context(new java.util.HashMap<String, String>()));
-                {
-                    AMI_MyClass_opContextEqualI cb =
-                        new AMI_MyClass_opContextEqualI(new java.util.HashMap<String, String>());
-                    p2.opContext_async(cb);
-                    cb.check();
-                }
-
-                p2 = MyClassPrxHelper.uncheckedCast(p.ice_defaultContext());
-                {
-                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(dflt);
-                    p2.opContext_async(cb);
-                    cb.check();
-                }
-
-                communicator.setDefaultContext(new java.util.HashMap());
-                {
-                    AMI_MyClass_opContextNotEqualI cb =
-                        new AMI_MyClass_opContextNotEqualI(new java.util.HashMap<String, String>());
-                    p2.opContext_async(cb);
-                    cb.check();
-                }
-
-                communicator.setDefaultContext(dflt);
-                MyClassPrx c = MyClassPrxHelper.checkedCast(
-                                                communicator.stringToProxy("test:default -p 12010"));
-                {
-                    java.util.HashMap<String, String> tmp = new java.util.HashMap<String, String>();
-                    tmp.put("a", "b");
-                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
-                    c.opContext_async(cb);
-                    cb.check();
-                }
-
-                dflt.put("a", "c");
-                MyClassPrx c2 = MyClassPrxHelper.uncheckedCast(c.ice_context(dflt));
-                {
-                    java.util.HashMap<String, String> tmp = new java.util.HashMap<String, String>();
-                    tmp.put("a", "c");
-                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
-                    c2.opContext_async(cb);
-                    cb.check();
-                }
-
-                dflt.clear();
-                MyClassPrx c3 = MyClassPrxHelper.uncheckedCast(c2.ice_context(dflt));
-                {
-                    java.util.HashMap<String, String> tmp = new java.util.HashMap<String, String>();
-                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
-                    c3.opContext_async(cb);
-                    cb.check();
-                }
-
-                MyClassPrx c4 = MyClassPrxHelper.uncheckedCast(c.ice_defaultContext());
-                {
-                    java.util.HashMap<String, String> tmp = new java.util.HashMap<String, String>();
-                    tmp.put("a", "b");
-                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
-                    c4.opContext_async(cb);
-                    cb.check();
-                }
-
-                dflt.put("a", "d");
-                communicator.setDefaultContext(dflt);
-
-                MyClassPrx c5 = MyClassPrxHelper.uncheckedCast(c.ice_defaultContext());
-                {
-                    java.util.HashMap<String, String> tmp = new java.util.HashMap<String, String>();
-                    tmp.put("a", "d");
-                    AMI_MyClass_opContextEqualI cb = new AMI_MyClass_opContextEqualI(tmp);
-                    c5.opContext_async(cb);
-                    cb.check();
-                }
-
-                communicator.setDefaultContext(new java.util.HashMap<String, String>());
-*/
-            }
         }
 
         {