diff options
| author | msmit <msmit@remedy.nl> | 2010-04-15 09:33:40 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2010-04-15 09:33:40 +0000 |
| commit | 6ceba8a86b46c261419615d9ea8a6bf1546265de (patch) | |
| tree | 23f1315cf68c951f68250bd636dc6d2bdaba261c /CIAO/connectors/dds4ccm/tests/PSLDeadline | |
| parent | f02e75cf60e79e8bbcb3bae5b3463014097b0fd1 (diff) | |
| download | ATCD-6ceba8a86b46c261419615d9ea8a6bf1546265de.tar.gz | |
Thu Apr 15 09:30:30 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/impl/dds/DDS_Listen_T.cpp:
* connectors/dds4ccm/impl/dds/DataReaderListener_T.h:
* connectors/dds4ccm/impl/dds/DataReaderListener_T.cpp:
Resolved test issues regarding portstatuslisteners.
* connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp:
* connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp:
* connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml:
Layout and naming changes.
Diffstat (limited to 'CIAO/connectors/dds4ccm/tests/PSLDeadline')
3 files changed, 8 insertions, 12 deletions
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp index 3c627a906f8..4bd6294d5c8 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp @@ -60,9 +60,9 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl const ::CCM_DDS::ReadInfo & /* info */) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TestTopic_RawListener: ") - ACE_TEXT ("received test_topic_info for <%C> at %u\n"), - an_instance.key.in (), - an_instance.x)); + ACE_TEXT ("received test_topic_info for <%C> at %u\n"), + an_instance.key.in (), + an_instance.x)); } void @@ -174,14 +174,12 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl ::CCM_DDS::TestTopic::CCM_Listener_ptr Receiver_exec_i::get_info_out_data_listener (void) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n"))); return new TestTopic_RawListener_exec_i (); } ::CCM_DDS::CCM_PortStatusListener_ptr Receiver_exec_i::get_info_out_status (void) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n"))); return new PortStatusListener_exec_i (this->deadline_port_1_, this->deadline_port_2_, this->thread_id_listener_1_, @@ -192,7 +190,6 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl ::CCM_DDS::CCM_PortStatusListener_ptr Receiver_exec_i::get_info_get_status (void) { - ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n"))); return new PortStatusListener_exec_i (this->deadline_port_1_, this->deadline_port_2_, this->thread_id_listener_1_, diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp index 47d26cd2da8..7fef0ad29f2 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/Plan.cdp @@ -194,7 +194,7 @@ <kind>tk_string</kind> </type> <value> - <string>HelloTest_Library#Hello_Profile</string> + <string>Deadline_Library#Deadline_Profile</string> </value> </value> </configProperty> @@ -223,7 +223,7 @@ <kind>tk_string</kind> </type> <value> - <string>HelloTest_Library#Hello_Profile</string> + <string>Deadline_Library#Deadline_Profile</string> </value> </value> </configProperty> diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml index 509d006347f..37f1d6e8359 100644 --- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/USER_QOS_PROFILES.xml @@ -19,13 +19,13 @@ RTI Data Distribution Service user manual. A QoS library is a named set of QoS profiles. --> - <qos_library name="HelloTest_Library"> + <qos_library name="Deadline_Library"> <!-- QoS profile used to configure reliable communication between the DataWriter and DataReader created in the example code. A QoS profile groups a set of related QoS. --> - <qos_profile name="Hello_Profile" is_default_qos="true"> + <qos_profile name="Deadline_Profile" is_default_qos="true"> <!-- QoS used to configure the data writer created in the example code --> <datawriter_qos> <reliability> @@ -78,8 +78,7 @@ RTI Data Distribution Service user manual. <nanosec>0</nanosec> </period> </deadline> - </datareader_qos> - + </datareader_qos> </qos_profile> </qos_library> </dds>
\ No newline at end of file |