summaryrefslogtreecommitdiff
path: root/TAO/tests/DSI_AMI_Gateway/client.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/DSI_AMI_Gateway/client.cpp')
-rw-r--r--TAO/tests/DSI_AMI_Gateway/client.cpp18
1 files changed, 14 insertions, 4 deletions
diff --git a/TAO/tests/DSI_AMI_Gateway/client.cpp b/TAO/tests/DSI_AMI_Gateway/client.cpp
index 4aa2aebab3f..cfa44654d4c 100644
--- a/TAO/tests/DSI_AMI_Gateway/client.cpp
+++ b/TAO/tests/DSI_AMI_Gateway/client.cpp
@@ -161,7 +161,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
}
catch (const test_exception& ex)
{
- ex._tao_print_exception ("Client: exception caught - ");
+ if (test_user_exception == 1)
+ ACE_DEBUG ((LM_DEBUG,
+ "Client: caught expected user exception: %s\n",
+ ex._name()));
+ else
+ ex._tao_print_exception ("Client: exception caught - ");
ACE_DEBUG ((LM_DEBUG,
"error code: %d\n"
@@ -171,13 +176,18 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
ex.error_message.in (),
ex.status_message.in ()));
- return 0;
+ return test_user_exception == 1 ? 0 : 1;
}
catch (const CORBA::NO_PERMISSION& ex)
{
- ex._tao_print_exception ("Client: exception caught - ");
+ if (test_system_exception == 1)
+ ACE_DEBUG ((LM_DEBUG,
+ "Client: caught expected system exception: %s\n",
+ ex._name()));
+ else
+ ex._tao_print_exception ("Client: exception caught - ");
- return 0;
+ return test_system_exception == 1 ? 0 : 1;
}
catch (const CORBA::Exception& ex)
{