Wed Dec 1 10:24:36 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl:
        * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h:
        * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp:
          Rewritten, using the generated executor files.

5 files changed, 89 insertions, 5 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index bbcea54e882..309232a8917 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Wed Dec  1 10:24:36 UTC 2010  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl:
+        * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h:
+        * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp:
+          Rewritten, using the generated executor files.
+
 Wed Dec  1 09:20:22 UTC 2010  Marcel Smit  <msmit@remedy.nl>
 
         * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc:
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl
index 829c4ebb60e..89ecf0a6a86 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.idl
@@ -15,6 +15,8 @@ module Writer
   component Receiver
   {
     port WriterTestConnector::DDS_Listen info_out;
+    attribute unsigned short iterations;
+    attribute unsigned short keys;
   };
 };
 
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp
index 250fe6c1010..017fc50bd19 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.cpp
@@ -118,8 +118,8 @@ namespace CIAO_Writer_Receiver_Impl
    */
 
   Receiver_exec_i::Receiver_exec_i (void)
-    : samples_received_ (0)
-      , iterations_ (0)
+    : iterations_ (10)
+      , samples_received_ (0)
   {
   }
 
@@ -141,7 +141,7 @@ namespace CIAO_Writer_Receiver_Impl
           tmp,
           info_out_data_listener_exec_i (
             this->ciao_context_.in (),
-            this->iterations_,
+            this->iterations_ * this->iterations_,
             this->samples_received_),
             ::WriterTestConnector::CCM_Listener::_nil ());
 
@@ -173,6 +173,32 @@ namespace CIAO_Writer_Receiver_Impl
         this->ciao_info_out_status_.in ());
   }
 
+  ::CORBA::UShort
+  Receiver_exec_i::iterations (void)
+  {
+    return this->iterations_;
+  }
+
+  void
+  Receiver_exec_i::iterations (
+    const ::CORBA::UShort iterations)
+  {
+    this->iterations_ = iterations;
+  }
+
+  ::CORBA::UShort
+  Receiver_exec_i::keys (void)
+  {
+    return this->keys_;
+  }
+
+  void
+  Receiver_exec_i::keys (
+    const ::CORBA::UShort keys)
+  {
+    this->keys_ = keys;
+  }
+
   // Operations from Components::SessionComponent.
 
   void
@@ -217,7 +243,21 @@ namespace CIAO_Writer_Receiver_Impl
   void
   Receiver_exec_i::ccm_remove (void)
   {
-    /* Your code here. */
+    if (this->samples_received_.value () !=
+        (::CORBA::ULong)this->iterations () * this->keys ())
+      {
+        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::ccm_remove - "
+                  "ERROR: did not receive the expected number "
+                  "of samples. expected <%u> - received <%u>\n",
+                  this->iterations() * this->keys (),
+                  this->samples_received_.value ()));
+      }
+    else
+      {
+        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove - "
+                  "OK: received the expected number of samples <%u>\n",
+                  this->iterations() * this->keys ()));
+      }
   }
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h
index c433ccda871..d984727fda0 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver_exec.h
@@ -129,6 +129,15 @@ namespace CIAO_Writer_Receiver_Impl
 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
     get_info_out_status (void);
+
+    virtual ::CORBA::UShort iterations (void);
+
+    virtual void iterations (::CORBA::UShort iterations);
+
+    virtual ::CORBA::UShort keys (void);
+
+    virtual void keys (::CORBA::UShort keys);
+
     //@}
 
     //@{
@@ -152,12 +161,15 @@ namespace CIAO_Writer_Receiver_Impl
     /** Component attributes. */
     ::WriterTestConnector::CCM_Listener_var ciao_info_out_data_listener_;
     ::CCM_DDS::CCM_PortStatusListener_var ciao_info_out_status_;
+
+    ::CORBA::UShort iterations_;
+
+    ::CORBA::UShort keys_;
     //@}
 
     //@{
     /** User defined members. */
     Atomic_ULong samples_received_;
-    ::CORBA::UShort iterations_;
     //@}
 
     //@{
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp
index 69fc907917d..da6019d7d89 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp
@@ -167,6 +167,28 @@
     <!-- hostname -->
     <source/>
     <implementation xmi:idref="ReceiverComponentImplementation" />
+    <configProperty>
+      <name>iterations</name>
+      <value>
+        <type>
+          <kind>tk_ushort</kind>
+        </type>
+        <value>
+          <ushort>3</ushort>
+        </value>
+      </value>
+    </configProperty>
+    <configProperty>
+      <name>keys</name>
+      <value>
+        <type>
+          <kind>tk_ushort</kind>
+        </type>
+        <value>
+          <ushort>2</ushort>
+        </value>
+      </value>
+    </configProperty>
   </instance>
   <instance xmi:id="Writer_ConnectorComponentInstance">
     <name>Writer_ConnectorComponent</name>