Fix custom feature IDL files (#5903)

* Fix identifier in `extra_structures.idl`

Signed-off-by: Miguel Company <[email protected]>

* Update regeneration script

Signed-off-by: Miguel Company <[email protected]>

* Also fix extra_unions.idl

Signed-off-by: Miguel Company <[email protected]>

* Fix module name in unit test

Signed-off-by: Carlosespicur <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
Signed-off-by: Carlosespicur <[email protected]>
Co-authored-by: Carlosespicur <[email protected]>

Author: MiguelCompany

test/feature/idl_parser/IdlParserTests.cpp

@@ -471,7 +471,7 @@ TEST_F(IdlParserTests, structures)
 
     DynamicTypeBuilder::_ref_type builder37 = factory->create_type_w_uri(
         "IDL/extra_structures.idl",
-        "Module::ScopedNamesStruct",
+        "MyModule::ScopedNamesStruct",
         include_paths);
     EXPECT_TRUE(builder37);
     DynamicType::_ref_type type37 = builder37->build();

test/feature/idl_parser/idl_extra_cases/extra_structures.idl

@@ -26,14 +26,14 @@ module Outer
 };
 
 // Check resolution of relative and absolute scoped names
-module Module
+module MyModule
 {
     typedef float FloatAlias;
 
     struct ScopedNamesStruct
     {
-        Module::FloatAlias absolute_scoped_float;
-        ::Module::FloatAlias absolute_scoped_w_root_float;
+        MyModule::FloatAlias absolute_scoped_float;
+        ::MyModule::FloatAlias absolute_scoped_w_root_float;
         FloatAlias relative_scoped_float;
     };
 };

test/feature/idl_parser/idl_extra_cases/extra_unions.idl

@@ -1,5 +1,5 @@
 // Union with scoped discriminator
-module Module
+module MyModule
 {
     enum ScopedEnumHelper
     {
@@ -9,11 +9,11 @@ module Module
     };
 };
 
-union UnionScopedDiscriminator switch (Module::ScopedEnumHelper)
+union UnionScopedDiscriminator switch (MyModule::ScopedEnumHelper)
 {
-    case Module::ENUM_VALUE_1:
+    case MyModule::ENUM_VALUE_1:
         long first;
-    case Module::ENUM_VALUE_2:
+    case MyModule::ENUM_VALUE_2:
         long long second;
     default:
         octet third;

utils/scripts/update_generated_code_from_idl.sh

@@ -3,8 +3,9 @@
 set -e
 
 files_to_exclude=(
-    './thirdparty/dds-types-test/IDL/relative_path_include.idl' # Relative path not working in current location.
-    './test/feature/idl_parser/no_path_included.idl'            # Relative path not working in current location.
+    './thirdparty/dds-types-test/IDL/relative_path_include.idl'       # Relative path not working in current location.
+    './test/feature/idl_parser/no_path_included.idl'                  # Relative path not working in current location.
+    './test/feature/idl_parser/idl_extra_cases/extra_structures.idl'  # Contains features not supported by IDL parser (scoped name beginning with double colon).
 )
 
 files_not_needing_typeobject=(