diff options
Diffstat (limited to 'TAO/tests/DynAny_Test/test_dynunion.cpp')
| -rw-r--r-- | TAO/tests/DynAny_Test/test_dynunion.cpp | 205 |
1 files changed, 66 insertions, 139 deletions
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp index 269f161e974..b24a4542d78 100644 --- a/TAO/tests/DynAny_Test/test_dynunion.cpp +++ b/TAO/tests/DynAny_Test/test_dynunion.cpp @@ -44,21 +44,17 @@ Test_DynUnion::run_test (void) DynAnyTests::test_union tu; - ACE_TRY_NEW_ENV + try { ACE_DEBUG ((LM_DEBUG, "\t*=*=*=*= %s =*=*=*=*\n", data.labels[12])); CORBA::Object_var factory_obj = - this->orb_->resolve_initial_references ("DynAnyFactory" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->orb_->resolve_initial_references ("DynAnyFactory"); DynamicAny::DynAnyFactory_var dynany_factory = - DynamicAny::DynAnyFactory::_narrow (factory_obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()); if (CORBA::is_nil (dynany_factory.in ())) { @@ -78,24 +74,16 @@ Test_DynUnion::run_test (void) CORBA::Any in_any4; in_any4 <<= tstring; DynamicAny::DynAny_var dp4 = - dynany_factory->create_dyn_any (in_any4 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + dynany_factory->create_dyn_any (in_any4); DynamicAny::DynUnion_var fa4 = - DynamicAny::DynUnion::_narrow (dp4.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + DynamicAny::DynUnion::_narrow (dp4.in ()); - analyzer.analyze(fa4.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + analyzer.analyze(fa4.in()); - CORBA::Any_var out_any5 = fa4->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Any_var out_any5 = fa4->to_any (); DynamicAny::DynAny_var dp5 = - dynany_factory->create_dyn_any (out_any5.in() - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + dynany_factory->create_dyn_any (out_any5.in()); ACE_DEBUG ((LM_DEBUG, "testing: constructor(Any)/insert/get\n")); @@ -105,27 +93,16 @@ Test_DynUnion::run_test (void) CORBA::Any in_any1; in_any1 <<= tu; DynamicAny::DynAny_var dp1 = - dynany_factory->create_dyn_any (in_any1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + dynany_factory->create_dyn_any (in_any1); DynamicAny::DynUnion_var fa1 = - DynamicAny::DynUnion::_narrow (dp1.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - fa1->seek (1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - fa1->insert_typecode (data.m_typecode1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::TypeCode_var s_out1 = fa1->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + DynamicAny::DynUnion::_narrow (dp1.in ()); + fa1->seek (1); + fa1->insert_typecode (data.m_typecode1); + + CORBA::TypeCode_var s_out1 = fa1->get_typecode (); CORBA::Boolean const equal_tc1 = - s_out1->equal (data.m_typecode1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + s_out1->equal (data.m_typecode1); if (equal_tc1) { @@ -140,20 +117,14 @@ Test_DynUnion::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: constructor(TypeCode)/from_any/to_any\n")); - analyzer.analyze (fa1.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + analyzer.analyze (fa1.in()); - CORBA::Any_var out_any1 = fa1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Any_var out_any1 = fa1->to_any (); DynamicAny::DynAny_var ftc1_base = - dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_union - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_union); DynamicAny::DynUnion_var ftc1 = - DynamicAny::DynUnion::_narrow (ftc1_base.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + DynamicAny::DynUnion::_narrow (ftc1_base.in ()); if (CORBA::is_nil (ftc1.in ())) { @@ -162,21 +133,15 @@ Test_DynUnion::run_test (void) -1); } - ftc1->from_any (out_any1.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - ftc1->seek (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + ftc1->from_any (out_any1.in ()); + + ftc1->seek (1); + CORBA::TypeCode_var s_out2 = - ftc1->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc1->get_typecode (); CORBA::Boolean const equal_tc2 = - s_out2->equal (data.m_typecode1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + s_out2->equal (data.m_typecode1); if (equal_tc2) { @@ -191,25 +156,20 @@ Test_DynUnion::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: constructor(TypeCode alias)/from_any/to_any\n")); - analyzer.analyze( fa1.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + analyzer.analyze( fa1.in()); - CORBA::Any_var out_any2 = fa1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + CORBA::Any_var out_any2 = fa1->to_any (); CORBA::TypeCode_var s_out3; - ACE_TRY_EX (bad_kind) + try { DynamicAny::DynAny_var ftc2_base = dynany_factory->create_dyn_any_from_type_code - (DynAnyTests::_tc_test_union_alias ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (bad_kind); - + (DynAnyTests::_tc_test_union_alias); + DynamicAny::DynUnion_var ftc2 = - DynamicAny::DynUnion::_narrow (ftc2_base.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (bad_kind); + DynamicAny::DynUnion::_narrow (ftc2_base.in ()); if (CORBA::is_nil (ftc2.in ())) { @@ -218,29 +178,21 @@ Test_DynUnion::run_test (void) -1); } - ftc2->from_any (out_any2.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (bad_kind); - - ftc2->seek (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (bad_kind); - - s_out3 = ftc2->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK_EX (bad_kind); + ftc2->from_any (out_any2.in ()); + + ftc2->seek (1); + + s_out3 = ftc2->get_typecode (); } - ACE_CATCH (CORBA::TypeCode::BadKind, ex) + catch (const CORBA::TypeCode::BadKind& ) { // Failed to create } - ACE_ENDTRY; - ACE_TRY_CHECK; if (!CORBA::is_nil (s_out3.in ())) { CORBA::Boolean const equal_tc = - s_out3->equal (data.m_typecode1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + s_out3->equal (data.m_typecode1); if (equal_tc) { @@ -261,19 +213,15 @@ Test_DynUnion::run_test (void) "testing:discriminator/discriminator_kind\n")); DynamicAny::DynAny_var dp2 = - ftc1->get_discriminator (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc1->get_discriminator (); CORBA::TypeCode_var tc2 = - dp2->type (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + dp2->type (); CORBA::TCKind tc1kind = - ftc1->discriminator_kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::TCKind tc2kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc1->discriminator_kind (); + + CORBA::TCKind tc2kind = tc2->kind (); if (tc2kind == tc1kind) { @@ -289,25 +237,19 @@ Test_DynUnion::run_test (void) "testing:member/member_kind/member_name\n")); DynamicAny::DynAny_var dp3 = - ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + ftc1->member (); + CORBA::String_var m_nm = - ftc1->member_name (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + ftc1->member_name (); + CORBA::TCKind tk = - ftc1->member_kind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + ftc1->member_kind (); + CORBA::TypeCode_var tc3 = - dp3->get_typecode (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + dp3->get_typecode (); CORBA::Boolean const equal_tc3 = - data.m_typecode1->equal (tc3.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + data.m_typecode1->equal (tc3.in ()); if (!ACE_OS::strcmp (m_nm.in (), "tc") && tk == CORBA::tk_TypeCode @@ -320,29 +262,21 @@ Test_DynUnion::run_test (void) { ++this->error_count_; } - ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "testing: set_to_default_member\n")); - ftc1->set_to_default_member (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ftc1->seek (1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - ftc1->insert_short (data.m_short1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + ftc1->set_to_default_member (); + + ftc1->seek (1); + + ftc1->insert_short (data.m_short1); + DynamicAny::DynAny_var mem = - ftc1->member (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + ftc1->member (); + CORBA::Short out_s = - mem->get_short (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + mem->get_short (); if (out_s == data.m_short1) { @@ -354,11 +288,9 @@ Test_DynUnion::run_test (void) ++this->error_count_; } - fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fa1->destroy (); + + ftc1->destroy (); ACE_DEBUG ((LM_DEBUG, "testing: create_dyn_any with _default()\n")); @@ -366,24 +298,19 @@ Test_DynUnion::run_test (void) CORBA::Any any_union; test_implicit_def_union._default(); - ACE_TRY_CHECK; - + any_union <<= test_implicit_def_union; - ACE_TRY_CHECK; DynamicAny::DynAny_var da_union = dynany_factory->create_dyn_any (any_union); - ACE_TRY_CHECK; // if we get here the create_dyn_any worked. } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "test_dynunion::run_test"); + ex._tao_print_exception ("test_dynunion::run_test"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "\n%d errors\n", |