diff options
Diffstat (limited to 'TAO/tests/DynAny_Test/test_dynarray.cpp')
| -rw-r--r-- | TAO/tests/DynAny_Test/test_dynarray.cpp | 51 |
1 files changed, 30 insertions, 21 deletions
diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp index d3ac479fd6a..dfde047395c 100644 --- a/TAO/tests/DynAny_Test/test_dynarray.cpp +++ b/TAO/tests/DynAny_Test/test_dynarray.cpp @@ -16,8 +16,6 @@ // // ============================================================================ -#include "tao/corba.h" -#include "tao/DynArray_i.h" #include "test_dynarray.h" #include "da_testsC.h" #include "data.h" @@ -46,7 +44,7 @@ Test_DynArray::run_test (void) { Data data (this->orb_); - DynAnyTests::test_array ta; + DynAnyTests::test_array ta = {0}; TAO_TRY { @@ -59,20 +57,25 @@ Test_DynArray::run_test (void) CORBA::Any in_any1; in_any1 <<= ta; - TAO_DynArray_i fa1 (in_any1); - fa1.seek (1, - TAO_TRY_ENV); + CORBA_DynAny_ptr dp1 = this->orb_->create_dyn_any (in_any1, + TAO_TRY_ENV); TAO_CHECK_ENV; - fa1.insert_long (data.m_long1, - TAO_TRY_ENV); + CORBA_DynArray_ptr fa1 = CORBA_DynArray::_narrow (dp1, + TAO_TRY_ENV); TAO_CHECK_ENV; - fa1.rewind (TAO_TRY_ENV); + fa1->seek (1, + TAO_TRY_ENV); + TAO_CHECK_ENV; + fa1->insert_long (data.m_long1, + TAO_TRY_ENV); + TAO_CHECK_ENV; + fa1->rewind (TAO_TRY_ENV); TAO_CHECK_ENV; CORBA::Long l_out1 = data.m_long2; - fa1.seek (1, - TAO_TRY_ENV); + fa1->seek (1, + TAO_TRY_ENV); TAO_CHECK_ENV; - l_out1 = fa1.get_long (TAO_TRY_ENV); + l_out1 = fa1->get_long (TAO_TRY_ENV); TAO_CHECK_ENV; if (l_out1 == data.m_long1) ACE_DEBUG ((LM_DEBUG, @@ -83,14 +86,17 @@ Test_DynArray::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: constructor(TypeCode)/from_any/to_any\n")); - TAO_DynArray_i ftc1 (DynAnyTests::_tc_test_array); + CORBA_DynArray_ptr ftc1 = + this->orb_->create_dyn_array (DynAnyTests::_tc_test_array, + TAO_TRY_ENV); + TAO_CHECK_ENV; ta[1] = data.m_long1; CORBA::Any in_any2; in_any2 <<= ta; - ftc1.from_any (in_any2, - TAO_TRY_ENV); + ftc1->from_any (in_any2, + TAO_TRY_ENV); TAO_CHECK_ENV; - CORBA::Any* out_any1 = ftc1.to_any (TAO_TRY_ENV); + CORBA::Any* out_any1 = ftc1->to_any (TAO_TRY_ENV); TAO_CHECK_ENV; DynAnyTests::test_array_forany ta_out; *out_any1 >>= ta_out; @@ -113,10 +119,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, - TAO_TRY_ENV); + ftc1->set_elements (as_in, + TAO_TRY_ENV); TAO_CHECK_ENV; - AnySeq* as_out = ftc1.get_elements (TAO_TRY_ENV); + AnySeq* as_out = ftc1->get_elements (TAO_TRY_ENV); TAO_CHECK_ENV; CORBA_Any out_any2 = (*as_out)[1]; CORBA::Long l_out2; @@ -130,10 +136,13 @@ Test_DynArray::run_test (void) // Created with NEW delete as_out; - fa1.destroy (TAO_TRY_ENV); + fa1->destroy (TAO_TRY_ENV); TAO_CHECK_ENV; - ftc1.destroy (TAO_TRY_ENV); + CORBA::release (fa1); + ftc1->destroy (TAO_TRY_ENV); TAO_CHECK_ENV; + CORBA::release (ftc1); + CORBA::release (dp1); } TAO_CATCHANY { |