diff options
Diffstat (limited to 'TAO/tests/DynAny_Test/test_dynarray.cpp')
| -rw-r--r-- | TAO/tests/DynAny_Test/test_dynarray.cpp | 87 |
1 files changed, 29 insertions, 58 deletions
diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp index 26f792b417c..3fdcdddf750 100644 --- a/TAO/tests/DynAny_Test/test_dynarray.cpp +++ b/TAO/tests/DynAny_Test/test_dynarray.cpp @@ -45,7 +45,7 @@ Test_DynArray::run_test (void) DynAnyTests::test_array ta = {0}; - ACE_TRY_NEW_ENV + try { ACE_DEBUG ((LM_DEBUG, "\t*=*=*=*= %s =*=*=*=*\n", @@ -55,14 +55,10 @@ Test_DynArray::run_test (void) "testing: constructor(Any)/insert/get/seek/rewind/current_component\n")); 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,31 +74,21 @@ Test_DynArray::run_test (void) CORBA::Any in_any1; in_any1 <<= DynAnyTests::test_array_forany (ta); 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::DynArray_var fa1 = - DynamicAny::DynArray::_narrow (dp1.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - fa1->seek (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - fa1->insert_long (data.m_long1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - + DynamicAny::DynArray::_narrow (dp1.in ()); + + fa1->seek (1); + + fa1->insert_long (data.m_long1); + + fa1->rewind (); + CORBA::Long l_out1 = data.m_long2; - fa1->seek (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - l_out1 = fa1->get_long (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fa1->seek (1); + + l_out1 = fa1->get_long (); if (l_out1 == data.m_long1) { @@ -118,14 +104,10 @@ Test_DynArray::run_test (void) "testing: constructor(TypeCode)/from_any/to_any\n")); DynamicAny::DynAny_var ftc1_base = - dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_array - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_array); DynamicAny::DynArray_var ftc1 = - DynamicAny::DynArray::_narrow (ftc1_base.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + DynamicAny::DynArray::_narrow (ftc1_base.in ()); if (CORBA::is_nil (ftc1.in ())) { @@ -138,17 +120,13 @@ Test_DynArray::run_test (void) CORBA::Any in_any2; in_any2 <<= DynAnyTests::test_array_forany (ta); - ftc1->from_any (in_any2 - ACE_ENV_ARG_PARAMETER); + ftc1->from_any (in_any2); - ACE_TRY_CHECK; - analyzer.analyze (ftc1.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + analyzer.analyze (ftc1.in ()); CORBA::Any_var out_any1 = - ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc1->to_any (); DynAnyTests::test_array_forany ta_out; out_any1.in () >>= ta_out; @@ -172,13 +150,10 @@ Test_DynArray::run_test (void) in_any3 <<= data.m_long1; as_in[0] = in_any3; as_in[1] = in_any3; - ftc1->set_elements (as_in - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + ftc1->set_elements (as_in); + DynamicAny::AnySeq_var as_out = - ftc1->get_elements (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc1->get_elements (); CORBA::Any out_any2 = as_out[1U]; CORBA::Long l_out2; out_any2 >>= l_out2; @@ -193,19 +168,15 @@ Test_DynArray::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_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "test_dynarray::run_test"); + ex._tao_print_exception ("test_dynarray::run_test"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "\n%d errors\n", |