diff options
Diffstat (limited to 'TAO/tests/DynAny_Test/test_dynsequence.cpp')
| -rw-r--r-- | TAO/tests/DynAny_Test/test_dynsequence.cpp | 129 |
1 files changed, 42 insertions, 87 deletions
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp index f9b79d7b952..d5cc2a9d623 100644 --- a/TAO/tests/DynAny_Test/test_dynsequence.cpp +++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp @@ -46,7 +46,7 @@ Test_DynSequence::run_test (void) DynAnyTests::test_seq ts (2); ts.length (2); - ACE_TRY_NEW_ENV + try { ACE_DEBUG ((LM_DEBUG, "\t*=*=*=*= %s =*=*=*=*\n", @@ -57,14 +57,10 @@ Test_DynSequence::run_test (void) "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 ())) { @@ -87,46 +83,33 @@ Test_DynSequence::run_test (void) any <<= shortseq1; DynamicAny::DynAny_var shortdany = - dynany_factory->create_dyn_any (any ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + dynany_factory->create_dyn_any (any); - analyzer.analyze(shortdany.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + analyzer.analyze(shortdany.in ()); CORBA::Any_var any3; - any3 = shortdany->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + any3 = shortdany->to_any (); ts[0] = data.m_string2; ts[1] = data.m_string2; CORBA::Any in_any1; in_any1 <<= ts; 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::DynSequence_var fa1 = - DynamicAny::DynSequence::_narrow (dp1.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - fa1->seek (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - fa1->insert_string (data.m_string1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - fa1->seek (1 ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - + DynamicAny::DynSequence::_narrow (dp1.in ()); + + fa1->seek (1); + + fa1->insert_string (data.m_string1); + + fa1->rewind (); + + fa1->seek (1); + CORBA::String_var out_str1 = - fa1->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fa1->get_string (); if (!ACE_OS::strcmp (out_str1.in (), data.m_string1)) { @@ -164,18 +147,13 @@ Test_DynSequence::run_test (void) { elem_any <<= CORBA::Any::from_string (values[i], 8); - elements[i] = dynany_factory->create_dyn_any (elem_any - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + elements[i] = dynany_factory->create_dyn_any (elem_any); } - fa1->set_elements_as_dyn_any (elements.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + fa1->set_elements_as_dyn_any (elements.in ()); DynamicAny::DynAnySeq_var out_elems = - fa1->get_elements_as_dyn_any (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + fa1->get_elements_as_dyn_any (); if (out_elems->length () != 3) { @@ -183,20 +161,16 @@ Test_DynSequence::run_test (void) return -1; } - analyzer.analyze (fa1.in() ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + analyzer.analyze (fa1.in()); CORBA::String_var out_str; for (i = 0; i < length; ++i) { - out_str = out_elems[i]->get_string (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + out_str = out_elems[i]->get_string (); CORBA::Boolean equal = - out_elems[i]->equal (elements[i] - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + out_elems[i]->equal (elements[i]); if (!equal) { @@ -205,8 +179,7 @@ Test_DynSequence::run_test (void) // To show that calling destroy() on a component does // nothing, as required by the spec. - out_elems[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + out_elems[i]->destroy (); } if (this->error_count_ == 0) @@ -221,14 +194,10 @@ Test_DynSequence::run_test (void) DynamicAny::DynAny_var ftc1_base = dynany_factory->create_dyn_any_from_type_code ( DynAnyTests::_tc_test_seq - ACE_ENV_ARG_PARAMETER ); - ACE_TRY_CHECK; DynamicAny::DynSequence_var ftc1 = - DynamicAny::DynSequence::_narrow (ftc1_base.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + DynamicAny::DynSequence::_narrow (ftc1_base.in ()); if (CORBA::is_nil (ftc1.in ())) { @@ -240,17 +209,13 @@ Test_DynSequence::run_test (void) ts[0] = CORBA::string_dup (data.m_string1); CORBA::Any in_any2; in_any2 <<= ts; - ftc1->from_any (in_any2 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc1->from_any (in_any2); - 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_seq *ts_out; out_any1.in () >>= ts_out; @@ -267,17 +232,14 @@ Test_DynSequence::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: length/set_elements/get_elements\n")); - length = ftc1->get_length (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + length = ftc1->get_length (); if (length != 2) { ++this->error_count_; } - ftc1->set_length (3 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ftc1->set_length (3); DynamicAny::AnySeq as_in (3); as_in.length (3); CORBA::Any in_any3; @@ -286,14 +248,11 @@ Test_DynSequence::run_test (void) as_in[1] = in_any3; in_any3 <<= CORBA::Any::from_string (data.m_string1, 8); as_in[2] = 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::ULong index = 2; CORBA::Any out_any2 = as_out[index]; char* out_str2; @@ -310,19 +269,15 @@ Test_DynSequence::run_test (void) "++ OK ++\n")); } - 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_dynsequence::run_test"); + ex._tao_print_exception ("test_dynsequence::run_test"); return -1; } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "\n%d errors\n", |