diff options
3 files changed, 23 insertions, 14 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 2320831a295..2b75283d67f 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Jul 1 10:44:58 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: + * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp: + Replaced incorrect error messages. + Thu Jul 1 10:32:42 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * DAnCE/tests/Parsing/run_test.pl: diff --git a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp index f52e9ff4503..cff54919da4 100644 --- a/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/ContentFilteredTopic/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp @@ -419,9 +419,11 @@ namespace CIAO_ReadGet_Test_Receiver_Impl if (ACE_OS::atoi (filter->parameters[0]) != this->current_iter_value1_) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <%C> - ") - ACE_TEXT ("Unexpected query when retrieving filter: ") - ACE_TEXT ("expected <%C> - received <%C>\n"), - port, QUERY_GETTER_PORT, filter->expression.in ())); + ACE_TEXT ("Unexpected param value: ") + ACE_TEXT ("expected <%d> - received <%C>\n"), + port, + this->current_iter_value1_, + filter->parameters[0])); error = true; } } @@ -430,9 +432,10 @@ namespace CIAO_ReadGet_Test_Receiver_Impl if (ACE_OS::atoi (filter->parameters[1]) != this->current_iter_value2_) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver_exec_i::check_filter <%C> - ") - ACE_TEXT ("Unexpected query when retrieving filter: ") - ACE_TEXT ("expected <%C> - received <%C>\n"), - port, QUERY_GETTER_PORT, filter->expression.in ())); + ACE_TEXT ("Unexpected param value: ") + ACE_TEXT ("expected <%d> - received <%C>\n"), + port, this->current_iter_value2_, + filter->parameters[1])); error = true; } } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp index 13e5199e980..66c1d22114e 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/ReadGet_Test_Receiver_exec.cpp @@ -319,9 +319,10 @@ namespace CIAO_ReadGet_Test_Receiver_Impl if (ACE_OS::atoi (filter->parameters[0]) != this->current_min_iteration_) { ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Unexpected query when retrieving filter: " - "expected <%C> - received <%C>\n", - QUERY, filter->expression.in ())); + "Unexpected param value: " + "expected <%d> - received <%C>\n", + this->current_min_iteration_, + filter->parameters[0])); error = true; } } @@ -330,9 +331,10 @@ namespace CIAO_ReadGet_Test_Receiver_Impl if (ACE_OS::atoi (filter->parameters[1]) != this->current_max_iteration_) { ACE_ERROR ((LM_ERROR, "ERROR: Receiver_exec_i::check_filter - " - "Unexpected query when retrieving filter: " - "expected <%C> - received <%C>\n", - QUERY, filter->expression.in ())); + "Unexpected param value: " + "expected <%d> - received <%C>\n", + this->current_max_iteration_, + filter->parameters[1])); error = true; } } @@ -502,8 +504,6 @@ namespace CIAO_ReadGet_Test_Receiver_Impl void Receiver_exec_i::ccm_activate (void) { - this->context_->get_connection_get_port_fresh_data (); - ::ReadGet_Test::QueryConditionTestConnector::Getter_var getter = this->context_->get_connection_get_port_fresh_data (); DDS::Duration_t to; |