Thu Feb 18 11:36:08 UTC 2010 Marcel Smit <msmit@remedy.nl>

        * connectors/dds4ccm/tests/TwoTopics/*:
          Test to check whether the generated exec code
          compiles without errors when defining two topics
          in one connector.

4 files changed, 274 insertions, 0 deletions

diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
new file mode 100644
index 00000000000..7db4b364e1b
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
@@ -0,0 +1,23 @@
+// $Id$
+
+/**
+ * @file LOBO_Test_Base.idl
+ * @author Marcel Smit <msmit@remedy.nl>
+ */
+
+#ifndef TWOTOPICS_BASE_IDL
+#define TWOTOPICS_BASE_IDL
+
+struct HelloTopic {
+  string hello; //@key
+  long iteration;
+};
+typedef sequence<HelloTopic> HelloTopic_Seq;
+
+struct GoodbyeTopic {
+  string goodbye; //@key
+  long iteration;
+};
+typedef sequence<GoodbyeTopic> GoodbyeTopic_Seq;
+
+#endif
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
new file mode 100755
index 00000000000..d2ce4c07a2e
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
@@ -0,0 +1,74 @@
+// $Id$
+
+project(DDS_TwoTopics_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
+              -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_BASE_STUB_Export \
+              -Wb,stub_export_include=TwoTopics_Base_stub_export.h
+
+  IDL_Files {
+    TwoTopics_Base.idl
+  }
+}
+
+project(DDS_TwoTopics_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_TwoTopics_Base_idl_gen
+
+  NDDSTypeSupport_Files {
+    TwoTopics_Base.idl
+  }
+}
+
+project(DDS_TwoTopics_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_TwoTopics_Base_ndds_ts_gen DDS_TwoTopics_Base_stub
+  libs += DDS_TwoTopics_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_TwoTopics_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
+
+  Source_Files {
+    TwoTopics_Base.cxx
+    TwoTopics_BasePlugin.cxx
+    TwoTopics_BaseSupport.cxx
+  }
+
+  Header_Files {
+    TwoTopics_Base.h
+    TwoTopics_BasePlugin.h
+    TwoTopics_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_TwoTopics_Base_stub) : ccm_stub {
+  after += DDS_TwoTopics_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_TwoTopics_Base_stub
+  dynamicflags = LISTEN_ONE_BY_ONE_TEST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    TwoTopics_BaseC.cpp
+  }
+
+  Header_Files {
+    TwoTopics_BaseC.h
+    TwoTopics_Base_stub_export.h
+  }
+
+  Inline_Files {
+    TwoTopics_BaseC.inl
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
new file mode 100644
index 00000000000..5396b65ea38
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
@@ -0,0 +1,31 @@
+// $Id$
+
+/**
+ * @file TwoTopics_Connector.idl
+ * @author Marcel Smit <msmit@remedy.nl>
+ */
+
+#ifndef TWOTOPICS_CONNECTOR_IDL_
+#define TWOTOPICS_CONNECTOR_IDL_
+
+#include  <Components.idl>
+#include "Base/TwoTopics_Base.idl"
+#include "connectors/dds4ccm/idl/ccm_dds.idl"
+
+#pragma ciao lem "Connector/TwoTopics_ConnectorE.idl"
+#pragma rti typesupport "Base/TwoTopics_BaseSupport.h"
+
+module TT_Connector
+{
+  module ::CCM_DDS::Typed < HelloTopic, HelloTopic_Seq> HelloConn;
+  connector TwoTopicsHello_Connector : HelloConn::DDS_Event
+  {
+  };
+
+  module ::CCM_DDS::Typed < GoodbyeTopic, GoodbyeTopic_Seq> GoodbyeConn;
+  connector TwoTopicsGoodbye_Connector : GoodbyeConn::DDS_Event
+  {
+  };
+};
+
+#endif /* TWOTOPICS_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
new file mode 100755
index 00000000000..c1b9ac1f0e8
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
@@ -0,0 +1,146 @@
+// $Id$
+// This file is generated with "generate_component_mpc.pl -p DDS_TwoTopics_Base -l .. -o ../lib -u DDS TwoTopics_Connector"
+
+project(DDS_TwoTopics_Connector_idl_gen) : connectoridldefaults {
+  after += DDS4CCM_idl_gen
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=TWOTOPICS_CONNECTOR_STUB_Export \
+              -Wb,stub_export_include=TwoTopics_Connector_stub_export.h \
+              -Wb,skel_export_macro=TWOTOPICS_CONNECTOR_SVNT_Export \
+              -Wb,skel_export_include=TwoTopics_Connector_svnt_export.h \
+              -Wb,svnt_export_macro=TWOTOPICS_CONNECTOR_SVNT_Export \
+              -Wb,svnt_export_include=TwoTopics_Connector_svnt_export.h \
+              -Wb,conn_export_macro=TWOTOPICS_CONNECTOR_CONN_Export \
+              -Wb,conn_export_include=TwoTopics_Connector_conn_export.h \
+              -I ..
+
+  IDL_Files {
+    TwoTopics_Connector.idl
+  }
+}
+
+project(DDS_TwoTopics_Connector_lem_gen) : ciaoidldefaults {
+  custom_only = 1
+  after += DDS_TwoTopics_Connector_idl_gen
+  idlflags += -Wb,stub_export_macro=TWOTOPICS_CONNECTOR_LEM_STUB_Export \
+              -Wb,stub_export_include=TwoTopics_Connector_lem_stub_export.h \
+              -SS -Gxhst \
+              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
+
+  IDL_Files {
+    TwoTopics_ConnectorE.idl
+  }
+}
+
+project(DDS_TwoTopics_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
+  after += DDS_TwoTopics_Connector_lem_gen DDS_TwoTopics_Connector_stub DDS_TwoTopics_Base_stub DDS4CCM_lem_stub
+  libs  += DDS_TwoTopics_Base_stub DDS_TwoTopics_Connector_stub DDS4CCM_lem_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  sharedname = DDS_TwoTopics_Connector_lem_stub
+  dynamicflags   = TWOTOPICS_CONNECTOR_LEM_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    TwoTopics_ConnectorEC.cpp
+  }
+
+  Header_Files {
+    TwoTopics_ConnectorEC.h
+    TwoTopics_Connector_lem_stub_export.h
+  }
+
+  Inline_Files {
+    TwoTopics_ConnectorEC.inl
+  }
+}
+
+project(DDS_TwoTopics_Connector_stub) : ccm_stub, dds4ccm_base {
+  after += DDS_TwoTopics_Connector_idl_gen DDS_TwoTopics_Base_stub
+  libs  += DDS_TwoTopics_Base_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  sharedname = DDS_TwoTopics_Connector_stub
+  dynamicflags   = TWOTOPICS_CONNECTOR_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    TwoTopics_ConnectorC.cpp
+  }
+
+  Header_Files {
+    TwoTopics_ConnectorC.h
+    TwoTopics_Connector_stub_export.h
+  }
+
+  Inline_Files {
+    TwoTopics_ConnectorC.inl
+  }
+}
+
+project(DDS_TwoTopics_Connector_exec) : ciao_executor, dds4ccm_impl {
+  after   += DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Connector_stub DDS4CCM_lem_stub DDS_TwoTopics_Base_NDDS_TS
+  sharedname = DDS_TwoTopics_Connector_exec
+  libs += DDS_TwoTopics_Connector_stub DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Base_stub DDS4CCM_lem_stub DDS_TwoTopics_Base_NDDS_TS
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  dynamicflags   = TWOTOPICS_CONNECTOR_CONN_BUILD_DLL
+  requires += dummy_label
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    TwoTopics_Connector_conn.cpp
+  }
+
+  Header_Files {
+    TwoTopics_Connector_conn.h
+    TwoTopics_Connector_conn_export.h
+  }
+
+  Inline_Files {
+  }
+}
+
+
+project(DDS_TwoTopics_Connector_svnt) : ciao_servant, dds4ccm_impl {
+  after      += DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Connector_exec DDS_TwoTopics_Connector_stub DDS4CCM_lem_stub
+  sharedname  = DDS_TwoTopics_Connector_svnt
+  libs       += DDS_TwoTopics_Connector_stub \
+                DDS_TwoTopics_Connector_lem_stub  \
+                DDS_TwoTopics_Base_stub \
+                DDS_TwoTopics_Connector_exec \
+                DDS4CCM_lem_stub
+  libpaths += ../lib
+  libout = ../lib
+  includes += ..
+  dynamicflags = TWOTOPICS_CONNECTOR_SVNT_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    TwoTopics_ConnectorS.cpp
+    TwoTopics_Connector_svnt.cpp
+  }
+
+  Header_Files {
+    TwoTopics_ConnectorS.h
+    TwoTopics_Connector_svnt.h
+    TwoTopics_Connector_svnt_export.h
+  }
+
+  Inline_Files {
+    TwoTopics_ConnectorS.inl
+  }
+}
+
+