Wed Dec 9 14:26:17 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl:
        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h:
        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h:
        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp:
          Extended tests with a timeout test on get_many.

6 files changed, 83 insertions, 23 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 7d9fce65785..0b841ec74d7 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Wed Dec  9 14:26:17 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl:
+        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h:
+        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h:
+        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp:
+          Extended tests with a timeout test on get_many.
+
 Wed Dec  9 13:58:44 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl:
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl
index 6aedbc0cec6..c3c330a2c7d 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl
@@ -10,7 +10,8 @@
 
 interface GetInvoker
 {
-  void get_no_data ();
+  void start_timeout_get_one ();
+  void start_timeout_get_many ();
   void start_get_one (in string key, in long iteration);
   void start_get_many (in short keys, in long iterations);
 };
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 fdefe3b5642..19e0d5845e4 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
@@ -21,17 +21,23 @@ namespace CIAO_Getter_Test_Receiver_Impl
   {
   }
 
-  void 
-  Invoker_exec_i::start_get_one (const char * key,
-                                     CORBA::Long iteration)
+  void
+  Invoker_exec_i::start_timeout_get_one ()
   {
-    this->callback_.start_get_one (key, iteration);
+    this->callback_.timeout_get_one ();
   }
 
   void
-  Invoker_exec_i::get_no_data ()
+  Invoker_exec_i::start_timeout_get_many ()
+  {
+    this->callback_.timeout_get_many ();
+  }
+
+  void 
+  Invoker_exec_i::start_get_one (const char * key,
+                                     CORBA::Long iteration)
   {
-    this->callback_.get_no_data ();
+    this->callback_.start_get_one (key, iteration);
   }
 
   void
@@ -221,7 +227,7 @@ namespace CIAO_Getter_Test_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::get_no_data ()
+  Receiver_exec_i::timeout_get_one ()
   {
     try
       {
@@ -229,7 +235,7 @@ namespace CIAO_Getter_Test_Receiver_Impl
         to.sec = 1;
         to.nanosec = 0;
         this->getter_->time_out (to);
-        CIAO_DEBUG ((LM_DEBUG, CLINFO ACE_TEXT ("Receiver_exec_i::get_no_data: ")
+        CIAO_DEBUG ((LM_DEBUG, CLINFO ACE_TEXT ("Receiver_exec_i::timeout_get_one: ")
                                   ACE_TEXT ("Start getting data from DDS: timeout: ")
                                   ACE_TEXT ("sec <%d> - nanosec <%u>\n"),
                                   this->getter_->time_out ().sec,
@@ -239,26 +245,68 @@ namespace CIAO_Getter_Test_Receiver_Impl
         bool result = this->getter_->get_one (gettertest_info, readinfo);
         if (result)
           {
-            CIAO_ERROR ((LM_ERROR, CLINFO ACE_TEXT ("ERROR: GET NO DATA: ")
+            CIAO_ERROR ((LM_ERROR, CLINFO ACE_TEXT ("ERROR: TIMEOUT GET ONE: ")
+                                 ACE_TEXT ("Returning true when get no data.\n")));
+          }
+        else
+          {
+            CIAO_DEBUG ((LM_DEBUG, CLINFO ACE_TEXT ("Receiver_exec_i::timeout_get_one: ")
+                              ACE_TEXT ("Expected to return no data.\n")));
+          }
+      }
+    catch(CCM_DDS::InternalError& )
+      {
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: TIMEOUT GET ONE: ")
+                               ACE_TEXT ("Caught unexcepted InternalError ")
+                               ACE_TEXT ("exception\n")));
+      }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("ERROR: TIMEOUT GET ONE:");
+        CIAO_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: Receiver_exec_i::timeout_get_one : Exception caught\n")));
+      }
+  }
+
+  void
+  Receiver_exec_i::timeout_get_many ()
+  {
+    try
+      {
+        DDS::Duration_t to;
+        to.sec = 1;
+        to.nanosec = 0;
+        this->getter_->time_out (to);
+        CIAO_DEBUG ((LM_DEBUG, CLINFO ACE_TEXT ("Receiver_exec_i::timeout_get_many: ")
+                                  ACE_TEXT ("Start getting data from DDS: timeout: ")
+                                  ACE_TEXT ("sec <%d> - nanosec <%u>\n"),
+                                  this->getter_->time_out ().sec,
+                                  this->getter_->time_out ().nanosec));
+        GetterTest_Seq *gettertest_seq;
+        ::CCM_DDS::ReadInfoSeq *readinfo;
+        bool result = this->getter_->get_many (gettertest_seq, readinfo);
+        if (result)
+          {
+            CIAO_ERROR ((LM_ERROR, CLINFO ACE_TEXT ("ERROR: TIMEOUT GET MANY: ")
                                  ACE_TEXT ("Returning true when get no data.\n")));
           }
         else
           {
-            CIAO_DEBUG ((LM_DEBUG, CLINFO ACE_TEXT ("Receiver_exec_i::get_no_data: ")
+            CIAO_DEBUG ((LM_DEBUG, CLINFO ACE_TEXT ("Receiver_exec_i::timeout_get_many: ")
                               ACE_TEXT ("Expected to return no data.\n")));
           }
       }
     catch(CCM_DDS::InternalError& )
       {
-        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: GET NO DATA: ")
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: TIMEOUT GET MANY: ")
                                ACE_TEXT ("Caught unexcepted InternalError ")
                                ACE_TEXT ("exception\n")));
       }
     catch (const CORBA::Exception& ex)
       {
-        ex._tao_print_exception ("ERROR: GET NO DATA:");
+        ex._tao_print_exception ("ERROR: TIMEOUT GET MANY:");
         CIAO_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::get_no_data : Exception caught\n")));
+          ACE_TEXT ("ERROR: Receiver_exec_i::timeout_get_many : Exception caught\n")));
       }
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
index c7f78dcba39..6ddd15fe288 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
@@ -73,7 +73,8 @@ namespace CIAO_Getter_Test_Receiver_Impl
     Invoker_exec_i (Receiver_exec_i & callback);
     virtual ~Invoker_exec_i (void);
 
-    virtual void get_no_data ();
+    virtual void start_timeout_get_one ();
+    virtual void start_timeout_get_many ();
 
     virtual void start_get_one (const char * key,
                                      ::CORBA::Long iteration);
@@ -107,7 +108,9 @@ namespace CIAO_Getter_Test_Receiver_Impl
     virtual ::CCM_GetInvoker_ptr
     get_getter_invoke ();
 
-    void get_no_data ();
+    void timeout_get_one ();
+    void timeout_get_many ();
+
     void start_get_one (const char * key,
                         CORBA::Long iteration);
     void get_one (const char * key,
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
index 3654009ac04..2c6410cbca9 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
@@ -94,13 +94,13 @@ namespace CIAO_Getter_Test_Sender_Impl
   {
   }
 
-
   void
-  Sender_exec_i::start_get_no_data (void)
+  Sender_exec_i::start_timeout_tests (void)
   {
-    this->invoker_->get_no_data ();
+    this->invoker_->start_timeout_get_one ();
+    this->invoker_->start_timeout_get_many ();
   }
-  
+
   void
   Sender_exec_i::get_many (void)
   {
@@ -143,7 +143,7 @@ namespace CIAO_Getter_Test_Sender_Impl
     if (!this->done_ && this->ccm_activated_)
       {
         this->done_ = true;
-        start_get_no_data ();
+        start_timeout_tests ();
         if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
                     this->ticker_,
                     0,
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
index a2e074d6983..5ea2a95e2e5 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
@@ -104,8 +104,7 @@ namespace CIAO_Getter_Test_Sender_Impl
     bool          ccm_activated_;
     CORBA::ULong last_iter_;
 
-
-    void start_get_no_data (void);
+    void start_timeout_tests (void);
     void get_many (void);
 
     pulse_Generator * ticker_;