Fri Mar 23 20:34:35 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>

        * tests/Bug_4009_Regression/Bug_4009_Bar.idl:
        * tests/Bug_4009_Regression/Bug_4009_Bar.mpc:
        * tests/Bug_4009_Regression/Bug_4009_Foo.idl:
          Extended this test with much more typedefs

4 files changed, 94 insertions, 1 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 79b0c237cbd..f67e642a360 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+Fri Mar 23 20:34:35 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Bug_4009_Regression/Bug_4009_Bar.idl:
+        * tests/Bug_4009_Regression/Bug_4009_Bar.mpc:
+        * tests/Bug_4009_Regression/Bug_4009_Foo.idl:
+          Extended this test with much more typedefs
+
 Fri Mar 23 20:24:42 UTC 2012  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/Bug_4009_Regression/Bug_4009_Bar.idl:
diff --git a/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.idl b/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.idl
index 7000a0e484e..9edb2204387 100644
--- a/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.idl
+++ b/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.idl
@@ -9,6 +9,29 @@ module BarMod
   component SequenceComp
     {
       attribute BarMod::TestOfLongSeq myAttribute;
+      attribute short  my_short;
+      attribute long   my_long;
+      attribute float  my_float;
+      attribute double my_double;
+      attribute BarMod::fixed_string my_fixed_string;
+      attribute string my_variable_string;
+      attribute BarMod::fixed_wstring my_fixed_wstring;
+      attribute wstring my_variable_wstring;
+
+      attribute BarMod::long_array my_long_array;
+      attribute BarMod::string_array my_string_array;
+
+      attribute BarMod::short_sequence  my_short_sequence;
+      attribute BarMod::short_sequence  my_empty_sequence;
+      attribute BarMod::long_sequence   my_long_sequence;
+      attribute BarMod::float_sequence  my_float_sequence;
+      attribute BarMod::double_sequence my_double_sequence;
+      attribute BarMod::string_sequence my_string_sequence;
+
+      attribute BarMod::Bar my_bar_struct;
+      attribute BarMod::Baz my_baz_struct;
+      attribute BarMod::Data my_data_union;
+      attribute BarMod::Data2 my_var_data_union;
     };
 };
 
diff --git a/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.mpc b/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.mpc
index d01526ae51f..2465181ba8a 100644
--- a/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.mpc
+++ b/CIAO/tests/Bug_4009_Regression/Bug_4009_Bar.mpc
@@ -57,7 +57,7 @@ project(Bug_4009_Bar_exec) : ciao_executor {
   sharedname = Bug_4009_Bar_exec
   after     += Bug_4009_Bar_lem_gen Bug_4009_Bar_stub
   libs      += Bug_4009_Bar_stub
-requires += dummy_label
+
   dynamicflags += IC_BAR_EXEC_BUILD_DLL
 
   IDL_Files {
diff --git a/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.idl b/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.idl
index c36c9bf6240..04120ba379b 100644
--- a/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.idl
+++ b/CIAO/tests/Bug_4009_Regression/Bug_4009_Foo.idl
@@ -13,6 +13,69 @@ component Foo
 module BarMod
 {
   typedef sequence<long> TestOfLongSeq;
+  typedef sequence<short>  short_sequence;
+  typedef sequence<long>   long_sequence;
+  typedef sequence<float>  float_sequence;
+  typedef sequence<double> double_sequence;
+  typedef sequence<string> string_sequence;
+  typedef long long_array[5];
+  typedef string string_array[5];
+  typedef string<50> fixed_string;
+  typedef wstring<50> fixed_wstring;
+
+  struct Bar
+  {
+    short  s;
+    long   l;
+    float  f;
+    double d;
+  };
+
+  typedef sequence<Bar, 5> BarSeq;
+
+  struct Baz
+  {
+    string name;
+    BarSeq my_bar_sequence;
+  };
+
+  enum DataType
+  {
+    dtEmpty,
+    dtLong,
+    dtShort
+  };
+
+  union Data switch (DataType)
+  {
+    case dtLong: long longData;
+    case dtShort: short shortData;
+  };
+
+  enum DataType2
+  {
+    dtString,
+    dtShortType
+  };
+
+  union Data2 switch (DataType2)
+  {
+    case dtString: string stringData;
+    case dtShortType: short shortData;
+  };
+
+  interface FooSupport
+  {
+      attribute short supported_short;
+  };
+};
+
+module BarMod
+{
+  component SequenceCompBar
+    {
+      attribute BarMod::TestOfLongSeq myAttribute;
+    };
 };
 
 #endif