Thu Nov 26 15:32:37 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/KeyedWriter/README:
        * connectors/dds4ccm/tests/UnkeyedSamples/README:
          Added test description

        * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl:
          Removed keys.

        * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp:
          Removed keys. Added qos_profile.

        * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml:
          Started with configuring DDS in order to test the unkeyed
          writer.

6 files changed, 131 insertions, 15 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index b1d31c430ce..4e6de913b4a 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,19 @@
+Thu Nov 26 15:32:37 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/KeyedWriter/README:
+        * connectors/dds4ccm/tests/UnkeyedSamples/README:
+          Added test description
+
+        * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl:
+          Removed keys.
+
+        * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp:
+          Removed keys. Added qos_profile.
+
+        * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml:
+          Started with configuring DDS in order to test the unkeyed
+          writer.
+
 Thu Nov 26 13:59:39 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * bin/ciao_tests.lst:
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/README b/CIAO/connectors/dds4ccm/tests/KeyedWriter/README
new file mode 100644
index 00000000000..2e2e55625dd
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/README
@@ -0,0 +1,12 @@
+# $Id$
+
+KeyedWriter tests the DDS_Writer. It tests write_one 
+and write_many, in combination with register_instance.
+
+In descriptors/USER_QOS_PROFILE.xml, max_instances is
+set to one. An exception should be thrown when the second
+instance is registered. Every subsequent write of 
+unregistered keys, should result in an error.
+
+When invoking write_many, writing the first sample should succeed.
+Writing every subsequent sample should fail.
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/README b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/README
new file mode 100644
index 00000000000..c7b52e154a0
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/README
@@ -0,0 +1,6 @@
+# $Id$
+
+UnkeyedSamples consists of a Sender and a Receiver.
+The Sender writes samples unkeyed; the Receiver should
+receive the same number of samples. An error is printed
+when this isn't the case.
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl
index 9d5f6e8f19e..ca4e4ec2e52 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.idl
@@ -20,7 +20,6 @@ module Writer
     port CCM_DDS::WriterTest::DDS_Write info_write;
     attribute unsigned short rate;
     attribute unsigned short iterations;
-    attribute unsigned short keys;
   };
 };
 
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp
index 0d8adac922f..b9bba736c72 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/Plan.cdp
@@ -184,7 +184,18 @@
         </value>
       </value>
     </configProperty>
-  </instance>
+      <configProperty>
+      <name>qos_profile</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>UnkeyedWriter_Library#UnkeyedWriter_Profile</string>
+        </value>
+      </value>
+    </configProperty>
+</instance>
   <instance xmi:id="Writer_ConnectorComponentInstance2">
     <name>Writer_ConnectorComponent2</name>
     <node>ReceiverNode</node>
@@ -202,6 +213,17 @@
         </value>
       </value>
     </configProperty>
+    <configProperty>
+      <name>qos_profile</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>UnkeyedWriter_Library#UnkeyedWriter_Profile</string>
+        </value>
+      </value>
+    </configProperty>
   </instance>
   <instance xmi:id="SenderComponentInstance">
     <name>SenderComponent</name>
@@ -216,7 +238,7 @@
           <kind>tk_ushort</kind>
         </type>
         <value>
-          <ushort>1</ushort>
+          <ushort>100</ushort>
         </value>
       </value>
     </configProperty>
@@ -227,18 +249,9 @@
           <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>
+          <!-- should be more than max_samples in
+               USER_QOS_PROFILES. Thus more than 5-->
+          <ushort>10</ushort>
         </value>
       </value>
     </configProperty>
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml
new file mode 100644
index 00000000000..e1bc6fc38de
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/USER_QOS_PROFILES.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+
+Description
+XML QoS Profile 
+
+The QoS configuration of the DDS entities in the generated example is 
+loaded from this file.
+
+This file is used only when it is in the current working directory
+or when the enviroment variable
+NDDS_QOS_PROFILES is defined and points to this file.
+
+For more information about XML QoS Profiles see Chapter 15 in the 
+RTI Data Distribution Service user manual.
+-->
+<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d">
+  <!-- QoS Library containing the QoS profile used in the generated example.
+
+        A QoS library is a named set of QoS profiles.
+    -->
+  <qos_library name="UnkeyedWriter_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="UnkeyedWriter_Profile" is_default_qos="true">
+      <!-- QoS used to configure the data writer created in the example code -->
+      <datawriter_qos>
+        <reliability>
+          <kind>RELIABLE_RELIABILITY_QOS</kind>
+          <max_blocking_time>
+            <sec>10</sec>
+            <nanosec>0</nanosec>
+          </max_blocking_time>
+        </reliability>
+        <durability>
+          <kind>TRANSIENT_DURABILITY_QOS</kind>
+        </durability>
+        <history>
+          <kind>KEEP_LAST_HISTORY_QOS</kind>
+        </history>
+        <resource_limits>
+          <max_samples>10</max_samples>
+          <initial_samples>2</initial_samples>
+        </resource_limits>
+        <protocol>
+          <rtps_reliable_writer>
+            <max_heartbeat_retries>10</max_heartbeat_retries>
+            <heartbeats_per_max_samples>2</heartbeats_per_max_samples>
+          </rtps_reliable_writer>
+        </protocol>
+      </datawriter_qos>
+      <!-- QoS used to configure the data reader created in the example code -->
+      <datareader_qos>
+        <reliability>
+          <kind>RELIABLE_RELIABILITY_QOS</kind>
+        </reliability>
+        <history>
+          <kind>KEEP_LAST_HISTORY_QOS</kind>
+          <depth>20</depth>
+        </history>
+        <durability>
+          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
+        </durability>
+      </datareader_qos>
+    </qos_profile>
+  </qos_library>
+</dds>
\ No newline at end of file