Thu Nov 26 12:40:18 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp:
          Resolved test errors. Expected samples should always be in the
          deployment plan.

        * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp:
          Added expected samples.

        * connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp:
        * connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml:
          Resolved test error by adding qos_profile to the deployment plan.

5 files changed, 93 insertions, 3 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index ab3bc0c5dec..147ed98a268 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,16 @@
+Thu Nov 26 12:40:18 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp:
+          Resolved test errors. Expected samples should always be in the
+          deployment plan.
+
+        * connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp:
+          Added expected samples.
+
+        * connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp:
+        * connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml:
+          Resolved test error by adding qos_profile to the deployment plan.
+
 Thu Nov 26 12:18:07 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
 
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
index 55b8055ff93..836a9723427 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
@@ -175,7 +175,7 @@ namespace CIAO_Hello_Receiver_Impl
   //============================================================
 
   Receiver_exec_i::Receiver_exec_i (void)
-    : expected_ (100),
+    : expected_ (0),
       received_ (0),
       lost_ (0)
   {
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp
index bc522533cc7..9093d7c26d7 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/1_to_5.cdp
@@ -189,6 +189,17 @@
         </value>
       </value>
     </configProperty>
+    <configProperty>
+      <name>expected_samples</name>
+      <value>
+        <type>
+          <kind>tk_ulong</kind>
+        </type>
+        <value>
+          <ulong>100</ulong>
+        </value>
+      </value>
+    </configProperty>
   </instance>
 
   <instance xmi:id="Hello_ReceiverConnectorComponentInstanceOne">
@@ -250,6 +261,17 @@
         </value>
       </value>
     </configProperty>
+    <configProperty>
+      <name>expected_samples</name>
+      <value>
+        <type>
+          <kind>tk_ulong</kind>
+        </type>
+        <value>
+          <ulong>100</ulong>
+        </value>
+      </value>
+    </configProperty>
   </instance>
 
   <instance xmi:id="Hello_ReceiverConnectorComponentInstanceTwo">
@@ -311,6 +333,17 @@
         </value>
       </value>
     </configProperty>
+    <configProperty>
+      <name>expected_samples</name>
+      <value>
+        <type>
+          <kind>tk_ulong</kind>
+        </type>
+        <value>
+          <ulong>100</ulong>
+        </value>
+      </value>
+    </configProperty>
   </instance>
 
   <instance xmi:id="Hello_ReceiverConnectorComponentInstanceThree">
@@ -372,6 +405,17 @@
         </value>
       </value>
     </configProperty>
+    <configProperty>
+      <name>expected_samples</name>
+      <value>
+        <type>
+          <kind>tk_ulong</kind>
+        </type>
+        <value>
+          <ulong>100</ulong>
+        </value>
+      </value>
+    </configProperty>
   </instance>
 
   <instance xmi:id="Hello_ReceiverConnectorComponentInstanceFour">
@@ -433,6 +477,17 @@
         </value>
       </value>
     </configProperty>
+    <configProperty>
+      <name>expected_samples</name>
+      <value>
+        <type>
+          <kind>tk_ulong</kind>
+        </type>
+        <value>
+          <ulong>100</ulong>
+        </value>
+      </value>
+    </configProperty>
   </instance>
 
   <instance xmi:id="Hello_ReceiverConnectorComponentInstanceFive">
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp
index 18b962b2b72..da5c2c2d006 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/Plan.cdp
@@ -184,6 +184,17 @@
         </value>
       </value>
     </configProperty>
+    <configProperty>
+      <name>qos_profile</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>KeyedWriter_Library#KeyedWriter_Profile</string>
+        </value>
+      </value>
+    </configProperty>
   </instance>
   <instance xmi:id="Writer_ConnectorComponentInstance2">
     <name>Writer_ConnectorComponent2</name>
@@ -202,6 +213,17 @@
         </value>
       </value>
     </configProperty>
+    <configProperty>
+      <name>qos_profile</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>KeyedWriter_Library#KeyedWriter_Profile</string>
+        </value>
+      </value>
+    </configProperty>
   </instance>
   <instance xmi:id="SenderComponentInstance">
     <name>SenderComponent</name>
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml
index f92b3bc9f2c..2cf94303049 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/USER_QOS_PROFILES.xml
@@ -19,13 +19,13 @@ RTI Data Distribution Service user manual.
 
         A QoS library is a named set of QoS profiles.
     -->
-  <qos_library name="HelloMsg_Library">
+  <qos_library name="KeyedWriter_Library">
     <!-- QoS profile used to configure reliable communication between the DataWriter 
              and DataReader created in the example code.
 
              A QoS profile groups a set of related QoS.
         -->
-    <qos_profile name="HelloMsg_Profile" is_default_qos="true">
+    <qos_profile name="KeyedWriter_Profile" is_default_qos="true">
       <!-- QoS used to configure the data writer created in the example code -->
       <datawriter_qos>
         <reliability>