Thu Oct 28 08:16:05 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h:
        * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp:
        * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h:
        * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp:
        * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp:
          Added an additional test.

7 files changed, 48 insertions, 29 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index b5394284129..e2398cba02c 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Thu Oct 28 08:16:05 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h:
+        * connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp:
+        * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h:
+        * connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp:
+          Added an additional test.
+
 Thu Oct 28 07:53:41 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender_exec.cpp:
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp
index 767c1393717..1f6a4d8c8e0 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_exec.cpp
@@ -212,7 +212,8 @@ namespace CIAO_RG_LateBinding_Receiver_Impl
   {
     ACE_NEW_THROW_EX (this->impl_,
                       RG_LateBinding_Receiver_impl (
-                        this->ciao_context_.in ()),
+                        this->ciao_context_.in (),
+                        this->iterations ()),
                       ::CORBA::INTERNAL ());
     this->impl_->start (this->reactor ());
   }
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp
index 814832f20f5..c99d45d2046 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.cpp
@@ -35,9 +35,11 @@ namespace CIAO_RG_LateBinding_Receiver_Impl
    * RG_LateBinding_Receiver_impl
    */
   RG_LateBinding_Receiver_impl::RG_LateBinding_Receiver_impl (
-      ::RG_LateBinding::CCM_Receiver_Context_ptr ctx)
+      ::RG_LateBinding::CCM_Receiver_Context_ptr ctx,
+      ::CORBA::UShort expected)
     : ciao_context_ (
         ::RG_LateBinding::CCM_Receiver_Context::_duplicate (ctx))
+    , expected_ (expected)
   {
     ACE_NEW_THROW_EX (this->to_handler_,
                       Timeout_Handler (*this),
@@ -50,19 +52,32 @@ namespace CIAO_RG_LateBinding_Receiver_Impl
   }
 
   void
-  RG_LateBinding_Receiver_impl::list_samples (
+  RG_LateBinding_Receiver_impl::check_samples (
     const char * test,
-    const RG_LateBindingTestSeq& samples)
+    const RG_LateBindingTestSeq& samples,
+    const ::CORBA::UShort& expected)
   {
-    ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::list_samples - "
-                "%C Samples found: <%u>\n",
-                test,
-                samples.length ()));
+    if (samples.length () != expected)
+      {
+        ACE_ERROR ((LM_ERROR, "RG_LateBinding_Receiver_impl::check_samples - "
+                    "ERROR: Unexpected number of %C samples received: "
+                    "expected <%d> - received <%u>\n",
+                    test,
+                    expected,
+                    samples.length ()));
+      }
+    else
+      {
+        ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::check_samples - "
+                    "%C Samples found: <%u>\n",
+                    test,
+                    samples.length ()));
+      }
     for (::CORBA::ULong i = 0;
          i < samples.length ();
          ++i)
       {
-        ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::list_samples - "
+        ACE_DEBUG ((LM_DEBUG, "RG_LateBinding_Receiver_impl::check_samples - "
                     "Sample %C: sample <%d> - key <%C> - iteration <%d>\n",
                     test,
                     i,
@@ -123,7 +138,7 @@ namespace CIAO_RG_LateBinding_Receiver_Impl
         RG_LateBindingTestSeq samples;
         ::CCM_DDS::ReadInfoSeq readinfo_seq;
         reader->read_all (samples, readinfo_seq);
-        this->list_samples ("read", samples);
+        this->check_samples ("read", samples, this->expected_);
       }
     catch (const CORBA::Exception &e)
       {
@@ -159,7 +174,7 @@ namespace CIAO_RG_LateBinding_Receiver_Impl
         RG_LateBindingTestSeq samples;
         ::CCM_DDS::ReadInfoSeq readinfos;
         getter->get_many (samples, readinfos);
-        this->list_samples ("get", samples);
+        this->check_samples ("get", samples, 1);
       }
     catch (const CORBA::Exception &e)
       {
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h
index 15ef5ada48a..4a6ac43e9b8 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Receiver/RG_LateBinding_Receiver_impl.h
@@ -30,7 +30,8 @@ namespace CIAO_RG_LateBinding_Receiver_Impl
   {
   public:
     RG_LateBinding_Receiver_impl (
-      ::RG_LateBinding::CCM_Receiver_Context_ptr ctx);
+      ::RG_LateBinding::CCM_Receiver_Context_ptr ctx,
+      ::CORBA::UShort expected);
     ~RG_LateBinding_Receiver_impl (void);
 
     void start (
@@ -44,11 +45,14 @@ namespace CIAO_RG_LateBinding_Receiver_Impl
     void test_exception (void);
   private:
     ::RG_LateBinding::CCM_Receiver_Context_var ciao_context_;
+    CORBA::UShort expected_;
+
     Timeout_Handler *to_handler_;
 
-    void list_samples (
+    void check_samples (
       const char * test,
-      const RG_LateBindingTestSeq& samples);
+      const RG_LateBindingTestSeq& samples,
+      const ::CORBA::UShort& expected);
   };
 };
 
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp
index 4a3a0cc9f68..06351660dbf 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.cpp
@@ -44,7 +44,7 @@ namespace CIAO_RG_LateBinding_Sender_Impl
   int
   Timeout_Handler::handle_timeout (const ACE_Time_Value &, const void *)
   {
-    this->callback_.start_event_test ();
+    this->callback_.start_write ();
     return 0;
   }
 
@@ -85,7 +85,7 @@ namespace CIAO_RG_LateBinding_Sender_Impl
   }
 
   void
-  Sender_exec_i::start_event_test (void )
+  Sender_exec_i::start_write (void)
   {
     try
       {
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h
index 6caad8dc917..464e8643984 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/Sender/RG_LateBinding_Sender_exec.h
@@ -98,7 +98,7 @@ namespace CIAO_RG_LateBinding_Sender_Impl
 
     //@{
     /** User defined public operations. */
-    void start_event_test (void);
+    void start_write (void);
     //@}
 
   private:
diff --git a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp
index 8f16c011bd1..b90b386dd37 100644
--- a/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/LateBinding/ReadGet/descriptors/Plan.cdp
@@ -223,7 +223,7 @@
           <kind>tk_ushort</kind>
         </type>
         <value>
-          <ushort>10</ushort>
+          <ushort>50</ushort>
         </value>
       </value>
     </configProperty>
@@ -322,17 +322,6 @@
     <source/>
     <implementation xmi:idref="SenderComponentImplementation" />
     <configProperty>
-      <name>rate</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>15</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
       <name>keys</name>
       <value>
         <type>