align with C++ facet changes

1 files changed, 2 insertions, 67 deletions

diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java
index 295bd53db71..21d673c48dc 100644
--- a/java/test/Ice/exceptions/AllTests.java
+++ b/java/test/Ice/exceptions/AllTests.java
@@ -165,51 +165,7 @@ public class AllTests
 	    }
 	    catch(Ice.FacetNotExistException ex)
 	    {
-		test(ex.facet.length == 1);
-		test(ex.facet[0].equals("no such facet"));
-	    }
-	    catch(Exception ex)
-	    {
-		test(false);
-	    }
-	    callback.called();
-	}
-
-	public void
-	ice_exception(Ice.UserException exc)
-	{
-	    test(false);
-	}
-
-	public boolean
-	check()
-	{
-	    return callback.check();
-	}
-
-	private Callback callback = new Callback();
-    }
-
-    private static class AMI_Thrower_throwAasAFacetNotExist2I extends AMI_Thrower_throwAasA
-    {
-	public void
-	ice_response()
-	{
-	    test(false);
-	}
-
-	public void
-	ice_exception(Ice.LocalException exc)
-	{
-	    try
-	    {
-		throw exc;
-	    }
-	    catch(Ice.FacetNotExistException ex)
-	    {
-		test(ex.facet.length == 2);
-		test(ex.facet[0].equals("no such facet"));
-		test(ex.facet[1].equals("no such facet either"));
+		test(ex.facet.equals("no such facet"));
 	    }
 	    catch(Exception ex)
 	    {
@@ -1042,21 +998,7 @@ public class AllTests
 	    }
 	    catch(Ice.FacetNotExistException ex)
 	    {
-		test(ex.facet.length == 1);
-		test(ex.facet[0].equals("no such facet"));
-	    }
-
-	    ThrowerPrx thrower3 = ThrowerPrxHelper.uncheckedCast(thrower2, "no such facet either");
-	    try
-	    {
-		thrower3.ice_ping();
-		test(false);
-	    }
-	    catch(Ice.FacetNotExistException ex)
-	    {
-		test(ex.facet.length == 2);
-		test(ex.facet[0].equals("no such facet"));
-		test(ex.facet[1].equals("no such facet either"));
+		test(ex.facet.equals("no such facet"));
 	    }
 	}
         catch(Exception ex)
@@ -1260,13 +1202,6 @@ public class AllTests
 		    thrower2.throwAasA_async(cb, 1);
 		    test(cb.check());
 		}
-		
-		ThrowerPrx thrower3 = ThrowerPrxHelper.uncheckedCast(thrower2, "no such facet either");
-		{
-		    AMI_Thrower_throwAasAFacetNotExist2I cb = new AMI_Thrower_throwAasAFacetNotExist2I();
-		    thrower3.throwAasA_async(cb, 1);
-		    test(cb.check());
-		}
 	    }
 	    catch(Exception ex)
 	    {