diff options
9 files changed, 700 insertions, 0 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index d3eb9d4d74f..b4cd26cfd2b 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,16 @@ +Wed Apr 13 19:12:44 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> + + * tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp: + * tests/DAnCE/Launch-Failures/descriptors/AttributeException.cdp: + * tests/DAnCE/Launch-Failures/descriptors/AttributeMismatch.cdp: + * tests/DAnCE/Launch-Failures/descriptors/EntrypointException.cdp: + * tests/DAnCE/Launch-Failures/descriptors/EntrypointFails.cdp: + * tests/DAnCE/Launch-Failures/descriptors/EntrypointIncorrect.cdp: + * tests/DAnCE/Launch-Failures/descriptors/IncorrectLibraryName.cdp: + * tests/DAnCE/Launch-Failures/descriptors/InvalidInstanceType.cdp: + + Additional failure testing. + Wed Apr 13 07:48:22 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> * connectors/dds4ccm/impl/dds4ccm_impl.mpc: diff --git a/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp b/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp index 928dc87fb49..0ba753e1e00 100644 --- a/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp +++ b/CIAO/tests/DAnCE/Launch-Failures/Component/Launch_Failure_exec.cpp @@ -225,6 +225,23 @@ namespace CIAO_Launch_Failure_Impl return retval; } + + extern "C" LAUNCH_FAILURE_EXEC_Export ::Components::EnterpriseComponent_ptr + create_Launch_Failure_Nil (void) + { + ::Components::EnterpriseComponent_ptr retval = + ::Components::EnterpriseComponent::_nil (); + + // Intentionally return nil. + return retval; + } + + extern "C" LAUNCH_FAILURE_EXEC_Export ::Components::EnterpriseComponent_ptr + create_Launch_Failure_Exception (void) + { + // Throw an exception + throw 1; + } } namespace CIAO_Launch_Failure_Impl diff --git a/CIAO/tests/DAnCE/Launch-Failures/descriptors/AttributeException.cdp b/CIAO/tests/DAnCE/Launch-Failures/descriptors/AttributeException.cdp new file mode 100644 index 00000000000..e50f25b8289 --- /dev/null +++ b/CIAO/tests/DAnCE/Launch-Failures/descriptors/AttributeException.cdp @@ -0,0 +1,106 @@ +<!-- $Id$ --> +<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>SimpleComponent_Home</label> + <UUID>SimpleComponent_Home</UUID> + + <!-- Implementations declarations --> + + <!-- Server Dance implementation--> + <implementation xmi:id="Launch_FailureComponentImplementation"> + <name>Launch_FailureComponentImplementation</name> + <source/> + <artifact xmi:idref="Launch_Failure_ExecArtifact" /> + <artifact xmi:idref="Launch_Failure_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see §10.6.1) --> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Launch_Failure_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Launch_Failure_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Launch_Failure_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Launch_Failure_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="Launch_FailureComponentInstanceOne"> + <name>Launch_FailureComponent_One</name> + <node>NodeOne</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="Launch_FailureComponentImplementation" /> + <configProperty> + <name>failure_reason</name> + <value> + <type> + <kind>tk_enum</kind> + <enum> + <name>Failure_Reason</name> + <typeId>IDL:Failure_Reason:1.0</typeId> + <member>NO_ERROR</member> + <member>ATTRIBUTE_EXCEPTION</member> + <member>NIL_FACET_REFERENCE</member> + <member>FACET_REFERENCE_EXCEPTION</member> + </enum> + </type> + <value> + <enum>ATTRIBUTE_EXCEPTION</enum> + </value> + </value> + </configProperty> + </instance> + + <!-- Artifacts declarations --> + <artifact xmi:id="Launch_Failure_ExecArtifact"> + <name>Launch_Failure_exec</name> + <source/> + <node/> + <location>Launch_Failure_exec</location> + </artifact> + <artifact xmi:id="Launch_Failure_SvntArtifact"> + <name>Launch_Failure_svnt</name> + <source/> + <node/> + <location>Launch_Failure_svnt</location> + </artifact> + + </Deployment:DeploymentPlan> diff --git a/CIAO/tests/DAnCE/Launch-Failures/descriptors/AttributeMismatch.cdp b/CIAO/tests/DAnCE/Launch-Failures/descriptors/AttributeMismatch.cdp new file mode 100644 index 00000000000..2af23bf8013 --- /dev/null +++ b/CIAO/tests/DAnCE/Launch-Failures/descriptors/AttributeMismatch.cdp @@ -0,0 +1,102 @@ +<!-- $Id$ --> +<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>SimpleComponent_Home</label> + <UUID>SimpleComponent_Home</UUID> + + <!-- Implementations declarations --> + + <!-- Server Dance implementation--> + <implementation xmi:id="Launch_FailureComponentImplementation"> + <name>Launch_FailureComponentImplementation</name> + <source/> + <artifact xmi:idref="Launch_Failure_ExecArtifact" /> + <artifact xmi:idref="Launch_Failure_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see §10.6.1) --> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Launch_Failure_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Launch_Failure_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Launch_Failure_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Launch_Failure_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="Launch_FailureComponentInstanceOne"> + <name>Launch_FailureComponent_One</name> + <node>NodeOne</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="Launch_FailureComponentImplementation" /> + + <configProperty> + <name>failure_reason</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Intentionally wrong value</string> + </value> + </value> + </configProperty> + + </instance> + + + + <!-- Artifacts declarations --> + <artifact xmi:id="Launch_Failure_ExecArtifact"> + <name>Launch_Failure_exec</name> + <source/> + <node/> + <location>Launch_Failure_exec</location> + </artifact> + <artifact xmi:id="Launch_Failure_SvntArtifact"> + <name>Launch_Failure_svnt</name> + <source/> + <node/> + <location>Launch_Failure_svnt</location> + </artifact> + + </Deployment:DeploymentPlan> diff --git a/CIAO/tests/DAnCE/Launch-Failures/descriptors/EntrypointException.cdp b/CIAO/tests/DAnCE/Launch-Failures/descriptors/EntrypointException.cdp new file mode 100644 index 00000000000..f1c46806b18 --- /dev/null +++ b/CIAO/tests/DAnCE/Launch-Failures/descriptors/EntrypointException.cdp @@ -0,0 +1,87 @@ +<!-- $Id$ --> +<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>SimpleComponent_Home</label> + <UUID>SimpleComponent_Home</UUID> + + <!-- Implementations declarations --> + + <!-- Server Dance implementation--> + <implementation xmi:id="Launch_FailureComponentImplementation"> + <name>Launch_FailureComponentImplementation</name> + <source/> + <artifact xmi:idref="Launch_Failure_ExecArtifact" /> + <artifact xmi:idref="Launch_Failure_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see §10.6.1) --> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Launch_Failure_Exception</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Launch_Failure_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Launch_Failure_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Launch_Failure_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="Launch_FailureComponentInstanceOne"> + <name>Launch_FailureComponent_One</name> + <node>NodeOne</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="Launch_FailureComponentImplementation" /> + </instance> + + <!-- Artifacts declarations --> + <artifact xmi:id="Launch_Failure_ExecArtifact"> + <name>Launch_Failure_exec</name> + <source/> + <node/> + <location>Launch_Failure_exec</location> + </artifact> + <artifact xmi:id="Launch_Failure_SvntArtifact"> + <name>Launch_Failure_svnt</name> + <source/> + <node/> + <location>Launch_Failure_svnt</location> + </artifact> + + </Deployment:DeploymentPlan> diff --git a/CIAO/tests/DAnCE/Launch-Failures/descriptors/EntrypointFails.cdp b/CIAO/tests/DAnCE/Launch-Failures/descriptors/EntrypointFails.cdp new file mode 100644 index 00000000000..8a692ee3091 --- /dev/null +++ b/CIAO/tests/DAnCE/Launch-Failures/descriptors/EntrypointFails.cdp @@ -0,0 +1,87 @@ +<!-- $Id$ --> +<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>SimpleComponent_Home</label> + <UUID>SimpleComponent_Home</UUID> + + <!-- Implementations declarations --> + + <!-- Server Dance implementation--> + <implementation xmi:id="Launch_FailureComponentImplementation"> + <name>Launch_FailureComponentImplementation</name> + <source/> + <artifact xmi:idref="Launch_Failure_ExecArtifact" /> + <artifact xmi:idref="Launch_Failure_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see §10.6.1) --> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Launch_Failure_Nil</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Launch_Failure_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Launch_Failure_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Launch_Failure_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="Launch_FailureComponentInstanceOne"> + <name>Launch_FailureComponent_One</name> + <node>NodeOne</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="Launch_FailureComponentImplementation" /> + </instance> + + <!-- Artifacts declarations --> + <artifact xmi:id="Launch_Failure_ExecArtifact"> + <name>Launch_Failure_exec</name> + <source/> + <node/> + <location>Launch_Failure_exec</location> + </artifact> + <artifact xmi:id="Launch_Failure_SvntArtifact"> + <name>Launch_Failure_svnt</name> + <source/> + <node/> + <location>Launch_Failure_svnt</location> + </artifact> + + </Deployment:DeploymentPlan> diff --git a/CIAO/tests/DAnCE/Launch-Failures/descriptors/EntrypointIncorrect.cdp b/CIAO/tests/DAnCE/Launch-Failures/descriptors/EntrypointIncorrect.cdp new file mode 100644 index 00000000000..dea4efa5c15 --- /dev/null +++ b/CIAO/tests/DAnCE/Launch-Failures/descriptors/EntrypointIncorrect.cdp @@ -0,0 +1,87 @@ +<!-- $Id$ --> +<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>SimpleComponent_Home</label> + <UUID>SimpleComponent_Home</UUID> + + <!-- Implementations declarations --> + + <!-- Server Dance implementation--> + <implementation xmi:id="Launch_FailureComponentImplementation"> + <name>Launch_FailureComponentImplementation</name> + <source/> + <artifact xmi:idref="Launch_Failure_ExecArtifact" /> + <artifact xmi:idref="Launch_Failure_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see §10.6.1) --> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Launch_Failure_FAKE</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Launch_Failure_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Launch_Failure_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Launch_Failure_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="Launch_FailureComponentInstanceOne"> + <name>Launch_FailureComponent_One</name> + <node>NodeOne</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="Launch_FailureComponentImplementation" /> + </instance> + + <!-- Artifacts declarations --> + <artifact xmi:id="Launch_Failure_ExecArtifact"> + <name>Launch_Failure_exec</name> + <source/> + <node/> + <location>Launch_Failure_exec</location> + </artifact> + <artifact xmi:id="Launch_Failure_SvntArtifact"> + <name>Launch_Failure_svnt</name> + <source/> + <node/> + <location>Launch_Failure_svnt</location> + </artifact> + + </Deployment:DeploymentPlan> diff --git a/CIAO/tests/DAnCE/Launch-Failures/descriptors/IncorrectLibraryName.cdp b/CIAO/tests/DAnCE/Launch-Failures/descriptors/IncorrectLibraryName.cdp new file mode 100644 index 00000000000..6a9acf9308b --- /dev/null +++ b/CIAO/tests/DAnCE/Launch-Failures/descriptors/IncorrectLibraryName.cdp @@ -0,0 +1,95 @@ +<!-- $Id$ --> +<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>SimpleComponent_Home</label> + <UUID>SimpleComponent_Home</UUID> + + <!-- Implementations declarations --> + + <!-- Server Dance implementation--> + <implementation xmi:id="Launch_FailureComponentImplementation"> + <name>Launch_FailureComponentImplementation</name> + <source/> + <artifact xmi:idref="Launch_Failure_ExecArtifact" /> + <artifact xmi:idref="Launch_Failure_SvntArtifact" /> + <execParameter> + <!-- entrypoint as exec parameter (see §10.6.1) --> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Launch_Failure_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Launch_Failure_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Launch_Failure_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Launch_Failure_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="Launch_FailureComponentInstanceOne"> + <name>Launch_FailureComponent_One</name> + <node>NodeOne</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="Launch_FailureComponentImplementation" /> + </instance> + + <instance xmi:id="Launch_FailureComponentInstanceTwo"> + <name>Launch_FailureComponent_Two</name> + <node>NodeTwo</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="Launch_FailureComponentImplementation" /> + </instance> + + <!-- Artifacts declarations --> + <artifact xmi:id="Launch_Failure_ExecArtifact"> + <name>Launch_Failure_exec</name> + <source/> + <node/> + <location>Launch_Failure_exec_FAKE</location> + </artifact> + <artifact xmi:id="Launch_Failure_SvntArtifact"> + <name>Launch_Failure_svnt</name> + <source/> + <node/> + <location>Launch_Failure_svnt</location> + </artifact> + + </Deployment:DeploymentPlan> diff --git a/CIAO/tests/DAnCE/Launch-Failures/descriptors/InvalidInstanceType.cdp b/CIAO/tests/DAnCE/Launch-Failures/descriptors/InvalidInstanceType.cdp new file mode 100644 index 00000000000..17907f456b1 --- /dev/null +++ b/CIAO/tests/DAnCE/Launch-Failures/descriptors/InvalidInstanceType.cdp @@ -0,0 +1,106 @@ +<!-- $Id$ --> +<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>SimpleComponent_Home</label> + <UUID>SimpleComponent_Home</UUID> + + <!-- Implementations declarations --> + + <!-- Server Dance implementation--> + <implementation xmi:id="Launch_FailureComponentImplementation"> + <name>Launch_FailureComponentImplementation</name> + <source/> + <artifact xmi:idref="Launch_Failure_ExecArtifact" /> + <artifact xmi:idref="Launch_Failure_SvntArtifact" /> + <execParameter> + <name>edu.vanderbilt.dre.DAnCE.ImplementationType</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Bad.Implementation.Type</string> + </value> + </value> + </execParameter> + <execParameter> + <!-- entrypoint as exec parameter (see §10.6.1) --> + <name>component factory</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Launch_Failure_Impl</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>create_Launch_Failure_Servant</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Launch_Failure_svnt</string> + </value> + </value> + </execParameter> + <execParameter> + <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name> + <value> + <type> + <kind>tk_string</kind> + </type> + <value> + <string>Launch_Failure_exec</string> + </value> + </value> + </execParameter> + </implementation> + + <instance xmi:id="Launch_FailureComponentInstanceOne"> + <name>Launch_FailureComponent_One</name> + <node>NodeOne</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="Launch_FailureComponentImplementation" /> + </instance> + + <instance xmi:id="Launch_FailureComponentInstanceTwo"> + <name>Launch_FailureComponent_Two</name> + <node>NodeTwo</node> + <!-- hostname --> + <source/> + <implementation xmi:idref="Launch_FailureComponentImplementation" /> + </instance> + + <!-- Artifacts declarations --> + <artifact xmi:id="Launch_Failure_ExecArtifact"> + <name>Launch_Failure_exec</name> + <source/> + <node/> + <location>Launch_Failure_exec</location> + </artifact> + <artifact xmi:id="Launch_Failure_SvntArtifact"> + <name>Launch_Failure_svnt</name> + <source/> + <node/> + <location>Launch_Failure_svnt</location> + </artifact> + + </Deployment:DeploymentPlan> |