Fri Jun 4 11:47:58 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * 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.

3 files changed, 12 insertions, 14 deletions

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);