Wed Dec 9 13:53:47 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
          On get_many should at least return 1 sample.

        * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp:
          Return _nil rather than 0.

3 files changed, 28 insertions, 15 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index fea0bd81379..2c2fd85317d 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Dec  9 13:53:47 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
+          On get_many should at least return 1 sample.
+
+        * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp:
+          Return _nil rather than 0.
+
 Wed Dec  9 13:11:33 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/impl/ndds/Updater_T.cpp:
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
index e05c6a3a4c2..b73ae4b7366 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
@@ -166,8 +166,16 @@ namespace CIAO_Getter_Test_Receiver_Impl
   void
   Receiver_exec_i::get_many (CORBA::Short keys , CORBA::Long iterations)
   {
-    CORBA::ULong expected = keys * iterations;
-    //ACE_OS::sleep (5);
+    // this is very hard to test in a controlled environment.
+    // When data arrives in DDS, the waiting ends and the
+    // Getter starts to read the data. The number of samples
+    // read wil (almost) always be one.
+    // On the other hand, when the user want to have all the
+    // samples in DDS, one shouldn't use the wait method.
+    // Since the spec is not clear about this, the test will
+    // pass when at least one sample is returned.
+    // Also, max_delivered_data cannot be tested since only
+    // one sample is returned.
     DDS::Duration_t to;
     to.sec = 10;
     to.nanosec = 0;
@@ -186,13 +194,12 @@ namespace CIAO_Getter_Test_Receiver_Impl
     bool result = this->getter_->get_many (gettertest_seq, readinfo);
     if (result)
       {
-        if (gettertest_seq->length () != expected)
+        if (gettertest_seq->length () == 0)
           {
             CIAO_ERROR ((LM_ERROR, CLINFO ACE_TEXT ("Receiver_exec_i::get_many: ")
-                                  ACE_TEXT ("Returned data : Didn't receive correct ") 
+                                  ACE_TEXT ("No data returned. ") 
                                   ACE_TEXT ("number of samples: ")
-                                  ACE_TEXT ("expected <%d> - received <%d>\n"),
-                                  expected,
+                                  ACE_TEXT ("expected at least one - received <%d>\n"),
                                   gettertest_seq->length ()));
           }
         for (CORBA::ULong i = 0; i < gettertest_seq->length (); ++i)
@@ -206,9 +213,7 @@ namespace CIAO_Getter_Test_Receiver_Impl
     else
       {
         CIAO_ERROR ((LM_ERROR, CLINFO ACE_TEXT ("ERROR: GET MANY: ")
-                              ACE_TEXT ("Time out while waiting for ")
-                              ACE_TEXT ("#iterations <%d>\n"),
-                              expected));
+                              ACE_TEXT ("Time out occurred\n")));
       }
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp
index bc075832d4b..49b370f8924 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver_exec.cpp
@@ -49,7 +49,7 @@ namespace CIAO_State_Connection_Test_Receiver_Impl
   Receiver_exec_i::get_info_read_status (void)
   {
     this->reader_port_status_created_ = true;
-    return 0;
+    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
   }
 
   //Provides for DDS_Get
@@ -57,7 +57,7 @@ namespace CIAO_State_Connection_Test_Receiver_Impl
   Receiver_exec_i::get_info_get_status (void)
   {
     this->getter_port_status_created_ = true;
-    return 0;
+    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
   }
 
   //Provides for DDS_Listen
@@ -65,14 +65,14 @@ namespace CIAO_State_Connection_Test_Receiver_Impl
   Receiver_exec_i::get_info_listen_data_listener ()
   {
     this->listen_data_listener_created_ = true;
-    return 0;
+    return ::CCM_DDS::State_ConnectionTest::CCM_Listener::_nil ();
   }
 
   ::CCM_DDS::CCM_PortStatusListener_ptr
   Receiver_exec_i::get_info_listen_status (void)
   {
     this->listen_port_status_created_ = true;
-    return 0;
+    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
   }
 
   //Provides for DDS_StateListen
@@ -80,14 +80,14 @@ namespace CIAO_State_Connection_Test_Receiver_Impl
   Receiver_exec_i::get_info_statelisten_data_listener (void)
   {
     this->statelisten_data_listener_created_ = true;
-    return 0;
+    return ::CCM_DDS::State_ConnectionTest::CCM_StateListener::_nil ();
   }
 
   ::CCM_DDS::CCM_PortStatusListener_ptr
   Receiver_exec_i::get_info_statelisten_status (void)
   {
     this->statelisten_port_status_created_ = true;
-    return 0;
+    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
   }
 
   // Operations from Components::SessionComponent.