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

        * connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp:
        * connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp:
        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp:
        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp:
          Also reported messages when things go as planned.

        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp:
          Resolved some compiler error.

6 files changed, 103 insertions, 8 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 28c1e7c878c..36791283e11 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,14 @@
+Thu Nov 26 11:43:12 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp:
+        * connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp:
+        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp:
+        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp:
+          Also reported messages when things go as planned.
+
+        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp:
+          Resolved some compiler error.
+
 Thu Nov 26 11:37:12 UTC 2009  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * examples/Hello/descriptors_RTCCM/*:
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp
index ce07555b987..22b8d3c92b8 100644
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Receiver/Get_Connection_Test_Receiver_exec.cpp
@@ -121,34 +121,66 @@ namespace CIAO_Get_Connection_Test_Receiver_Impl
       {
         CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get getter failed\n")));
       }
+    else
+      {
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Receiver : Get getter passed\n")));
+      }
     if (!this->reader_listen_ok_)
       {
         CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get reader of DDS_Listen failed\n")));
       }
+    else
+      {
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Receiver : Get reader of DDS_Listen passed\n")));
+      }
     if (!this->dds_data_reader_listen_ok_)
       {
         CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get dds reader of DDS_Listen failed\n")));
       }
+    else
+      {
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Receiver : Get dds reader of DDS_Listen passed\n")));
+      }
     if (!this->data_listener_control_ok_)
       {
         CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : get data listen control of DDS_Listen failed\n")));
       }
+    else
+      {
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Receiver : Get data listen control of DDS_Listen passed\n")));
+      }
     if (!this->raw_listener_created_)
       {
         CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : listener not created\n")));
       }
+    else
+      {
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Receiver : Listener was created\n")));
+      }
     if (!this->listen_port_status_created_)
       {
         CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Listen not created\n")));
       }
+    else
+      {
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Receiver : PortStatusListener of DDS_Listen was created\n")));
+      }
     if (!this->get_port_status_created_)
       {
         CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : PortStatusListener of DDS_Get not created\n")));
       }
+    else
+      {
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Receiver : PortStatusListener of DDS_Get was created\n")));
+      }
     if (!this->get_status_listener_created_)
       {
         CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Receiver : ConnectorStatusListener not created\n")));
       }
+    else
+      {
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Receiver : ConnectorStatusListener was created\n")));
+      }
   }
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp
index 4b888345075..d4dae44d853 100644
--- a/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Get_Connection_Test/Sender/Get_Connection_Test_Sender_exec.cpp
@@ -85,18 +85,34 @@ namespace CIAO_Get_Connection_Test_Sender_Impl
       {
         CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : get updater failed\n")));
       }
+    else
+      {
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Sender : Get updater passed\n")));
+      }
     if (!this->writer_ok_)
       {
         CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : get writer failed\n")));
       }
+    else
+      {
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Sender : Get writer passed\n")));
+      }
     if (!this->updater_dds_datawriter_ok_)
       {
         CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : get dds updater failed\n")));
       }
+    else
+      {
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Sender : Get dds updater passed\n")));
+      }
     if (!this->writer_dds_datawriter_ok_)
       {
         CIAO_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Sender : get dds writer failed\n")));
       }
+    else
+      {
+        CIAO_ERROR ((LM_ERROR, ACE_TEXT ("Sender : Get dds writer passed\n")));
+      }
   }
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp
index 7750f2137cd..7198b6c1fb4 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp
@@ -29,6 +29,12 @@ namespace CIAO_NonChangeable_NonChangeable_Connector_Impl
           ACE_TEXT ("test_domain_id : Expected exception caught\n")));
         nonchangeable_caught = true;
       }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("Exception caught:");
+        CIAO_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_domain_id : Exception caught\n")));
+      }
     catch (...)
       {
         CIAO_ERROR ((LM_ERROR, 
@@ -55,6 +61,12 @@ namespace CIAO_NonChangeable_NonChangeable_Connector_Impl
           ACE_TEXT ("test_qos_profile : Expected exception caught\n")));
         nonchangeable_caught = true;
       }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("Exception caught:");
+        CIAO_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_qos_profile : Exception caught\n")));
+      }
     catch (...)
       {
         CIAO_ERROR ((LM_ERROR, 
@@ -81,6 +93,12 @@ namespace CIAO_NonChangeable_NonChangeable_Connector_Impl
           ACE_TEXT ("test_topic_name : Expected exception caught\n")));
         nonchangeable_caught = true;
       }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("Exception caught:");
+        CIAO_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_topic_name : Exception caught\n")));
+      }
     catch (...)
       {
         CIAO_ERROR ((LM_ERROR, 
@@ -108,6 +126,12 @@ namespace CIAO_NonChangeable_NonChangeable_Connector_Impl
           ACE_TEXT ("test_key_fields : Expected exception caught\n")));
         nonchangeable_caught = true;
       }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("Exception caught:");
+        CIAO_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_key_fields : Exception caught\n")));
+      }
     catch (...)
       {
         CIAO_ERROR ((LM_ERROR, 
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp
index 457c07f7bb1..12ab1952e57 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp
@@ -37,6 +37,12 @@ namespace CIAO_SetConnectorAttribute_SetConnectorAttribute_Connector_Impl
             CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("domain_id has been properly set\n")));
           }
       }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("Exception caught:");
+        CIAO_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_domain_id : Exception caught\n")));
+      }
     catch (...)
       {
         CIAO_ERROR ((LM_ERROR,
@@ -61,6 +67,12 @@ namespace CIAO_SetConnectorAttribute_SetConnectorAttribute_Connector_Impl
             CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("qos_profile has been properly set\n")));
           }
       }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("Exception caught:");
+        CIAO_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_qos_profile : Exception caught\n")));
+      }
     catch (...)
       {
         CIAO_ERROR ((LM_ERROR,
@@ -85,6 +97,12 @@ namespace CIAO_SetConnectorAttribute_SetConnectorAttribute_Connector_Impl
             CIAO_DEBUG ((LM_DEBUG, ACE_TEXT ("topic_name has been properly set\n")));
           }
       }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("Exception caught:");
+        CIAO_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_topic_name : Exception caught\n")));
+      }
     catch (...)
       {
         CIAO_ERROR ((LM_ERROR,
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
index 36b18e1b0e9..6e96c0308ef 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver_exec.cpp
@@ -186,14 +186,8 @@ namespace CIAO_Unkeyed_Test_Receiver_Impl
   void
   Receiver_exec_i::ccm_remove (void)
   {
-    CIAO_DEBUG ((LM_INFO, "Receiver_exec_i summary: received <%u> - expected <%d>\n",
-                this->received_,
-                this->expected_));
-    if (this->received_ < this->expected_)
-      {
-        CIAO_ERROR ((LM_ERROR, "ERROR : Expected to receive %u samples, actually got %u\n",
-            this->expected_, this->received_));
-      }
+    CIAO_DEBUG ((LM_INFO, "Receiver_exec_i summary: received <%u>\n",
+                this->received_));
   }
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr