From f6af9fb65a13550683d46fcee9793f3b70539213 Mon Sep 17 00:00:00 2001 From: msmit Date: Fri, 4 Jun 2010 11:51:56 +0000 Subject: Fri Jun 4 11:47:58 UTC 2010 Marcel Smit * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QFLE_Test_Base.idl: * connectors/dds4ccm/tests/QueryCondition/EventListener/Base/QFLE_Test_Base.mpc: * connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QFLE_Test_Connector.idl: * connectors/dds4ccm/tests/QueryCondition/EventListener/Connector/QFLE_Test_Connector.mpc: * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QFLE_Test_Receiver.idl: * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QFLE_Test_Receiver_exec.h: * connectors/dds4ccm/tests/QueryCondition/EventListener/Receiver/QFLE_Test_Receiver_exec.cpp: * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QFLE_Test_Sender.idl: * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QFLE_Test_Sender_exec.h: * connectors/dds4ccm/tests/QueryCondition/EventListener/Sender/QFLE_Test_Sender_exec.cpp: * connectors/dds4ccm/tests/QueryCondition/EventListener/descriptors/Plan.cdp: * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Starter.idl: * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Test_Base.idl: * connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Test_Base.mpc: * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/QueryFilter_Test_Connector.idl: * connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/QueryFilter_Test_Connector.mpc: * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver.idl: * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver_exec.h: * connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver_exec.cpp: * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender.idl: * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender_exec.h: * connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender_exec.cpp: * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp: * connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml: * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QFLS_Test_Base.idl: * connectors/dds4ccm/tests/QueryCondition/StateListener/Base/QFLS_Test_Base.mpc: * connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QFLS_Test_Connector.idl: * connectors/dds4ccm/tests/QueryCondition/StateListener/Connector/QFLS_Test_Connector.mpc: * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QFLS_Test_Receiver.idl: * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QFLS_Test_Receiver_exec.h: * connectors/dds4ccm/tests/QueryCondition/StateListener/Receiver/QFLS_Test_Receiver_exec.cpp: * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QFLS_Test_Sender.idl: * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QFLS_Test_Sender_exec.h: * connectors/dds4ccm/tests/QueryCondition/StateListener/Sender/QFLS_Test_Sender_exec.cpp: * connectors/dds4ccm/tests/QueryCondition/StateListener/descriptors/Plan.cdp: Renamed QueryFilter to QueryCondition in order to reflect what these tests are about. --- .../ReadGet/Base/QueryFilter_Starter.idl | 6 +++--- .../ReadGet/Base/QueryFilter_Test_Base.idl | 12 ++++++------ .../ReadGet/Base/QueryFilter_Test_Base.mpc | 6 +++--- .../ReadGet/Connector/QueryFilter_Test_Connector.idl | 8 ++++---- .../ReadGet/Connector/QueryFilter_Test_Connector.mpc | 18 +++++++++--------- .../ReadGet/Receiver/QueryFilter_Test_Receiver.idl | 2 +- .../Receiver/QueryFilter_Test_Receiver_exec.cpp | 18 ++++++++---------- .../ReadGet/Receiver/QueryFilter_Test_Receiver_exec.h | 6 +++--- .../ReadGet/Sender/QueryFilter_Test_Sender.idl | 6 +++--- .../ReadGet/Sender/QueryFilter_Test_Sender_exec.cpp | 2 +- .../ReadGet/Sender/QueryFilter_Test_Sender_exec.h | 2 +- .../tests/QueryCondition/ReadGet/descriptors/Plan.cdp | 8 ++++---- .../ReadGet/descriptors/USER_QOS_PROFILES.xml | 6 +++--- 13 files changed, 49 insertions(+), 51 deletions(-) (limited to 'CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet') diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Starter.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Starter.idl index be30edc9ae6..c47f08e1ec9 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Starter.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Starter.idl @@ -5,8 +5,8 @@ * @author Marcel Smit */ -#ifndef QUERYFILTER_STARTER_IDL -#define QUERYFILTER_STARTER_IDL +#ifndef QUERYCONDITION_STARTER_IDL +#define QUERYCONDITION_STARTER_IDL #pragma ciao lem "Base/QueryFilter_StarterE.idl" @@ -22,4 +22,4 @@ interface QueryFilterRestarter void restart_write (); }; -#endif /* QUERYFILTER_STARTER_IDL */ +#endif /* QUERYCONDITION_STARTER_IDL */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Test_Base.idl index dc6d2e6c800..448b545f37e 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Test_Base.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Test_Base.idl @@ -5,19 +5,19 @@ * @author Marcel Smit */ -#ifndef QUERY_FILTER_TEST_BASE_IDL -#define QUERY_FILTER_TEST_BASE_IDL +#ifndef QUERY_CONDITION_TEST_BASE_IDL +#define QUERY_CONDITION_TEST_BASE_IDL #pragma ndds typesupport "Base/QueryFilter_Test_BaseSupport.h" -#pragma DCPS_DATA_TYPE "QueryFilterTest" -#pragma DCPS_DATA_KEY "QueryFilterTest symbol" +#pragma DCPS_DATA_TYPE "QueryConditionTest" +#pragma DCPS_DATA_KEY "QueryConditionTest symbol" -struct QueryFilterTest { +struct QueryConditionTest { string symbol; //@key long iteration; }; -typedef sequence QueryFilterTestSeq; +typedef sequence QueryConditionTestSeq; #endif diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Test_Base.mpc index 080d970cb08..c04bbc0b2c5 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Test_Base.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Base/QueryFilter_Test_Base.mpc @@ -2,11 +2,11 @@ project (QueryFilter_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default { sharedname = QueryFilter_Test_Base_stub - dynamicflags += QUERY_FILTER_TEST_BASE_STUB_BUILD_DLL + dynamicflags += QUERY_CONDITION_TEST_BASE_STUB_BUILD_DLL libout = ../lib idlflags += -SS -Sci \ - -Wb,stub_export_macro=QUERY_FILTER_TEST_BASE_STUB_Export \ + -Wb,stub_export_macro=QUERY_CONDITION_TEST_BASE_STUB_Export \ -Wb,stub_export_include=QueryFilter_Test_Base_stub_export.h IDL_Files { @@ -14,7 +14,7 @@ project (QueryFilter_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_d QueryFilter_Test_Base.idl } - opendds_ts_flags += --export=QUERY_FILTER_TEST_BASE_STUB_Export + opendds_ts_flags += --export=QUERY_CONDITION_TEST_BASE_STUB_Export DDSGenerator_Files { QueryFilter_Test_Base.idl diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/QueryFilter_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/QueryFilter_Test_Connector.idl index 022aec13f98..5b363bd2ffa 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/QueryFilter_Test_Connector.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/QueryFilter_Test_Connector.idl @@ -5,8 +5,8 @@ * @author Marcel Smit */ -#ifndef QUERY_FILTER_TEST_CONNECTOR_IDL_ -#define QUERY_FILTER_TEST_CONNECTOR_IDL_ +#ifndef QUERY_CONDITION_TEST_CONNECTOR_IDL_ +#define QUERY_CONDITION_TEST_CONNECTOR_IDL_ #include #include "Base/QueryFilter_Test_Base.idl" @@ -16,7 +16,7 @@ module QueryFilter_Test { - module ::CCM_DDS::Typed < ::QueryFilterTest, ::QueryFilterTestSeq> QueryFilterTestConnector; + module ::CCM_DDS::Typed < ::QueryConditionTest, ::QueryConditionTestSeq> QueryConditionTestConnector; }; -#endif /* QUERY_FILTER_TEST_CONNECTOR_IDL_ */ +#endif /* QUERY_CONDITION_TEST_CONNECTOR_IDL_ */ diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/QueryFilter_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/QueryFilter_Test_Connector.mpc index babfda6364f..7fcd7661a44 100755 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/QueryFilter_Test_Connector.mpc +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Connector/QueryFilter_Test_Connector.mpc @@ -4,13 +4,13 @@ project(QueryFilter_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { after += DDS4CCM_idl_gen custom_only = 1 - idlflags += -Wb,stub_export_macro=QUERY_FILTER_TEST_CONNECTOR_STUB_Export \ + idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_STUB_Export \ -Wb,stub_export_include=QueryFilter_Test_Connector_stub_export.h \ - -Wb,skel_export_macro=QUERY_FILTER_TEST_CONNECTOR_SVNT_Export \ + -Wb,skel_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \ -Wb,skel_export_include=QueryFilter_Test_Connector_svnt_export.h \ - -Wb,svnt_export_macro=QUERY_FILTER_TEST_CONNECTOR_SVNT_Export \ + -Wb,svnt_export_macro=QUERY_CONDITION_TEST_CONNECTOR_SVNT_Export \ -Wb,svnt_export_include=QueryFilter_Test_Connector_svnt_export.h \ - -Wb,conn_export_macro=QUERY_FILTER_TEST_CONNECTOR_CONN_Export \ + -Wb,conn_export_macro=QUERY_CONDITION_TEST_CONNECTOR_CONN_Export \ -Wb,conn_export_include=QueryFilter_Test_Connector_conn_export.h \ -I .. @@ -22,7 +22,7 @@ project(QueryFilter_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm { project(QueryFilter_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm { custom_only = 1 after += QueryFilter_Test_Connector_idl_gen - idlflags += -Wb,stub_export_macro=QUERY_FILTER_TEST_CONNECTOR_LEM_STUB_Export \ + idlflags += -Wb,stub_export_macro=QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_Export \ -Wb,stub_export_include=QueryFilter_Test_Connector_lem_stub_export.h \ -SS -Gxhst \ -I .. @@ -39,7 +39,7 @@ project(QueryFilter_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base { libout = ../lib includes += .. sharedname = QueryFilter_Test_Connector_lem_stub - dynamicflags = QUERY_FILTER_TEST_CONNECTOR_LEM_STUB_BUILD_DLL + dynamicflags = QUERY_CONDITION_TEST_CONNECTOR_LEM_STUB_BUILD_DLL IDL_Files { } @@ -65,7 +65,7 @@ project(QueryFilter_Test_Connector_stub) : ccm_stub, dds4ccm_base { libout = ../lib includes += .. sharedname = QueryFilter_Test_Connector_stub - dynamicflags = QUERY_FILTER_TEST_CONNECTOR_STUB_BUILD_DLL + dynamicflags = QUERY_CONDITION_TEST_CONNECTOR_STUB_BUILD_DLL IDL_Files { } @@ -91,7 +91,7 @@ project(QueryFilter_Test_Connector_exec) : ciao_executor, dds4ccm_impl { libpaths += ../lib libout = ../lib includes += .. - dynamicflags = QUERY_FILTER_TEST_CONNECTOR_CONN_BUILD_DLL + dynamicflags = QUERY_CONDITION_TEST_CONNECTOR_CONN_BUILD_DLL IDL_Files { } @@ -121,7 +121,7 @@ project(QueryFilter_Test_Connector_svnt) : ciao_servant, dds4ccm_impl { libpaths += ../lib libout = ../lib includes += .. - dynamicflags = QUERY_FILTER_TEST_CONNECTOR_SVNT_BUILD_DLL + dynamicflags = QUERY_CONDITION_TEST_CONNECTOR_SVNT_BUILD_DLL IDL_Files { } diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver.idl index f831608e3b1..8394a1e9f05 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver.idl @@ -15,7 +15,7 @@ module QueryFilter_Test { component Receiver { - port QueryFilterTestConnector::DDS_Get get_port; + port QueryConditionTestConnector::DDS_Get get_port; provides QueryFilterStarter reader_start; uses QueryFilterRestarter writer_restart; diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver_exec.cpp index 5cb0192b63b..adb94086296 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver_exec.cpp @@ -96,7 +96,7 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl { try { - QueryFilterTest queryfiltertest_info; + QueryConditionTest queryfiltertest_info; ::CCM_DDS::ReadInfo readinfo; char key[100]; ACE_OS::sprintf (key, "KEY_%d", this->keys_); @@ -121,7 +121,7 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl // Supported operations and attributes. void - Receiver_exec_i::check_iter (const QueryFilterTest & sample, + Receiver_exec_i::check_iter (const QueryConditionTest & sample, const char * test) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("%C ALL : ") @@ -151,7 +151,7 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl void Receiver_exec_i::read_all (void) { - QueryFilterTestSeq queryfiltertest_info_seq; + QueryConditionTestSeq queryfiltertest_info_seq; ::CCM_DDS::ReadInfoSeq readinfo_seq; this->reader_->read_all (queryfiltertest_info_seq, readinfo_seq); if (queryfiltertest_info_seq.length () == 0) @@ -173,7 +173,7 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl ACE_ERROR ((LM_ERROR, "Receiver_exec_i::get_all - " "ERROR: No Getter\n")); } - QueryFilterTest * qf_info = new QueryFilterTest; + QueryConditionTest * qf_info = new QueryConditionTest; ::CCM_DDS::ReadInfo readinfo; bool result = this->getter_->get_one (qf_info, readinfo); if (result) @@ -234,7 +234,7 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl void Receiver_exec_i::test_exception () { - CCM_DDS::QueryFilter* query = 0; + ::CCM_DDS::QueryFilter* query = 0; try { query = this->reader_->filter (); @@ -260,7 +260,7 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl void Receiver_exec_i::check_filter () { - CCM_DDS::QueryFilter * filter = 0; + ::CCM_DDS::QueryFilter * filter = 0; try { filter = this->reader_->filter (); @@ -334,7 +334,7 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl { try { - CCM_DDS::QueryFilter filter; + ::CCM_DDS::QueryFilter filter; filter.expression = CORBA::string_dup ("na"); filter.parameters.length (2); filter.parameters[0] = CORBA::string_dup (MIN_ITERATION_2); @@ -363,14 +363,12 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl Receiver_exec_i::set_filter () { ACE_DEBUG ((LM_DEBUG, "Set filter\n")); - CCM_DDS::QueryFilter filter; + ::CCM_DDS::QueryFilter filter; filter.expression = CORBA::string_dup (QUERY); filter.parameters.length (2); filter.parameters[0] = CORBA::string_dup (MIN_ITERATION_1); filter.parameters[1] = CORBA::string_dup (MAX_ITERATION_1); this->reader_->filter (filter); -// this->getter_->pull_observer_filter (); -// this->getter_->filter (filter); } void diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver_exec.h index a1ee35b7a1e..0f0958e0b46 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Receiver/QueryFilter_Test_Receiver_exec.h @@ -105,8 +105,8 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl private: ::QueryFilter_Test::CCM_Receiver_Context_var context_; - ::QueryFilter_Test::QueryFilterTestConnector::Reader_var reader_; - ::QueryFilter_Test::QueryFilterTestConnector::Getter_var getter_; + ::QueryFilter_Test::QueryConditionTestConnector::Reader_var reader_; + ::QueryFilter_Test::QueryConditionTestConnector::Getter_var getter_; ::CCM_DDS::ContentFilterSetting_var filter_setting_; QueryFilterRestarter_var restarter_; CORBA::UShort iterations_; @@ -121,7 +121,7 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl void test_all (void); void read_all (void); void get_all (void); - void check_iter (const QueryFilterTest & sample, + void check_iter (const QueryConditionTest & sample, const char * test); void check_filter (void); void test_exception (void); diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender.idl index 6ecc71a9034..4d06b03be2e 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender.idl +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender.idl @@ -7,8 +7,8 @@ * by-hand idl3 translation of sender components. */ -#ifndef DDS_QUERY_FILTER_TEST_SENDER_IDL -#define DDS_QUERY_FILTER_TEST_SENDER_IDL +#ifndef DDS_QUERY_CONDITION_TEST_SENDER_IDL +#define DDS_QUERY_CONDITION_TEST_SENDER_IDL #include "Connector/QueryFilter_Test_Connector.idl" #include "Base/QueryFilter_Starter.idl" @@ -17,7 +17,7 @@ module QueryFilter_Test { component Sender { - port QueryFilter_Test::QueryFilterTestConnector::DDS_Write info_write; + port QueryFilter_Test::QueryConditionTestConnector::DDS_Write info_write; uses QueryFilterStarter start_reader; provides QueryFilterRestarter restart_writer; diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender_exec.cpp index 67c33e222d8..9bbb8d4178f 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender_exec.cpp +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender_exec.cpp @@ -81,7 +81,7 @@ namespace CIAO_QueryFilter_Test_Sender_Impl for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key) { char key[7]; - QueryFilterTest *new_key = new QueryFilterTest; + QueryConditionTest *new_key = new QueryConditionTest; ACE_OS::sprintf (key, "KEY_%d", iter_key); new_key->symbol = CORBA::string_dup(key); for (CORBA::UShort iter = ((this->run_ - 2) * this->iterations_) + 1; diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender_exec.h index 769bed5bea5..f66e6227bf2 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender_exec.h +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/Sender/QueryFilter_Test_Sender_exec.h @@ -80,7 +80,7 @@ namespace CIAO_QueryFilter_Test_Sender_Impl private: ::QueryFilter_Test::CCM_Sender_Context_var context_; - ::QueryFilter_Test::QueryFilterTestConnector::Writer_var writer_; + ::QueryFilter_Test::QueryConditionTestConnector::Writer_var writer_; QueryFilterStarter_var starter_; CORBA::UShort iterations_; diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp index 6f00775b7f0..9f33797efd9 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/Plan.cdp @@ -71,7 +71,7 @@ tk_string - create_QueryFilter_Test_QueryFilterTestConnector_DDS_Event_Impl + create_QueryFilter_Test_QueryConditionTestConnector_DDS_Event_Impl @@ -82,7 +82,7 @@ tk_string - create_QueryFilter_Test_QueryFilterTestConnector_DDS_Event_Servant + create_QueryFilter_Test_QueryConditionTestConnector_DDS_Event_Servant @@ -181,7 +181,7 @@ tk_string - QueryFilter_Library#QueryFilter_Profile + QueryCondition_Library#QueryCondition_Profile @@ -210,7 +210,7 @@ tk_string - QueryFilter_Library#QueryFilter_Profile + QueryCondition_Library#QueryCondition_Profile diff --git a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml index 571930e854d..5b00bed1712 100644 --- a/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/descriptors/USER_QOS_PROFILES.xml +++ b/CIAO/connectors/dds4ccm/tests/QueryCondition/ReadGet/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. --> - + - + @@ -61,4 +61,4 @@ RTI Data Distribution Service user manual. - \ No newline at end of file + -- cgit v1.2.1