diff options
author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-12-19 04:17:14 +0000 |
---|---|---|
committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-12-19 04:17:14 +0000 |
commit | 59449b53678b5be2a8e8b418c0e68da24b78daa6 (patch) | |
tree | f025c805c0358b37efd33d132d853d660ffed568 /TAO | |
parent | 0bfd4b330d9c2b9ae06de95914980838322b8db9 (diff) | |
download | ATCD-59449b53678b5be2a8e8b418c0e68da24b78daa6.tar.gz |
ChangeLogTag: Sat Dec 18 20:08:53 2004 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/ChangeLog | 9 | ||||
-rw-r--r-- | TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp | 17 |
2 files changed, 22 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 80dacd82f47..713c5e15b2c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Sat Dec 18 20:08:53 2004 J.T. Conklin <jtc@acorntoolworks.com> + + * orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp: + + Changed BasicLog_Test::test_log_destroy() to explicitly catch + CORBA::OBJECT_NOT_EXIST, the expected results of this test; and + to invoke ACE_PRINT_EXCEPTION() for unexpected exceptions only. + This avoids false positives on the nightly scoreboard. + Sat Dec 18 09:56:04 2004 Olli Savia <ops@iki.fi> * tao/Exception.h: diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp index 19c821d82a5..164156eed32 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp @@ -621,7 +621,8 @@ BasicLog_Test::destroy_log() ACE_ENDTRY; } -int BasicLog_Test::test_log_destroy (void) +int +BasicLog_Test::test_log_destroy (void) { ACE_DEBUG ((LM_ERROR, "Testing destroy log\n")); @@ -633,16 +634,24 @@ int BasicLog_Test::test_log_destroy (void) ACE_TRY_CHECK; ACE_DEBUG ((LM_INFO, "Wrote to log\n")); } + ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) + { + ACE_DEBUG ((LM_ERROR, + "Test of destroy log succeeded: " + "caught CORBA::OBJECT_NOT_EXIST exception.\n")); + return 0; + } ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Destroying log"); ACE_DEBUG ((LM_ERROR, - "Test of destroy log succeeded and caught exception.\n")); - return 0; + "Test of destroy log failed: " + "caught unexpected exception.\n")); + return -1; } ACE_ENDTRY; ACE_ERROR_RETURN ((LM_ERROR, - "Test of destroy log failed and no exception thrown.\n"), + "Test of destroy log failed: no exception thrown.\n"), -1); } |