diff options
Diffstat (limited to 'CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite')
2 files changed, 20 insertions, 46 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp index c11c0efe344..163fb3877b1 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.cpp @@ -53,8 +53,8 @@ namespace CIAO_WU_LateBinding_Sender_Impl else if (assingment == 1) { this->callback_.start_state_test (); - this->callback_.set_topic_name_writer (true); - this->callback_.set_topic_name_updater (true); + this->callback_.set_topic_name_writer (); + this->callback_.set_topic_name_updater (); } return 0; } @@ -139,7 +139,7 @@ namespace CIAO_WU_LateBinding_Sender_Impl } void - Sender_exec_i::set_topic_name_writer (bool test_non_changeable) + Sender_exec_i::set_topic_name_writer (void) { try { @@ -166,29 +166,16 @@ namespace CIAO_WU_LateBinding_Sender_Impl "Unable to narrow connector interface\n")); throw ::CORBA::INTERNAL (); } - if (test_non_changeable) - { - conn->topic_name ("LateBindingTopicSecondTime"); - ACE_ERROR ((LM_ERROR, "Sender_exec_i::set_topic_name_writer - " - "ERROR: No NonChangeable exception thrown.\n")); - } - else - { - conn->topic_name ("LateBindingTopic"); - } + conn->topic_name ("LateBindingTopic"); } catch (const ::CCM_DDS::NonChangeable &) { - if (test_non_changeable) - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_writer - " - "Expected NonChangeable caught.\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " - "Caught NonChangeable exception.\n")); - } + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_writer - " + "Caught NonChangeable exception.\n")); + } + catch (const ::CORBA::Exception &ex) + { + ex._tao_print_exception("ERROR: Sender_exec_i::set_topic_name_writer - "); } } @@ -234,7 +221,7 @@ namespace CIAO_WU_LateBinding_Sender_Impl } void - Sender_exec_i::set_topic_name_updater(bool test_non_changeable) + Sender_exec_i::set_topic_name_updater(void) { try { @@ -261,29 +248,16 @@ namespace CIAO_WU_LateBinding_Sender_Impl "Unable to narrow connector interface\n")); throw ::CORBA::INTERNAL (); } - if (test_non_changeable) - { - conn->topic_name ("LateBindingTopicSecondTime"); - ACE_ERROR ((LM_ERROR, "Sender_exec_i::set_topic_name_updater - " - "ERROR: No NonChangeable exception thrown.\n")); - } - else - { - conn->topic_name ("LateBindingTopic"); - } + conn->topic_name ("LateBindingTopic"); } catch (const ::CCM_DDS::NonChangeable &) { - if (test_non_changeable) - { - ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::set_topic_name_updater - " - "Expected NonChangeable caught.\n")); - } - else - { - ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " - "Caught NonChangeable exception.\n")); - } + ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::set_topic_name_updater - " + "Caught NonChangeable exception.\n")); + } + catch (const ::CORBA::Exception &ex) + { + ex._tao_print_exception("ERROR: Sender_exec_i::set_topic_name_writer - "); } } diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h index 345d9dba5db..499bbe90312 100644 --- a/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/LateBinding/UpdateWrite/Sender/WU_LateBinding_Sender_exec.h @@ -98,8 +98,8 @@ namespace CIAO_WU_LateBinding_Sender_Impl //@{ /** User defined public operations. */ - void set_topic_name_writer (bool test_non_changeable=false); - void set_topic_name_updater (bool test_non_changeable=false); + void set_topic_name_writer (void); + void set_topic_name_updater (void); void start_event_test (void); void start_state_test (void); //@} |