Merge pull request OpenDDS#4680 from iguessthislldo/igtd/tsplugin

`TypeSupportPlugin` Test Should Use `ConsolidatedMessengerIdl`
iguessthislldo · Jun 7, 2024 · 1840a59 · 1840a59
2 parents 57edcce + d46f463
commit 1840a59
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 34 deletions.
diff --git a/tests/DCPS/TypeSupportPlugin/.gitignore b/tests/DCPS/TypeSupportPlugin/.gitignore
@@ -1,14 +1 @@
-/TypeSupportPluginUser
-/TypeSupportPluginC.cpp
-/TypeSupportPluginC.h
-/TypeSupportPluginC.inl
-/TypeSupportPluginS.cpp
-/TypeSupportPluginS.h
-/TypeSupportPluginTypeSupportC.cpp
-/TypeSupportPluginTypeSupportC.h
-/TypeSupportPluginTypeSupportC.inl
-/TypeSupportPluginTypeSupport.idl
-/TypeSupportPluginTypeSupportImpl.cpp
-/TypeSupportPluginTypeSupportImpl.h
-/TypeSupportPluginTypeSupportS.cpp
-/TypeSupportPluginTypeSupportS.h
+/TypeSupportPlugin
diff --git a/tests/DCPS/TypeSupportPlugin/TypeSupportPlugin.cpp b/tests/DCPS/TypeSupportPlugin/TypeSupportPlugin.cpp
@@ -20,12 +20,12 @@ int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
   DDS::DomainParticipantFactory_var dpf = TheParticipantFactoryWithArgs(argc, argv);
 
   ACE_DLL ts_plugin;
-  if (ts_plugin.open(ACE_TEXT("TypeSupportPlugin"))) {
+  if (ts_plugin.open(ACE_TEXT("ConsolidatedMessengerIdl"))) {
     ACE_ERROR((LM_ERROR, "ERROR: Failed to open the type support library\n"));
     return 1;
   }
 
-  const char* type_name = "TopicType";
+  const char* const type_name = "Messenger::Message";
   ACE_DEBUG((LM_DEBUG, "Getting TypeSupport for %C\n", type_name));
   DDS::TypeSupport_var ts = Registered_Data_Types->lookup(0, type_name);
   if (!ts) {

diff --git a/tests/DCPS/TypeSupportPlugin/TypeSupportPlugin.idl b/tests/DCPS/TypeSupportPlugin/TypeSupportPlugin.idl
diff --git a/tests/DCPS/TypeSupportPlugin/TypeSupportPlugin.mpc b/tests/DCPS/TypeSupportPlugin/TypeSupportPlugin.mpc
@@ -1,15 +1,4 @@
-project(TypeSupportPlugin): dcps_test {
-  TypeSupport_Files {
-    dcps_ts_flags += -Gxtypes-complete
-    TypeSupportPlugin.idl
-  }
-
-  Source_Files {
-  }
-}
-
-project(TypeSupportPluginUser): dcps_test {
-  exename = TypeSupportPluginUser
+project: dcps_cm {
   Source_Files {
     TypeSupportPlugin.cpp
   }

diff --git a/tests/DCPS/TypeSupportPlugin/run_test.pl b/tests/DCPS/TypeSupportPlugin/run_test.pl
@@ -8,7 +8,9 @@
 use lib "$ENV{DDS_ROOT}/bin";
 use PerlDDS::Run_Test;
 
+PerlDDS::add_lib_path('../ConsolidatedMessengerIdl');
+
 my $test = new PerlDDS::TestFramework();
-$test->process('test', 'TypeSupportPluginUser', join(' ', @ARGV));
+$test->process('test', 'TypeSupportPlugin', join(' ', @ARGV));
 $test->start_process('test');
 exit $test->finish(60);