Fixed 4577 - CLASSPATH not correctly set for Java tests

3 files changed, 4 insertions, 15 deletions

diff --git a/java/test/Ice/slicing/exceptions/run.py b/java/test/Ice/slicing/exceptions/run.py
index e0259425ec7..97fc21ccbf0 100755
--- a/java/test/Ice/slicing/exceptions/run.py
+++ b/java/test/Ice/slicing/exceptions/run.py
@@ -24,8 +24,5 @@ print "tests with regular server."
 TestUtil.clientServerTest()
 
 print "tests with AMD server."
-import copy
-amdenv = copy.deepcopy(os.environ)
-TestUtil.addClasspath(os.path.join(os.getcwd(), "..", "exceptionsAMD", "classes"), amdenv)
-TestUtil.clientServerTest(serverenv = amdenv)
+TestUtil.clientServerTest(server="test.Ice.slicing.exceptions.AMDServer")
 
diff --git a/java/test/Ice/slicing/objects/AMDServer.java b/java/test/Ice/slicing/objects/AMDServer.java
index a012d08cbb1..c9b5d165718 100644
--- a/java/test/Ice/slicing/objects/AMDServer.java
+++ b/java/test/Ice/slicing/objects/AMDServer.java
@@ -17,6 +17,7 @@ public class AMDServer extends test.Util.Application
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
         Ice.Object object = new AMDTestI();
         adapter.add(object, communicator.stringToIdentity("Test"));
+        adapter.activate();
         return WAIT;
     }
 
diff --git a/java/test/Ice/slicing/objects/run.py b/java/test/Ice/slicing/objects/run.py
index c3c43a39e5e..9530d9a8cf2 100755
--- a/java/test/Ice/slicing/objects/run.py
+++ b/java/test/Ice/slicing/objects/run.py
@@ -20,18 +20,9 @@ if len(path) == 0:
 sys.path.append(os.path.join(path[0]))
 from scripts import *
 
-testdir = os.getcwd()
-testdirAMD = os.path.join(testdir, "..", "objectsAMD", "classes")
-
 print "tests with regular server."
-import copy
-serverenv = copy.deepcopy(os.environ)
-TestUtil.addClasspath(os.path.join(os.getcwd(), "sclasses"), serverenv)
-TestUtil.clientServerTest(serverenv = serverenv)
+TestUtil.clientServerTest()
 
 print "tests with AMD server."
-import copy
-amdenv = copy.deepcopy(os.environ)
-TestUtil.addClasspath(os.path.join(os.getcwd(), "..", "objectsAMD", "classes"), amdenv)
-TestUtil.clientServerTest(serverenv = amdenv)
+TestUtil.clientServerTest(server="test.Ice.slicing.objects.AMDServer")