summaryrefslogtreecommitdiff
path: root/java/test/Ice/facets/AllTests.java
diff options
context:
space:
mode:
Diffstat (limited to 'java/test/Ice/facets/AllTests.java')
-rw-r--r--java/test/Ice/facets/AllTests.java26
1 files changed, 13 insertions, 13 deletions
diff --git a/java/test/Ice/facets/AllTests.java b/java/test/Ice/facets/AllTests.java
index 9a158a54928..0afcf68b445 100644
--- a/java/test/Ice/facets/AllTests.java
+++ b/java/test/Ice/facets/AllTests.java
@@ -26,20 +26,20 @@ public class AllTests
System.out.print("testing facet registration exceptions... ");
Ice.ObjectAdapter adapter = communicator.createObjectAdapter("FacetExceptionTestAdapter");
Ice.Object obj = new EmptyI();
- adapter.add(obj, Ice.Util.stringToIdentity("d"));
- adapter.addFacet(obj, Ice.Util.stringToIdentity("d"), "facetABCD");
+ adapter.add(obj, communicator.stringToIdentity("d"));
+ adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD");
try
{
- adapter.addFacet(obj, Ice.Util.stringToIdentity("d"), "facetABCD");
+ adapter.addFacet(obj, communicator.stringToIdentity("d"), "facetABCD");
test(false);
}
catch(Ice.AlreadyRegisteredException ex)
{
}
- adapter.removeFacet(Ice.Util.stringToIdentity("d"), "facetABCD");
+ adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD");
try
{
- adapter.removeFacet(Ice.Util.stringToIdentity("d"), "facetABCD");
+ adapter.removeFacet(communicator.stringToIdentity("d"), "facetABCD");
test(false);
}
catch(Ice.NotRegisteredException ex)
@@ -50,25 +50,25 @@ public class AllTests
System.out.print("testing removeAllFacets... ");
Ice.Object obj1 = new EmptyI();
Ice.Object obj2 = new EmptyI();
- adapter.addFacet(obj1, Ice.Util.stringToIdentity("id1"), "f1");
- adapter.addFacet(obj2, Ice.Util.stringToIdentity("id1"), "f2");
+ adapter.addFacet(obj1, communicator.stringToIdentity("id1"), "f1");
+ adapter.addFacet(obj2, communicator.stringToIdentity("id1"), "f2");
Ice.Object obj3 = new EmptyI();
- adapter.addFacet(obj1, Ice.Util.stringToIdentity("id2"), "f1");
- adapter.addFacet(obj2, Ice.Util.stringToIdentity("id2"), "f2");
- adapter.addFacet(obj3, Ice.Util.stringToIdentity("id2"), "");
- java.util.Map fm = adapter.removeAllFacets(Ice.Util.stringToIdentity("id1"));
+ adapter.addFacet(obj1, communicator.stringToIdentity("id2"), "f1");
+ adapter.addFacet(obj2, communicator.stringToIdentity("id2"), "f2");
+ adapter.addFacet(obj3, communicator.stringToIdentity("id2"), "");
+ java.util.Map fm = adapter.removeAllFacets(communicator.stringToIdentity("id1"));
test(fm.size() == 2);
test(fm.get("f1") == obj1);
test(fm.get("f2") == obj2);
try
{
- adapter.removeAllFacets(Ice.Util.stringToIdentity("id1"));
+ adapter.removeAllFacets(communicator.stringToIdentity("id1"));
test(false);
}
catch(Ice.NotRegisteredException ex)
{
}
- fm = adapter.removeAllFacets(Ice.Util.stringToIdentity("id2"));
+ fm = adapter.removeAllFacets(communicator.stringToIdentity("id2"));
test(fm.size() == 3);
test(fm.get("f1") == obj1);
test(fm.get("f2") == obj2);