Simplified operations test.

1 files changed, 3 insertions, 11 deletions

diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java
index 5b17140670f..27568f253be 100644
--- a/java/test/Ice/operations/Collocated.java
+++ b/java/test/Ice/operations/Collocated.java
@@ -14,17 +14,9 @@ public class Collocated
     {
         communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12345 -t 10000");
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new MyDerivedClassI(adapter, Ice.Util.stringToIdentity("test"));
-        adapter.add(object, Ice.Util.stringToIdentity("test"));
-
-	//
-	// Make a separate adapter with a servant locator. We use this to test
-	// that ::Ice::Context is correctly passed to checkedCast() operation.
-	//
-	communicator.getProperties().setProperty("CheckedCastAdapter.Endpoints", "default -p 12346 -t 10000");
-	adapter = communicator.createObjectAdapter("CheckedCastAdapter");
-	Ice.ServantLocator checkedCastLocator = new CheckedCastLocator();
-	adapter.addServantLocator(checkedCastLocator, "");
+        Ice.Identity id = Ice.Util.stringToIdentity("test");
+        adapter.add(new MyDerivedClassI(adapter, id), id);
+        adapter.add(new TestCheckedCastI(), Ice.Util.stringToIdentity("context"));
 
         AllTests.allTests(communicator, true);