summaryrefslogtreecommitdiff
path: root/CIAO/tests
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2009-11-17 10:39:30 +0000
committermsmit <msmit@remedy.nl>2009-11-17 10:39:30 +0000
commit54a4a805561d3d4e7f0391ebd60637a46cffdb76 (patch)
treebc9203ffbe444daad9d5196e81c80d8a33e862fb /CIAO/tests
parent445a921be43a5d4612ceefd9b3d16e536497c2aa (diff)
downloadATCD-54a4a805561d3d4e7f0391ebd60637a46cffdb76.tar.gz
Tue Nov 17 10:39:35 UTC 2009 Marcel Smit <msmit@remedy.nl>
* tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.h: * tests/IDL_Test/Double_Inherited_Component/Inherited_components.idl: Extended tests with some more interfaces.
Diffstat (limited to 'CIAO/tests')
-rw-r--r--CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.h11
-rw-r--r--CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.idl19
2 files changed, 29 insertions, 1 deletions
diff --git a/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.h b/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.h
index 64beb3eaa1d..b32685772df 100644
--- a/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.h
+++ b/CIAO/tests/IDL_Test/Double_Inherited_Component/ComponentC_exec.h
@@ -41,7 +41,16 @@ namespace CIAO_connector_test_C_Impl
topic_name_a (const char * topic_name);
virtual char *
topic_name_a (void);
-
+
+ virtual ::connector_test::CCM_X_ptr
+ get_x_a2 (void) { return 0; }
+
+ virtual ::connector_test::CCM_Y_ptr
+ get_y_b2 (void) { return 0; }
+
+ virtual ::connector_test::CCM_Z_ptr
+ get_z_c2 (void) { return 0; }
+
virtual void
set_session_context (
::Components::SessionContext_ptr ctx);
diff --git a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.idl b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.idl
index c30820eacdb..e984c87950b 100644
--- a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.idl
+++ b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.idl
@@ -12,19 +12,38 @@
#include <Components.idl>
module connector_test
{
+ interface X {
+ attribute string X_a;
+ void opX ();
+ };
+ interface Y {
+ attribute string Y_a;
+ void opY ();
+ };
+ interface Z {
+ attribute string Z_a;
+ void opZ ();
+ };
+
component A
{
attribute string topic_name_a;
+ uses X x_a1;
+ provides X x_a2;
};
component B : A
{
attribute string topic_name_b;
+ uses Y y_b1;
+ provides Y y_b2;
};
component C : B
{
attribute string topic_name_c;
+ uses Z z_c1;
+ provides Z z_c2;
};
};
#endif