Wed Sep 8 06:34:56 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl:
          Hiding output since plan_launcher should return expected errors.

        * connectors/dds4ccm/tests/TopicName/descriptors/Empty.cdp:
          Removed this file.

2 files changed, 14 insertions, 191 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/Empty.cdp b/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/Empty.cdp
deleted file mode 100644
index 2ff7a0b72b9..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/Empty.cdp
+++ /dev/null
@@ -1,190 +0,0 @@
-<Deployment:DeploymentPlan
-                          xmlns:Deployment="http://www.omg.org/Deployment"
-                          xmlns:xmi="http://www.omg.org/XMI"
-                          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                          xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-  <label>TopicNameEventTest_Depl</label>
-  <UUID>TopicNameEventTest_Depl</UUID>
-
-  <implementation xmi:id="ComponentImplementation">
-    <name>ComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Component_ExecArtifact" />
-    <artifact xmi:idref="Component_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TopicName_Test_TopicNameTestComponent_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TopicName_Test_TopicNameTestComponent_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="TopicName_Test_ConnectorImplementation">
-    <name>TopicName_Test_ConnectorImplementation</name>
-    <source/>
-    <artifact xmi:idref="TopicName_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="TopicName_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TopicNameTestConnector_DDS_Event_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_TopicNameTestConnector_DDS_Event_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicName_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TopicName_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ComponentInstance">
-    <name>Component</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ComponentImplementation" />
-  </instance>
-
-  <instance xmi:id="TopicName_Test_ConnectorInstance">
-    <name>TopicName_Test_Connector</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="TopicName_Test_ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string></string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>write_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="TopicName_Test_ConnectorInstance" />
-    </internalEndpoint>
-  </connection>
-
-
-  <artifact xmi:id="TopicName_Test_Connector_ExecArtifact">
-    <name>TopicName_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>TopicName_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="TopicName_Test_Connector_SvntArtifact">
-    <name>TopicName_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>TopicName_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="TopicName_Test_Connector_StubArtifact">
-    <name>TopicName_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>TopicName_Test_Connector_stub</location>
-  </artifact>
-
-  <artifact xmi:id="Component_ExecArtifact">
-    <name>Component_exec</name>
-    <source/>
-    <node/>
-    <location>Component_exec</location>
-  </artifact>
-  <artifact xmi:id="Component_SvntArtifact">
-    <name>Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Component_svnt</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl
index 3a22a03ade0..992c11148b4 100755
--- a/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/TopicName/descriptors/run_test.pl
@@ -194,11 +194,21 @@ foreach $file (@files) {
 
     # Invoke executor - start the application -.
     print "Invoking executor - launch the application -\n";
+
+open (OLDOUT, ">&STDOUT");
+open (STDOUT, ">" . File::Spec->devnull());
+open (OLDERR, ">&STDERR");
+open (STDERR, ">&STDOUT");
+
     $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
                                       "-x $file -k file://$ior_emfile");
     $pl_status = $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
+
+open (STDOUT, ">&OLDOUT");
+open (STDERR, ">&OLDERR");
+
     if ($pl_status == 0) {
-        print STDERR "ERROR: plan_launcher started while is shouldn't\n";
+        print STDERR "ERROR: plan_launcher didn't return errors.\n";
 
         print "Sleeping 5 seconds to allow task to complete\n";
         sleep (5);
@@ -209,6 +219,9 @@ foreach $file (@files) {
         $E->SpawnWaitKill (5 * $tg_executor->ProcessStartWaitInterval ());
         print "Executor finished.\n";
     }
+    else {
+        print "OK. plan_launcher returned an expected value.\n";
+    }
     delete_ior_files ();
     kill_open_processes ();
 }