summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2014-08-19 13:07:39 -0230
committerJoe George <joe@zeroc.com>2014-08-19 13:11:15 -0230
commit27caa16af84911a7919f8667f028cb190fefd526 (patch)
tree860f49db52d544253dc59a2abbffab0c0b7ab09c /java
parentICE-3492 handle improper settings for timeout values (diff)
downloadice-27caa16af84911a7919f8667f028cb190fefd526.tar.bz2
ice-27caa16af84911a7919f8667f028cb190fefd526.tar.xz
ice-27caa16af84911a7919f8667f028cb190fefd526.zip
ICE-5633 - Fix missing Java exception test
Diffstat (limited to 'java')
-rw-r--r--java/test/Ice/exceptions/AllTests.java21
1 files changed, 17 insertions, 4 deletions
diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java
index eb561223bb6..282add94c37 100644
--- a/java/test/Ice/exceptions/AllTests.java
+++ b/java/test/Ice/exceptions/AllTests.java
@@ -1437,7 +1437,7 @@ public class AllTests
catch(Ice.IllegalIdentityException ex)
{
test(ex.id.name.equals(""));
- }
+ }
try
{
adapter.add(null, communicator.stringToIdentity("x"));
@@ -1446,7 +1446,7 @@ public class AllTests
catch(Ice.IllegalServantException ex)
{
}
-
+
adapter.remove(communicator.stringToIdentity("x"));
try
{
@@ -1787,7 +1787,7 @@ public class AllTests
ex.printStackTrace();
test(false);
}
-
+
try
{
thrower.end_throwMemoryLimitException(
@@ -2219,13 +2219,26 @@ public class AllTests
out.println("ok");
}
+ if(thrower.supportsAssertException())
+ {
+ out.print("catching assert in the server with new AMI mapping... ");
+ out.flush();
+
+ Callback_Thrower_throwAssertExceptionI cb = new Callback_Thrower_throwAssertExceptionI();
+ thrower.begin_throwAssertException(cb);
+ cb.check();
+
+ out.println("ok");
+ }
+
+
out.print("catching object not exist exception with new AMI mapping... ");
out.flush();
{
Ice.Identity id = communicator.stringToIdentity("does not exist");
ThrowerPrx thrower2 = ThrowerPrxHelper.uncheckedCast(thrower.ice_identity(id));
- AMI_Thrower_throwAasAObjectNotExistI cb = new AMI_Thrower_throwAasAObjectNotExistI(communicator);
+ Callback_Thrower_throwAasAObjectNotExistI cb = new Callback_Thrower_throwAasAObjectNotExistI(communicator);
thrower2.begin_throwAasA(1, cb);
cb.check();
}