diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-03-06 08:16:18 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-03-06 08:16:18 +0000 |
commit | a0665dcee8655bdcce35279f57772b9faad37233 (patch) | |
tree | 0c2b30f3d190db15ab5da68a4d7984518e60448c /TAO | |
parent | 4f8ce86d7b3f82d6c08cf2a14812752fa8d1e25a (diff) | |
download | ATCD-a0665dcee8655bdcce35279f57772b9faad37233.tar.gz |
Tue Mar 6 08:15:32 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/ChangeLog | 11 | ||||
-rw-r--r-- | TAO/tests/Any/Recursive/Test.idl | 21 | ||||
-rw-r--r-- | TAO/tests/Any/Recursive/client.cpp | 20 | ||||
-rw-r--r-- | TAO/tests/POA/Current/Current.cpp | 11 |
4 files changed, 47 insertions, 16 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index cb41149e4fe..4a66b052b81 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,14 @@ +Tue Mar 6 08:15:32 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Any/Recursive/Test.idl: + Added another test case + + * tests/Any/Recursive/client.cpp: + Extended with more tests + + * tests/POA/Current/Current.cpp: + Layout changes + Tue Mar 6 03:08:49 UTC 2007 Carlos O'Ryan <coryan@atdesk.com> * tests/POA/Bug_1592_Regression/run_test.pl: diff --git a/TAO/tests/Any/Recursive/Test.idl b/TAO/tests/Any/Recursive/Test.idl index 9ac5431543b..ee33fbe5e0c 100644 --- a/TAO/tests/Any/Recursive/Test.idl +++ b/TAO/tests/Any/Recursive/Test.idl @@ -33,6 +33,27 @@ module Test long i; }; + struct NestedRecursiveStruct5; + typedef sequence<NestedRecursiveStruct5> NestedRecursiveStructSeq5; + struct NestedRecursiveStruct5 + { + long i; + union MyUnion5 switch (short) + { + case 0: + struct InnerStruct5 + { + union Intern5 switch (short) + { + case 0: + NestedRecursiveStructSeq5 recursive_structs5; + } intbb5; + } ins65; + default: + long i; + } in5; + }; + // -------------------------- union RecursiveUnion; diff --git a/TAO/tests/Any/Recursive/client.cpp b/TAO/tests/Any/Recursive/client.cpp index e98636c0bfb..42c4fd71a27 100644 --- a/TAO/tests/Any/Recursive/client.cpp +++ b/TAO/tests/Any/Recursive/client.cpp @@ -182,10 +182,16 @@ nested_recursive_struct_test (CORBA::ORB_ptr /* orb */, CORBA::Any the_any; the_any <<= foo; - ::perform_invocation<Test::NestedRecursiveStruct> (hello, - the_any); + ::perform_invocation<Test::NestedRecursiveStruct> (hello, the_any); + + Test::NestedRecursiveStruct5 foo5; + + the_any <<= foo; + + ::perform_invocation<Test::NestedRecursiveStruct5> (hello, the_any); } + void recursive_union_test (CORBA::ORB_ptr /* orb */, Test::Hello_ptr hello) @@ -202,8 +208,7 @@ recursive_union_test (CORBA::ORB_ptr /* orb */, foo_enum.i (test_long); the_any <<= foo_enum; - ::perform_invocation<Test::EnumUnion> (hello, - the_any); + ::perform_invocation<Test::EnumUnion> (hello, the_any); // Non-recursive member case. Test::RecursiveUnion foo; @@ -211,8 +216,7 @@ recursive_union_test (CORBA::ORB_ptr /* orb */, the_any <<= foo; - ::perform_invocation<Test::RecursiveUnion> (hello, - the_any); + ::perform_invocation<Test::RecursiveUnion> (hello, the_any); Test::RecursiveUnion2 foo2; foo2.i (test_long); @@ -466,11 +470,11 @@ main (int argc, char *argv[]) static test_func const tests[] = { - recursive_union_test - , recursive_struct_test + recursive_struct_test , nested_recursive_struct_test , indirectly_recursive_valuetype_test , directly_recursive_valuetype_test + , recursive_union_test #if TAO_HAS_MINIMUM_CORBA == 0 , recursive_struct_typecodefactory_test , recursive_union_typecodefactory_test diff --git a/TAO/tests/POA/Current/Current.cpp b/TAO/tests/POA/Current/Current.cpp index a81a636773a..2018bc00f13 100644 --- a/TAO/tests/POA/Current/Current.cpp +++ b/TAO/tests/POA/Current/Current.cpp @@ -29,21 +29,16 @@ main (int argc, char **argv) try { // Initialize the ORB first. - CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - 0); + CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); CORBA::Object_var object; - object = - orb->resolve_initial_references ("POACurrent"); + object = orb->resolve_initial_references ("POACurrent"); PortableServer::Current_var current = PortableServer::Current::_narrow (object.in ()); - object = - orb->resolve_initial_references ("RootPOA"); + object = orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var root_poa = PortableServer::POA::_narrow (object.in ()); |