More gradle changes.

Moved android stuff to its own package.
Moved java tests to src/main/java/test subdirectory.

1 files changed, 0 insertions, 920 deletions

diff --git a/java/test/Ice/operations/Twoways.java b/java/test/Ice/operations/Twoways.java
deleted file mode 100644
index c148edddb0e..00000000000
--- a/java/test/Ice/operations/Twoways.java
+++ /dev/null
@@ -1,920 +0,0 @@
-
-// **********************************************************************
-//
-// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package test.Ice.operations;
-
-import test.Ice.operations.Test.AnotherStruct;
-import test.Ice.operations.Test.BoolSHolder;
-import test.Ice.operations.Test.BoolSSHolder;
-import test.Ice.operations.Test.ByteBoolDHolder;
-import test.Ice.operations.Test.ByteSHolder;
-import test.Ice.operations.Test.ByteSSHolder;
-import test.Ice.operations.Test.DoubleSHolder;
-import test.Ice.operations.Test.DoubleSSHolder;
-import test.Ice.operations.Test.FloatSHolder;
-import test.Ice.operations.Test.FloatSSHolder;
-import test.Ice.operations.Test.IntSHolder;
-import test.Ice.operations.Test.IntSSHolder;
-import test.Ice.operations.Test.LongFloatDHolder;
-import test.Ice.operations.Test.LongSHolder;
-import test.Ice.operations.Test.LongSSHolder;
-import test.Ice.operations.Test.MyClass;
-import test.Ice.operations.Test.MyClassPrx;
-import test.Ice.operations.Test.MyClassPrxHelper;
-import test.Ice.operations.Test.MyClassPrxHolder;
-import test.Ice.operations.Test.MyDerivedClass;
-import test.Ice.operations.Test.MyDerivedClassPrxHelper;
-import test.Ice.operations.Test.MyEnum;
-import test.Ice.operations.Test.MyStruct;
-import test.Ice.operations.Test.MyEnumHolder;
-import test.Ice.operations.Test.MyStructMyEnumDHolder;
-import test.Ice.operations.Test.ShortIntDHolder;
-import test.Ice.operations.Test.ShortSHolder;
-import test.Ice.operations.Test.ShortSSHolder;
-import test.Ice.operations.Test.StringMyEnumDHolder;
-import test.Ice.operations.Test.MyEnumStringDHolder;
-import test.Ice.operations.Test.StringSHolder;
-import test.Ice.operations.Test.StringSSHolder;
-import test.Ice.operations.Test.StringSSSHolder;
-import test.Ice.operations.Test.StringStringDHolder;
-import test.Ice.operations.Test.Structure;
-import test.Ice.operations.Test.StructureHolder;
-
-class Twoways
-{
-    private static void
-    test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    static class PerThreadContextInvokeThread extends Thread
-    {
-        public PerThreadContextInvokeThread(MyClassPrx proxy)
-        {
-            _proxy = proxy;
-        }
-
-        @Override
-        public void
-        run()
-        {
-            java.util.Map<String, String> ctx = _proxy.ice_getCommunicator().getImplicitContext().getContext();
-            test(ctx.isEmpty());
-            ctx.put("one", "ONE");
-            _proxy.ice_getCommunicator().getImplicitContext().setContext(ctx);
-            test(_proxy.opContext().equals(ctx));
-        }
-
-        final private MyClassPrx _proxy;
-    }
-
-    static void
-    twoways(test.Util.Application app, MyClassPrx p)
-    {
-        Ice.Communicator communicator = app.communicator();
-
-        p.ice_ping();
-
-        test(p.ice_isA(MyClass.ice_staticId()));
-
-        test(p.ice_id().equals(MyDerivedClass.ice_staticId()));
-
-	test(MyDerivedClassPrxHelper.ice_staticId().equals(MyDerivedClass.ice_staticId()));
-	test(Ice.ObjectPrxHelper.ice_staticId().equals(Ice.Object.ice_staticId));
-	test(Ice.LocatorPrxHelper.ice_staticId().equals(Ice.Locator.ice_staticId));
-
-        {
-            String[] ids = p.ice_ids();
-            test(ids.length == 3);
-            test(ids[0].equals("::Ice::Object"));
-            test(ids[1].equals("::Test::MyClass"));
-            test(ids[2].equals("::Test::MyDerivedClass"));
-        }
-
-        {
-            p.opVoid();
-        }
-
-        {
-            Ice.ByteHolder b = new Ice.ByteHolder();
-            byte r;
-
-            r = p.opByte((byte)0xff, (byte)0x0f, b);
-            test(b.value == (byte)0xf0);
-            test(r == (byte)0xff);
-        }
-
-        {
-            Ice.BooleanHolder b = new Ice.BooleanHolder();
-            boolean r;
-
-            r = p.opBool(true, false, b);
-            test(b.value);
-            test(!r);
-        }
-
-        {
-            Ice.ShortHolder s = new Ice.ShortHolder();
-            Ice.IntHolder i = new Ice.IntHolder();
-            Ice.LongHolder l = new Ice.LongHolder();
-            long r;
-
-            r = p.opShortIntLong((short)10, 11, 12L, s, i, l);
-            test(s.value == 10);
-            test(i.value == 11);
-            test(l.value == 12);
-            test(r == 12L);
-
-            r = p.opShortIntLong(Short.MIN_VALUE, Integer.MIN_VALUE,
-                                 Long.MIN_VALUE, s, i, l);
-            test(s.value == Short.MIN_VALUE);
-            test(i.value == Integer.MIN_VALUE);
-            test(l.value == Long.MIN_VALUE);
-            test(r == Long.MIN_VALUE);
-
-            r = p.opShortIntLong(Short.MAX_VALUE, Integer.MAX_VALUE,
-                                 Long.MAX_VALUE, s, i, l);
-            test(s.value == Short.MAX_VALUE);
-            test(i.value == Integer.MAX_VALUE);
-            test(l.value == Long.MAX_VALUE);
-            test(r == Long.MAX_VALUE);
-        }
-
-        {
-            Ice.FloatHolder f = new Ice.FloatHolder();
-            Ice.DoubleHolder d = new Ice.DoubleHolder();
-            double r;
-
-            r = p.opFloatDouble(3.14f, 1.1E10, f, d);
-            test(f.value == 3.14f);
-            test(d.value == 1.1E10);
-            test(r == 1.1E10);
-
-            r = p.opFloatDouble(Float.MIN_VALUE, Double.MIN_VALUE, f, d);
-            test(f.value == Float.MIN_VALUE);
-            test(d.value == Double.MIN_VALUE);
-            test(r == Double.MIN_VALUE);
-
-            r = p.opFloatDouble(Float.MAX_VALUE, Double.MAX_VALUE, f, d);
-            test(f.value == Float.MAX_VALUE);
-            test(d.value == Double.MAX_VALUE);
-            test(r == Double.MAX_VALUE);
-        }
-
-        {
-            Ice.StringHolder s = new Ice.StringHolder();
-            String r;
-
-            r = p.opString("hello", "world", s);
-            test(s.value.equals("world hello"));
-            test(r.equals("hello world"));
-        }
-
-        {
-            MyEnumHolder e = new MyEnumHolder();
-            MyEnum r;
-
-            r = p.opMyEnum(MyEnum.enum2, e);
-            test(e.value == MyEnum.enum2);
-            test(r == MyEnum.enum3);
-        }
-
-        {
-            MyClassPrxHolder c1 = new MyClassPrxHolder();
-            MyClassPrxHolder c2 = new MyClassPrxHolder();
-            MyClassPrx r;
-
-            r = p.opMyClass(p, c1, c2);
-            test(Ice.Util.proxyIdentityAndFacetCompare(c1.value, p) == 0);
-            test(Ice.Util.proxyIdentityAndFacetCompare(c2.value, p) != 0);
-            test(Ice.Util.proxyIdentityAndFacetCompare(r, p) == 0);
-            test(c1.value.ice_getIdentity().equals(communicator.stringToIdentity("test")));
-            test(c2.value.ice_getIdentity().equals(communicator.stringToIdentity("noSuchIdentity")));
-            test(r.ice_getIdentity().equals(communicator.stringToIdentity("test")));
-            r.opVoid();
-            c1.value.opVoid();
-            try
-            {
-                c2.value.opVoid();
-                test(false);
-            }
-            catch(Ice.ObjectNotExistException ex)
-            {
-            }
-
-            r = p.opMyClass(null, c1, c2);
-            test(c1.value == null);
-            test(c2.value != null);
-            test(Ice.Util.proxyIdentityAndFacetCompare(r, p) == 0);
-            r.opVoid();
-        }
-
-        {
-            Structure si1 = new Structure();
-            si1.p = p;
-            si1.e = MyEnum.enum3;
-            si1.s = new AnotherStruct();
-            si1.s.s = "abc";
-            Structure si2 = new Structure();
-            si2.p = null;
-            si2.e = MyEnum.enum2;
-            si2.s = new AnotherStruct();
-            si2.s.s = "def";
-
-            StructureHolder so = new StructureHolder();
-            Structure rso = p.opStruct(si1, si2, so);
-            test(rso.p == null);
-            test(rso.e == MyEnum.enum2);
-            test(rso.s.s.equals("def"));
-            test(so.value.p.equals(p));
-            test(so.value.e == MyEnum.enum3);
-            test(so.value.s.s.equals("a new string"));
-            so.value.p.opVoid();
-        }
-
-        {
-            final byte[] bsi1 =
-            {
-                (byte)0x01,
-                (byte)0x11,
-                (byte)0x12,
-                (byte)0x22
-            };
-            final byte[] bsi2 =
-            {
-                (byte)0xf1,
-                (byte)0xf2,
-                (byte)0xf3,
-                (byte)0xf4
-            };
-
-            ByteSHolder bso = new ByteSHolder();
-            byte[] rso;
-
-            rso = p.opByteS(bsi1, bsi2, bso);
-            test(bso.value.length == 4);
-            test(bso.value[0] == (byte)0x22);
-            test(bso.value[1] == (byte)0x12);
-            test(bso.value[2] == (byte)0x11);
-            test(bso.value[3] == (byte)0x01);
-            test(rso.length == 8);
-            test(rso[0] == (byte)0x01);
-            test(rso[1] == (byte)0x11);
-            test(rso[2] == (byte)0x12);
-            test(rso[3] == (byte)0x22);
-            test(rso[4] == (byte)0xf1);
-            test(rso[5] == (byte)0xf2);
-            test(rso[6] == (byte)0xf3);
-            test(rso[7] == (byte)0xf4);
-        }
-
-        {
-            final boolean[] bsi1 = { true, true, false };
-            final boolean[] bsi2 = { false };
-
-            BoolSHolder bso = new BoolSHolder();
-            boolean[] rso;
-
-            rso = p.opBoolS(bsi1, bsi2, bso);
-            test(bso.value.length == 4);
-            test(bso.value[0]);
-            test(bso.value[1]);
-            test(!bso.value[2]);
-            test(!bso.value[3]);
-            test(rso.length == 3);
-            test(!rso[0]);
-            test(rso[1]);
-            test(rso[2]);
-        }
-
-        {
-            final short[] ssi = { 1, 2, 3 };
-            final int[] isi = { 5, 6, 7, 8 };
-            final long[] lsi = { 10, 30, 20 };
-
-            ShortSHolder sso = new ShortSHolder();
-            IntSHolder iso = new IntSHolder();
-            LongSHolder lso = new LongSHolder();
-            long[] rso;
-
-            rso = p.opShortIntLongS(ssi, isi, lsi, sso, iso, lso);
-            test(sso.value.length == 3);
-            test(sso.value[0] == 1);
-            test(sso.value[1] == 2);
-            test(sso.value[2] == 3);
-            test(iso.value.length == 4);
-            test(iso.value[0] == 8);
-            test(iso.value[1] == 7);
-            test(iso.value[2] == 6);
-            test(iso.value[3] == 5);
-            test(lso.value.length == 6);
-            test(lso.value[0] == 10);
-            test(lso.value[1] == 30);
-            test(lso.value[2] == 20);
-            test(lso.value[3] == 10);
-            test(lso.value[4] == 30);
-            test(lso.value[5] == 20);
-            test(rso.length == 3);
-            test(rso[0] == 10);
-            test(rso[1] == 30);
-            test(rso[2] == 20);
-        }
-
-        {
-            final float[] fsi = { 3.14f, 1.11f };
-            final double[] dsi = { 1.1E10, 1.2E10, 1.3E10 };
-
-            FloatSHolder fso = new FloatSHolder();
-            DoubleSHolder dso = new DoubleSHolder();
-            double[] rso;
-
-            rso = p.opFloatDoubleS(fsi, dsi, fso, dso);
-            test(fso.value.length == 2);
-            test(fso.value[0] == 3.14f);
-            test(fso.value[1] == 1.11f);
-            test(dso.value.length == 3);
-            test(dso.value[0] == 1.3E10);
-            test(dso.value[1] == 1.2E10);
-            test(dso.value[2] == 1.1E10);
-            test(rso.length == 5);
-            test(rso[0] == 1.1E10);
-            test(rso[1] == 1.2E10);
-            test(rso[2] == 1.3E10);
-            test((float)rso[3] == 3.14f);
-            test((float)rso[4] == 1.11f);
-        }
-
-        {
-            final String[] ssi1 = { "abc", "de", "fghi" };
-            final String[] ssi2 = { "xyz" };
-
-            StringSHolder sso = new StringSHolder();
-            String[] rso;
-
-            rso = p.opStringS(ssi1, ssi2, sso);
-            test(sso.value.length == 4);
-            test(sso.value[0].equals("abc"));
-            test(sso.value[1].equals("de"));
-            test(sso.value[2].equals("fghi"));
-            test(sso.value[3].equals("xyz"));
-            test(rso.length == 3);
-            test(rso[0].equals("fghi"));
-            test(rso[1].equals("de"));
-            test(rso[2].equals("abc"));
-        }
-
-        {
-            final byte[][] bsi1 =
-            {
-                { (byte)0x01, (byte)0x11, (byte)0x12 },
-                { (byte)0xff }
-            };
-            final byte[][] bsi2 =
-            {
-                { (byte)0x0e },
-                { (byte)0xf2, (byte)0xf1 }
-            };
-
-            ByteSSHolder bso = new ByteSSHolder();
-            byte[][] rso;
-
-            rso = p.opByteSS(bsi1, bsi2, bso);
-            test(bso.value.length == 2);
-            test(bso.value[0].length == 1);
-            test(bso.value[0][0] == (byte)0xff);
-            test(bso.value[1].length == 3);
-            test(bso.value[1][0] == (byte)0x01);
-            test(bso.value[1][1] == (byte)0x11);
-            test(bso.value[1][2] == (byte)0x12);
-            test(rso.length == 4);
-            test(rso[0].length == 3);
-            test(rso[0][0] == (byte)0x01);
-            test(rso[0][1] == (byte)0x11);
-            test(rso[0][2] == (byte)0x12);
-            test(rso[1].length == 1);
-            test(rso[1][0] == (byte)0xff);
-            test(rso[2].length == 1);
-            test(rso[2][0] == (byte)0x0e);
-            test(rso[3].length == 2);
-            test(rso[3][0] == (byte)0xf2);
-            test(rso[3][1] == (byte)0xf1);
-        }
-
-        {
-            final boolean[][] bsi1 =
-                {
-                    { true },
-                    { false },
-                    { true, true}
-                };
-
-            final boolean[][] bsi2 =
-                {
-                    { false, false, true }
-                };
-
-            BoolSSHolder bso = new BoolSSHolder();
-            boolean [][] rso;
-
-            rso = p.opBoolSS(bsi1, bsi2, bso);
-            test(bso.value.length == 4);
-            test(bso.value[0].length == 1);
-            test(bso.value[0][0]);
-            test(bso.value[1].length == 1);
-            test(!bso.value[1][0]);
-            test(bso.value[2].length == 2);
-            test(bso.value[2][0]);
-            test(bso.value[2][1]);
-            test(bso.value[3].length == 3);
-            test(!bso.value[3][0]);
-            test(!bso.value[3][1]);
-            test(bso.value[3][2]);
-            test(rso.length == 3);
-            test(rso[0].length == 2);
-            test(rso[0][0]);
-            test(rso[0][1]);
-            test(rso[1].length == 1);
-            test(!rso[1][0]);
-            test(rso[2].length == 1);
-            test(rso[2][0]);
-        }
-
-        {
-            final short[][] ssi=
-                {
-                    {1, 2, 5},
-                    {13},
-                    {}
-                };
-            final int[][] isi =
-                {
-                    {24, 98},
-                    {42}
-                };
-            final long[][] lsi =
-                {
-                    {496, 1729},
-                };
-
-            ShortSSHolder sso = new ShortSSHolder();
-            IntSSHolder iso = new IntSSHolder();
-            LongSSHolder lso = new LongSSHolder();
-            long[][] rso;
-
-            rso = p.opShortIntLongSS(ssi, isi, lsi, sso, iso, lso);
-            test(rso.length == 1);
-            test(rso[0].length == 2);
-            test(rso[0][0] == 496);
-            test(rso[0][1] == 1729);
-            test(sso.value.length == 3);
-            test(sso.value[0].length == 3);
-            test(sso.value[0][0] == 1);
-            test(sso.value[0][1] == 2);
-            test(sso.value[0][2] == 5);
-            test(sso.value[1].length == 1);
-            test(sso.value[1][0] == 13);
-            test(sso.value[2].length == 0);
-            test(iso.value.length == 2);
-            test(iso.value[0].length == 1);
-            test(iso.value[0][0] == 42);
-            test(iso.value[1].length == 2);
-            test(iso.value[1][0] == 24);
-            test(iso.value[1][1] == 98);
-            test(lso.value.length == 2);
-            test(lso.value[0].length == 2);
-            test(lso.value[0][0] == 496);
-            test(lso.value[0][1] == 1729);
-            test(lso.value[1].length == 2);
-            test(lso.value[1][0] == 496);
-            test(lso.value[1][1] == 1729);
-        }
-
-        {
-            final float[][] fsi =
-            {
-                { 3.14f },
-                { 1.11f },
-                { },
-            };
-            final double[][] dsi =
-            {
-                { 1.1E10, 1.2E10, 1.3E10 }
-            };
-
-            FloatSSHolder fso = new FloatSSHolder();
-            DoubleSSHolder dso = new DoubleSSHolder();
-            double[][] rso;
-
-            rso = p.opFloatDoubleSS(fsi, dsi, fso, dso);
-            test(fso.value.length == 3);
-            test(fso.value[0].length == 1);
-            test(fso.value[0][0] == 3.14f);
-            test(fso.value[1].length == 1);
-            test(fso.value[1][0] == 1.11f);
-            test(fso.value[2].length == 0);
-            test(dso.value.length == 1);
-            test(dso.value[0].length == 3);
-            test(dso.value[0][0] == 1.1E10);
-            test(dso.value[0][1] == 1.2E10);
-            test(dso.value[0][2] == 1.3E10);
-            test(rso.length == 2);
-            test(rso[0].length == 3);
-            test(rso[0][0] == 1.1E10);
-            test(rso[0][1] == 1.2E10);
-            test(rso[0][2] == 1.3E10);
-            test(rso[1].length == 3);
-            test(rso[1][0] == 1.1E10);
-            test(rso[1][1] == 1.2E10);
-            test(rso[1][2] == 1.3E10);
-        }
-
-        {
-            final String[][] ssi1 =
-            {
-                { "abc" },
-                { "de", "fghi" }
-            };
-            final String[][] ssi2 =
-            {
-                { },
-                { },
-                { "xyz" }
-            };
-
-            StringSSHolder sso = new StringSSHolder();
-            String[][] rso;
-
-            rso = p.opStringSS(ssi1, ssi2, sso);
-            test(sso.value.length == 5);
-            test(sso.value[0].length == 1);
-            test(sso.value[0][0].equals("abc"));
-            test(sso.value[1].length == 2);
-            test(sso.value[1][0].equals("de"));
-            test(sso.value[1][1].equals("fghi"));
-            test(sso.value[2].length == 0);
-            test(sso.value[3].length == 0);
-            test(sso.value[4].length == 1);
-            test(sso.value[4][0].equals("xyz"));
-            test(rso.length == 3);
-            test(rso[0].length == 1);
-            test(rso[0][0].equals("xyz"));
-            test(rso[1].length == 0);
-            test(rso[2].length == 0);
-        }
-
-        {
-            final String[][][] sssi1 =
-            {
-                {
-                    {
-                        "abc", "de"
-                    },
-                    {
-                        "xyz"
-                    }
-                },
-                {
-                    {
-                        "hello"
-                    }
-                }
-            };
-
-            final String[][][] sssi2 =
-            {
-                {
-                    {
-                        "", ""
-                    },
-                    {
-                        "abcd"
-                    }
-                },
-                {
-                    {
-                        ""
-                    }
-                },
-                {
-                }
-            };
-
-            StringSSSHolder ssso = new StringSSSHolder();
-            String rsso[][][];
-
-            rsso = p.opStringSSS(sssi1, sssi2, ssso);
-            test(ssso.value.length == 5);
-            test(ssso.value[0].length == 2);
-            test(ssso.value[0][0].length == 2);
-            test(ssso.value[0][1].length == 1);
-            test(ssso.value[1].length == 1);
-            test(ssso.value[1][0].length == 1);
-            test(ssso.value[2].length == 2);
-            test(ssso.value[2][0].length == 2);
-            test(ssso.value[2][1].length == 1);
-            test(ssso.value[3].length == 1);
-            test(ssso.value[3][0].length == 1);
-            test(ssso.value[4].length == 0);
-            test(ssso.value[0][0][0].equals("abc"));
-            test(ssso.value[0][0][1].equals("de"));
-            test(ssso.value[0][1][0].equals("xyz"));
-            test(ssso.value[1][0][0].equals("hello"));
-            test(ssso.value[2][0][0].equals(""));
-            test(ssso.value[2][0][1].equals(""));
-            test(ssso.value[2][1][0].equals("abcd"));
-            test(ssso.value[3][0][0].equals(""));
-
-            test(rsso.length == 3);
-            test(rsso[0].length == 0);
-            test(rsso[1].length == 1);
-            test(rsso[1][0].length == 1);
-            test(rsso[2].length == 2);
-            test(rsso[2][0].length == 2);
-            test(rsso[2][1].length == 1);
-            test(rsso[1][0][0].equals(""));
-            test(rsso[2][0][0].equals(""));
-            test(rsso[2][0][1].equals(""));
-            test(rsso[2][1][0].equals("abcd"));
-        }
-
-        {
-            java.util.Map<Byte, Boolean> di1 = new java.util.HashMap<Byte, Boolean>();
-            di1.put((byte)10, Boolean.TRUE);
-            di1.put((byte)100, Boolean.FALSE);
-            java.util.Map<Byte, Boolean> di2 = new java.util.HashMap<Byte, Boolean>();
-            di2.put((byte)10, Boolean.TRUE);
-            di2.put((byte)11, Boolean.FALSE);
-            di2.put((byte)101, Boolean.TRUE);
-
-            ByteBoolDHolder _do = new ByteBoolDHolder();
-            java.util.Map<Byte, Boolean> ro = p.opByteBoolD(di1, di2, _do);
-
-            test(_do.value.equals(di1));
-            test(ro.size() == 4);
-            test(ro.get((byte)10).booleanValue() == true);
-            test(ro.get((byte)11).booleanValue() == false);
-            test(ro.get((byte)100).booleanValue() == false);
-            test(ro.get((byte)101).booleanValue() == true);
-        }
-
-        {
-            java.util.Map<Short, Integer> di1 = new java.util.HashMap<Short, Integer>();
-            di1.put((short)110, -1);
-            di1.put((short)1100, 123123);
-            java.util.Map<Short, Integer> di2 = new java.util.HashMap<Short, Integer>();
-            di2.put((short)110, -1);
-            di2.put((short)111, -100);
-            di2.put((short)1101, 0);
-
-            ShortIntDHolder _do = new ShortIntDHolder();
-            java.util.Map<Short, Integer> ro = p.opShortIntD(di1, di2, _do);
-
-            test(_do.value.equals(di1));
-            test(ro.size() == 4);
-            test(ro.get((short)110).intValue() == -1);
-            test(ro.get((short)111).intValue() == -100);
-            test(ro.get((short)1100).intValue() == 123123);
-            test(ro.get((short)1101).intValue() == 0);
-        }
-
-        {
-            java.util.Map<Long, Float> di1 = new java.util.HashMap<Long, Float>();
-            di1.put(999999110L, new Float(-1.1f));
-            di1.put(999999111L, new Float(123123.2f));
-            java.util.Map<Long, Float> di2 = new java.util.HashMap<Long, Float>();
-            di2.put(999999110L, new Float(-1.1f));
-            di2.put(999999120L, new Float(-100.4f));
-            di2.put(999999130L, new Float(0.5f));
-
-            LongFloatDHolder _do = new LongFloatDHolder();
-            java.util.Map<Long, Float> ro = p.opLongFloatD(di1, di2, _do);
-
-            test(_do.value.equals(di1));
-            test(ro.size() == 4);
-            test(ro.get(999999110L).floatValue() == -1.1f);
-            test(ro.get(999999120L).floatValue() == -100.4f);
-            test(ro.get(999999111L).floatValue() == 123123.2f);
-            test(ro.get(999999130L).floatValue() == 0.5f);
-        }
-
-        {
-            java.util.Map<String, String> di1 = new java.util.HashMap<String, String>();
-            di1.put("foo", "abc -1.1");
-            di1.put("bar", "abc 123123.2");
-            java.util.Map<String, String> di2 = new java.util.HashMap<String, String>();
-            di2.put("foo", "abc -1.1");
-            di2.put("FOO", "abc -100.4");
-            di2.put("BAR", "abc 0.5");
-
-            StringStringDHolder _do = new StringStringDHolder();
-            java.util.Map<String, String> ro = p.opStringStringD(di1, di2, _do);
-
-            test(_do.value.equals(di1));
-            test(ro.size() == 4);
-            test(ro.get("foo").equals("abc -1.1"));
-            test(ro.get("FOO").equals("abc -100.4"));
-            test(ro.get("bar").equals("abc 123123.2"));
-            test(ro.get("BAR").equals("abc 0.5"));
-        }
-
-        {
-            java.util.Map<String, MyEnum> di1 = new java.util.HashMap<String, MyEnum>();
-            di1.put("abc", MyEnum.enum1);
-            di1.put("", MyEnum.enum2);
-            java.util.Map<String, MyEnum> di2 = new java.util.HashMap<String, MyEnum>();
-            di2.put("abc", MyEnum.enum1);
-            di2.put("qwerty", MyEnum.enum3);
-            di2.put("Hello!!", MyEnum.enum2);
-
-            StringMyEnumDHolder _do = new StringMyEnumDHolder();
-            java.util.Map<String, MyEnum> ro = p.opStringMyEnumD(di1, di2, _do);
-
-            test(_do.value.equals(di1));
-            test(ro.size() == 4);
-            test(ro.get("abc") == MyEnum.enum1);
-            test(ro.get("qwerty") == MyEnum.enum3);
-            test(ro.get("") == MyEnum.enum2);
-            test(ro.get("Hello!!") == MyEnum.enum2);
-        }
-
-        {
-            java.util.Map<MyEnum, String> di1 = new java.util.HashMap<MyEnum, String>();
-            di1.put(MyEnum.enum1, "abc");
-            java.util.Map<MyEnum, String> di2 = new java.util.HashMap<MyEnum, String>();
-            di2.put(MyEnum.enum2, "Hello!!");
-            di2.put(MyEnum.enum3, "qwerty");
-
-            MyEnumStringDHolder _do = new MyEnumStringDHolder();
-            java.util.Map<MyEnum, String> ro = p.opMyEnumStringD(di1, di2, _do);
-
-            test(_do.value.equals(di1));
-            test(ro.size() == 3);
-             test(ro.get(MyEnum.enum1).equals("abc"));
-            test(ro.get(MyEnum.enum2).equals("Hello!!"));
-            test(ro.get(MyEnum.enum3).equals("qwerty"));
-        }
-
-        {
-            MyStruct s11 = new MyStruct(1, 1);
-            MyStruct s12 = new MyStruct(1, 2);
-            java.util.Map<MyStruct, MyEnum> di1 = new java.util.HashMap<MyStruct, MyEnum>();
-            di1.put(s11, MyEnum.enum1);
-            di1.put(s12, MyEnum.enum2);
-
-            MyStruct s22 = new MyStruct(2, 2);
-            MyStruct s23 = new MyStruct(2, 3);
-            java.util.Map<MyStruct, MyEnum> di2 = new java.util.HashMap<MyStruct, MyEnum>();
-            di2.put(s11, MyEnum.enum1);
-            di2.put(s22, MyEnum.enum3);
-            di2.put(s23, MyEnum.enum2);
-
-            MyStructMyEnumDHolder _do = new MyStructMyEnumDHolder();
-            java.util.Map<MyStruct, MyEnum> ro = p.opMyStructMyEnumD(di1, di2, _do);
-
-            test(_do.value.equals(di1));
-            test(ro.size() == 4);
-            test(ro.get(s11) == MyEnum.enum1);
-            test(ro.get(s12) == MyEnum.enum2);
-            test(ro.get(s22) == MyEnum.enum3);
-            test(ro.get(s23) == MyEnum.enum2);
-        }
-
-        {
-            int[] lengths = { 0, 1, 2, 126, 127, 128, 129, 253, 254, 255, 256, 257, 1000 };
-
-            for(int l : lengths)
-            {
-                int[] s = new int[l];
-                for(int i = 0; i < l; ++i)
-                {
-                    s[i] = i;
-                }
-                int[] r = p.opIntS(s);
-                test(r.length == l);
-                for(int j = 0; j < r.length; ++j)
-                {
-                    test(r[j] == -j);
-                }
-            }
-        }
-
-        {
-            java.util.Map<String, String> ctx = new java.util.HashMap<String, String>();
-            ctx.put("one", "ONE");
-            ctx.put("two", "TWO");
-            ctx.put("three", "THREE");
-            {
-                test(p.ice_getContext().isEmpty());
-                java.util.Map<String, String> r = p.opContext();
-                test(!r.equals(ctx));
-            }
-            {
-                java.util.Map<String, String> r = p.opContext(ctx);
-                test(p.ice_getContext().isEmpty());
-                test(r.equals(ctx));
-            }
-            {
-                MyClassPrx p2 = MyClassPrxHelper.checkedCast(p.ice_context(ctx));
-                test(p2.ice_getContext().equals(ctx));
-                java.util.Map<String, String> r = p2.opContext();
-                test(r.equals(ctx));
-                r = p2.opContext(ctx);
-                test(r.equals(ctx));
-            }
-        }
-        {
-            //
-            // Test implicit context propagation
-            //
-
-            String[] impls = {"Shared", "PerThread"};
-            for(int i = 0; i < 2; i++)
-            {
-                Ice.InitializationData initData = new Ice.InitializationData();
-                initData.properties = communicator.getProperties()._clone();
-                initData.properties.setProperty("Ice.ImplicitContext", impls[i]);
-
-                Ice.Communicator ic = app.initialize(initData);
-
-                java.util.Map<String, String> ctx = new java.util.HashMap<String, String>();
-                ctx.put("one", "ONE");
-                ctx.put("two", "TWO");
-                ctx.put("three", "THREE");
-
-                MyClassPrx p3 = MyClassPrxHelper.uncheckedCast(ic.stringToProxy("test:default -p 12010"));
-
-                ic.getImplicitContext().setContext(ctx);
-                test(ic.getImplicitContext().getContext().equals(ctx));
-                test(p3.opContext().equals(ctx));
-
-                test(ic.getImplicitContext().containsKey("zero") == false);
-                String r = ic.getImplicitContext().put("zero", "ZERO");
-                test(r.equals(""));
-                test(ic.getImplicitContext().containsKey("zero") == true);
-                test(ic.getImplicitContext().get("zero").equals("ZERO"));
-
-                ctx = ic.getImplicitContext().getContext();
-                test(p3.opContext().equals(ctx));
-
-                java.util.Map<String, String> prxContext = new java.util.HashMap<String, String>();
-                prxContext.put("one", "UN");
-                prxContext.put("four", "QUATRE");
-
-                java.util.Map<String, String> combined = new java.util.HashMap<String, String>(ctx);
-                combined.putAll(prxContext);
-                test(combined.get("one").equals("UN"));
-
-                p3 = MyClassPrxHelper.uncheckedCast(p3.ice_context(prxContext));
-
-                ic.getImplicitContext().setContext(null);
-                test(p3.opContext().equals(prxContext));
-
-                ic.getImplicitContext().setContext(ctx);
-                test(p3.opContext().equals(combined));
-
-                test(ic.getImplicitContext().remove("one").equals("ONE"));
-
-                if(impls[i].equals("PerThread"))
-                {
-                    Thread thread = new PerThreadContextInvokeThread(
-                        MyClassPrxHelper.uncheckedCast(p3.ice_context(null)));
-                    thread.start();
-                    try
-                    {
-                        thread.join();
-                    }
-                    catch(InterruptedException ex)
-                    {
-                    }
-                }
-
-                ic.destroy();
-            }
-        }
-
-        {
-            double d = 1278312346.0 / 13.0;
-            double[] ds = new double[5];
-            for(int i = 0; i < 5; i++)
-            {
-                ds[i] = d;
-            }
-            p.opDoubleMarshaling(d, ds);
-        }
-
-        p.opIdempotent();
-
-        p.opNonmutating();
-    }
-}