diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-08-27 08:14:22 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-08-27 08:14:22 +0000 |
commit | 6554bd621c59cfbc7aab62e74bc129c0e5bf4b88 (patch) | |
tree | de229b07c85f06f6d2f7bf249e414034e9d110c4 /CIAO/connectors/dds4ccm | |
parent | dda9ca7a1a21422301d397df3ceb654c8ea3161e (diff) | |
download | ATCD-6554bd621c59cfbc7aab62e74bc129c0e5bf4b88.tar.gz |
Diffstat (limited to 'CIAO/connectors/dds4ccm')
-rw-r--r-- | CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp index 4d906f83e7a..796d8429bc8 100644 --- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp @@ -1,5 +1,4 @@ // -*- C++ -*- -// // $Id$ //Test for on_unexpected_status with status LIVELINESS_CHANGED_STATUS' and 'SUBSCRIPTION_MATCHED_STATUS @@ -30,7 +29,6 @@ namespace CIAO_CSL_USTest_Receiver_Impl return 0; } - //============================================================ // ConnectorStatusListener_exec_i //============================================================ @@ -301,26 +299,22 @@ namespace CIAO_CSL_USTest_Receiver_Impl if (!this->subscription_matched_received_.value ()) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Didn't receive the expected ") - ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS'\n") - )); + ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS'\n"))); } else { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ") - ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS'\n") - )); + ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS'\n"))); } if (!this->liveliness_changed_received_.value ()) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Didn't receive the expected ") - ACE_TEXT ("'LIVELINESS_CHANGED_STATUS'\n") - )); + ACE_TEXT ("'LIVELINESS_CHANGED_STATUS'\n"))); } else { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ") - ACE_TEXT ("'LIVELINESS_CHANGED_STATUS' \n") - )); + ACE_TEXT ("'LIVELINESS_CHANGED_STATUS' \n"))); } char ccm_buf [65]; ACE_Thread_ID ccm_thread_id; @@ -350,7 +344,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: " "Thread switch for 'SUBSCRIPTION_MATCHED_STATUS' " "doesn't seem to work! " - "listener <%C> - component <%C>\n", + "listener <%C> - component <%C>\n", list_buf, ccm_buf)); } @@ -359,7 +353,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl { ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: 'SUBSCRIPTION_MATCHED_STATUS': " "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", + "listener <%C> - component <%C>\n", list_buf, ccm_buf)); } @@ -388,7 +382,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: " "Thread switch for 'LIVELINESS_CHANGED_STATUS' seems OK. " "(DDS uses the CCM thread for its callback) " - "listener <%C> - component <%C>\n", + "listener <%C> - component <%C>\n", list_buf_lc, ccm_buf)); } @@ -397,7 +391,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: " "Thread switch for 'LIVELINESS_CHANGED_STATUS' " "doesn't seem to work! " - "listener <%C> - component <%C>\n", + "listener <%C> - component <%C>\n", list_buf_lc, ccm_buf)); } @@ -406,7 +400,7 @@ namespace CIAO_CSL_USTest_Receiver_Impl { ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: 'LIVELINESS_CHANGED_STATUS': " "DDS seems to use a CCM thread for its callback: " - "listener <%C> - component <%C>\n", + "listener <%C> - component <%C>\n", list_buf_lc, ccm_buf)); } @@ -414,8 +408,8 @@ namespace CIAO_CSL_USTest_Receiver_Impl { ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: 'LIVELINESS_CHANGED_STATUS': " "DDS seems to use its own thread for its callback: " - "listener <%C> - component <%C>\n", - list_bu_lcf, + "listener <%C> - component <%C>\n", + list_buf_lc, ccm_buf)); } #endif |