More gradle changes.

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

1 files changed, 0 insertions, 374 deletions

diff --git a/java/test/Ice/servantLocator/AllTests.java b/java/test/Ice/servantLocator/AllTests.java
deleted file mode 100644
index 15273a5b687..00000000000
--- a/java/test/Ice/servantLocator/AllTests.java
+++ /dev/null
@@ -1,374 +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.servantLocator;
-
-import java.io.PrintWriter;
-
-import test.Ice.servantLocator.Test.TestImpossibleException;
-import test.Ice.servantLocator.Test.TestIntfUserException;
-import test.Ice.servantLocator.Test.TestIntfPrx;
-import test.Ice.servantLocator.Test.TestIntfPrxHelper;
-import test.Ice.servantLocator.Test.TestActivationPrx;
-import test.Ice.servantLocator.Test.TestActivationPrxHelper;
-
-import Ice.ObjectNotExistException;
-import Ice.ObjectPrx;
-import Ice.UnknownException;
-import Ice.UnknownLocalException;
-import Ice.UnknownUserException;
-
-public class AllTests
-{
-    private static void
-    test(boolean b)
-    {
-        if(!b)
-        {
-            throw new RuntimeException();
-        }
-    }
-
-    public static void
-    testExceptions(TestIntfPrx obj)
-    {
-        try
-        {
-            obj.requestFailedException();
-            test(false);
-        }
-        catch(ObjectNotExistException ex)
-        {
-            test(ex.id.equals(obj.ice_getIdentity()));
-            test(ex.facet.equals(obj.ice_getFacet()));
-            test(ex.operation.equals("requestFailedException"));
-        }
-
-        try
-        {
-            obj.unknownUserException();
-            test(false);
-        }
-        catch(UnknownUserException ex)
-        {
-            test(ex.unknown.equals("reason"));
-        }
-
-        try
-        {
-            obj.unknownLocalException();
-            test(false);
-        }
-        catch(UnknownLocalException ex)
-        {
-            test(ex.unknown.equals("reason"));
-        }
-
-        try
-        {
-            obj.unknownException();
-            test(false);
-        }
-        catch(UnknownException ex)
-        {
-            test(ex.unknown.equals("reason"));
-        }
-
-        //
-        // User exceptions are checked exceptions
-        //
-//      try
-//      {
-//          obj.userException();
-//          test(false);
-//      }
-//      catch(UnknownUserException ex)
-//      {
-//          //System.err.println(ex.unknown);
-//          test(!collocated);
-//          test(ex.unknown.equals("Test::TestIntfUserException"));
-//      }
-//      catch(TestIntfUserException ex)
-//      {
-//          test(collocated);
-//      }
-
-        try
-        {
-            obj.localException();
-            test(false);
-        }
-        catch(UnknownLocalException ex)
-        {
-            test(ex.unknown.indexOf("Ice::SocketException") >= 0);
-        }
-        catch(Throwable ex)
-        {
-            test(false);
-        }
-
-        try
-        {
-            obj.javaException();
-            test(false);
-        }
-        catch(UnknownException ex)
-        {
-            test(ex.unknown.indexOf("java.lang.RuntimeException: message") >= 0);
-        }
-        catch(Ice.OperationNotExistException ex)
-        {
-        }
-        catch(Throwable ex)
-        {
-            //System.err.println(ex);
-            test(false);
-        }
-
-        try
-        {
-            obj.unknownExceptionWithServantException();
-            test(false);
-        }
-        catch(UnknownException ex)
-        {
-            test(ex.unknown.equals("reason"));
-        }
-        catch(Throwable ex)
-        {
-            test(false);
-        }
-
-        try
-        {
-            obj.impossibleException(false);
-            test(false);
-        }
-        catch(UnknownUserException ex)
-        {
-            // Operation doesn't throw, but locate() and finished() throw TestIntfUserException.
-        }
-        catch(Throwable ex)
-        {
-            //System.err.println(ex);
-            test(false);
-        }
-
-        try
-        {
-            obj.impossibleException(true);
-            test(false);
-        }
-        catch(UnknownUserException ex)
-        {
-            // Operation throws TestImpossibleException, but locate() and finished() throw TestIntfUserException.
-        }
-        catch(Throwable ex)
-        {
-            //System.err.println(ex);
-            test(false);
-        }
-
-        try
-        {
-            obj.intfUserException(false);
-            test(false);
-        }
-        catch(TestImpossibleException ex)
-        {
-            // Operation doesn't throw, but locate() and finished() throw TestImpossibleException.
-        }
-        catch(Throwable ex)
-        {
-            //System.err.println(ex);
-            test(false);
-        }
-
-        try
-        {
-            obj.intfUserException(true);
-            test(false);
-        }
-        catch(TestImpossibleException ex)
-        {
-            // Operation throws TestIntfUserException, but locate() and finished() throw TestImpossibleException.
-        }
-        catch(Throwable ex)
-        {
-            //System.err.println(ex);
-            test(false);
-        }
-    }
-
-    public static TestIntfPrx
-    allTests(Ice.Communicator communicator, PrintWriter out)
-    {
-        out.print("testing stringToProxy... ");
-        out.flush();
-        String ref = "asm:default -p 12010";
-        Ice.ObjectPrx base = communicator.stringToProxy(ref);
-        test(base != null);
-        out.println("ok");
-
-        out.print("testing checked cast... ");
-        out.flush();
-        TestIntfPrx obj = TestIntfPrxHelper.checkedCast(base);
-        test(obj != null);
-        test(obj.equals(base));
-        out.println("ok");
-
-        out.print("testing ice_ids... ");
-        out.flush();
-        try
-        {
-            ObjectPrx o = communicator.stringToProxy("category/locate:default -p 12010");
-            o.ice_ids();
-            test(false);
-        }
-        catch(UnknownUserException ex)
-        {
-            test(ex.unknown.equals("Test::TestIntfUserException"));
-        }
-        catch(Throwable ex)
-        {
-            test(false);
-        }
-
-        try
-        {
-            ObjectPrx o = communicator.stringToProxy("category/finished:default -p 12010");
-            o.ice_ids();
-            test(false);
-        }
-        catch(UnknownUserException ex)
-        {
-            test(ex.unknown.equals("Test::TestIntfUserException"));
-        }
-        catch(Throwable ex)
-        {
-            test(false);
-        }
-        out.println("ok");
-
-        out.print("testing servant locator... ");
-        out.flush();
-        base = communicator.stringToProxy("category/locate:default -p 12010");
-        obj = TestIntfPrxHelper.checkedCast(base);
-        try
-        {
-            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("category/unknown:default -p 12010"));
-        }
-        catch(ObjectNotExistException ex)
-        {
-        }
-        out.println("ok");
-
-        out.print("testing default servant locator... ");
-        out.flush();
-        base = communicator.stringToProxy("anothercat/locate:default -p 12010");
-        obj = TestIntfPrxHelper.checkedCast(base);
-        base = communicator.stringToProxy("locate:default -p 12010");
-        obj = TestIntfPrxHelper.checkedCast(base);
-        try
-        {
-            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("anothercat/unknown:default -p 12010"));
-        }
-        catch(ObjectNotExistException ex)
-        {
-        }
-        try
-        {
-            TestIntfPrxHelper.checkedCast(communicator.stringToProxy("unknown:default -p 12010"));
-        }
-        catch(ObjectNotExistException ex)
-        {
-        }
-        out.println("ok");
-
-        out.print("testing locate exceptions... ");
-        out.flush();
-        base = communicator.stringToProxy("category/locate:default -p 12010");
-        obj = TestIntfPrxHelper.checkedCast(base);
-        testExceptions(obj);
-        out.println("ok");
-
-        out.print("testing finished exceptions... ");
-        out.flush();
-        base = communicator.stringToProxy("category/finished:default -p 12010");
-        obj = TestIntfPrxHelper.checkedCast(base);
-        testExceptions(obj);
-
-        //
-        // Only call these for category/finished.
-        //
-        try
-        {
-            obj.asyncResponse();
-        }
-        catch(TestIntfUserException ex)
-        {
-            test(false);
-        }
-        catch(TestImpossibleException ex)
-        {
-            //
-            // Called by finished().
-            //
-        }
-
-        //
-        // Only call these for category/finished.
-        //
-        try
-        {
-            obj.asyncException();
-        }
-        catch(TestIntfUserException ex)
-        {
-            test(false);
-        }
-        catch(TestImpossibleException ex)
-        {
-            //
-            // Called by finished().
-            //
-        }
-
-        out.println("ok");
-
-        out.print("testing servant locator removal... ");
-        out.flush();
-        base = communicator.stringToProxy("test/activation:default -p 12010");
-        TestActivationPrx activation = TestActivationPrxHelper.checkedCast(base);
-        activation.activateServantLocator(false);
-        try
-        {
-            obj.ice_ping();
-            test(false);
-        }
-        catch(ObjectNotExistException ex)
-        {
-            out.println("ok");
-        }
-        out.print("testing servant locator addition... ");
-        out.flush();
-        activation.activateServantLocator(true);
-        try
-        {
-            obj.ice_ping();
-            out.println("ok");
-        }
-        catch(Exception ex)
-        {
-            test(false);
-        }
-
-        return obj;
-    }
-}