summaryrefslogtreecommitdiff
path: root/TAO/tests
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests')
-rw-r--r--TAO/tests/DynAny_Test/data.cpp20
-rw-r--r--TAO/tests/DynAny_Test/test_dynany.cpp61
-rw-r--r--TAO/tests/DynAny_Test/test_dynany.h4
-rw-r--r--TAO/tests/DynAny_Test/test_dynarray.cpp51
-rw-r--r--TAO/tests/DynAny_Test/test_dynarray.h2
-rw-r--r--TAO/tests/DynAny_Test/test_dynenum.cpp46
-rw-r--r--TAO/tests/DynAny_Test/test_dynenum.h2
-rw-r--r--TAO/tests/DynAny_Test/test_dynsequence.cpp68
-rw-r--r--TAO/tests/DynAny_Test/test_dynsequence.h2
-rw-r--r--TAO/tests/DynAny_Test/test_dynstruct.cpp80
-rw-r--r--TAO/tests/DynAny_Test/test_dynstruct.h2
-rw-r--r--TAO/tests/DynAny_Test/test_dynunion.cpp64
-rw-r--r--TAO/tests/DynAny_Test/test_dynunion.h2
13 files changed, 260 insertions, 144 deletions
diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp
index fa3ee8df344..2f923cedd9b 100644
--- a/TAO/tests/DynAny_Test/data.cpp
+++ b/TAO/tests/DynAny_Test/data.cpp
@@ -59,7 +59,12 @@ Data::Data (CORBA::ORB_var orb)
labels[15] = "type objref";
// Getting the RootPOA so we can generate object references.
- CORBA::Object_var obj = this->orb_->resolve_initial_references ("RootPOA");
+ CORBA::Object_var obj =
+ this->orb_->resolve_initial_references ("RootPOA");
+
+ if (CORBA::is_nil (obj.in ()))
+ ACE_ERROR ((LM_ERROR,
+ "(%P|%t) Unable to get root poa reference.\n"));
// Get the POA_var object from Object_var.
PortableServer::POA_var root_poa =
@@ -82,11 +87,22 @@ Data::Data (CORBA::ORB_var orb)
env);
if (env.exception () != 0)
- env.print_exception ("PortableServer::POA::create_reference_with_id");
+ env.print_exception ("PortableServer::POA::create_reference_with_id");
+
+ // Clean up after the POA
+ root_poa->destroy (1,
+ 1,
+ env);
+
+ if (env.exception () != 0)
+ env.print_exception ("PortableServer::POA::destroy");
}
Data::~Data (void)
{
CORBA::string_free (m_string1);
+ CORBA::string_free (m_string2);
+ CORBA::release (m_typecode1);
+ CORBA::release (m_typecode2);
}
diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp
index 11f29170abe..ae6bc6c10b3 100644
--- a/TAO/tests/DynAny_Test/test_dynany.cpp
+++ b/TAO/tests/DynAny_Test/test_dynany.cpp
@@ -16,7 +16,6 @@
//
// ============================================================================
-#include "tao/DynAny_i.h"
#include "test_dynany.h"
#include "data.h"
@@ -55,11 +54,13 @@ Test_DynAny::run_test (void)
"testing: constructor(Any)/insert/get\n"));
CORBA_Any in1 (CORBA::_tc_double);
- TAO_DynAny_i fa1 (in1);
- fa1.insert_double (data.m_double1,
- TAO_TRY_ENV);
+ CORBA_DynAny_ptr fa1 = this->orb_->create_dyn_any (in1,
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
- CORBA::Double d_out = fa1.get_double (TAO_TRY_ENV);
+ fa1->insert_double (data.m_double1,
+ TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ CORBA::Double d_out = fa1->get_double (TAO_TRY_ENV);
TAO_CHECK_ENV;
if (d_out == data.m_double1)
ACE_DEBUG ((LM_DEBUG,
@@ -71,13 +72,16 @@ Test_DynAny::run_test (void)
"testing: constructor(TypeCode)/from_any/to_any\n"));
d_out = data.m_double2;
- TAO_DynAny_i ftc1 (CORBA::_tc_double);
+ CORBA_DynAny_ptr ftc1 =
+ this->orb_->create_basic_dyn_any (CORBA::_tc_double,
+ TAO_TRY_ENV);
+ TAO_CHECK_ENV;
CORBA::Any in_any1;
in_any1 <<= data.m_double1;
- ftc1.from_any (in_any1,
- TAO_TRY_ENV);
+ ftc1->from_any (in_any1,
+ 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;
*out_any1 >>= d_out;
@@ -90,10 +94,12 @@ Test_DynAny::run_test (void)
else
++this->error_count_;
- 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);
ACE_DEBUG ((LM_DEBUG,
"\t*=*=*=*= %s =*=*=*=*\n",
@@ -103,14 +109,17 @@ Test_DynAny::run_test (void)
"testing: constructor(Any)/insert/get\n"));
CORBA_Any in (CORBA::_tc_TypeCode);
- TAO_DynAny_i fa2 (in);
- fa2.insert_typecode (data.m_typecode1,
- TAO_TRY_ENV);
+ CORBA_DynAny_ptr fa2 =
+ this->orb_->create_dyn_any (in,
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
- CORBA::TypeCode_ptr tc_out = fa2.get_typecode (TAO_TRY_ENV);
+ fa2->insert_typecode (data.m_typecode1,
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
- if (tc_out->equal(data.m_typecode1,
- TAO_TRY_ENV))
+ CORBA::TypeCode_ptr tc_out = fa2->get_typecode (TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ if (tc_out->equal (data.m_typecode1,
+ TAO_TRY_ENV))
ACE_DEBUG ((LM_DEBUG,
"++ OK ++\n"));
else
@@ -122,13 +131,16 @@ Test_DynAny::run_test (void)
"testing: constructor(TypeCode)/from_any/to_any\n"));
tc_out = data.m_typecode2;
- TAO_DynAny_i ftc2 (CORBA::_tc_TypeCode);
+ CORBA_DynAny_ptr ftc2 =
+ this->orb_->create_basic_dyn_any (CORBA::_tc_TypeCode,
+ TAO_TRY_ENV);
+ TAO_CHECK_ENV;
CORBA::Any in_any2;
in_any2 <<= data.m_typecode1;
- ftc2.from_any (in_any2,
- TAO_TRY_ENV);
+ ftc2->from_any (in_any2,
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
- CORBA::Any* out_any2 = ftc2.to_any (TAO_TRY_ENV);
+ CORBA::Any* out_any2 = ftc2->to_any (TAO_TRY_ENV);
TAO_CHECK_ENV;
*out_any2 >>= tc_out;
@@ -144,10 +156,13 @@ Test_DynAny::run_test (void)
TAO_CHECK_ENV;
- fa2.destroy (TAO_TRY_ENV);
+ fa2->destroy (TAO_TRY_ENV);
TAO_CHECK_ENV;
- ftc2.destroy (TAO_TRY_ENV);
+ CORBA::release (fa2);
+ ftc2->destroy (TAO_TRY_ENV);
TAO_CHECK_ENV;
+ CORBA::release (ftc2);
+ CORBA::release (tc_out);
}
TAO_CATCHANY
{
diff --git a/TAO/tests/DynAny_Test/test_dynany.h b/TAO/tests/DynAny_Test/test_dynany.h
index d675c57a4bd..e282eb94f4e 100644
--- a/TAO/tests/DynAny_Test/test_dynany.h
+++ b/TAO/tests/DynAny_Test/test_dynany.h
@@ -16,11 +16,11 @@
//
// ============================================================================
-#include "tao/corba.h"
-
#if !defined (TEST_DYNANY_H)
#define TEST_DYNANY_H
+#include "tao/corba.h"
+
class Test_DynAny
{
public:
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
{
diff --git a/TAO/tests/DynAny_Test/test_dynarray.h b/TAO/tests/DynAny_Test/test_dynarray.h
index 17e623fd704..9ac0c71658b 100644
--- a/TAO/tests/DynAny_Test/test_dynarray.h
+++ b/TAO/tests/DynAny_Test/test_dynarray.h
@@ -19,6 +19,8 @@
#if !defined (TEST_DYNARRAY_H)
#define TEST_DYNARRAY_H
+#include "tao/corba.h"
+
class Test_DynArray
{
public:
diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp
index 57a4ccc2de5..b34ee1770ff 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.cpp
+++ b/TAO/tests/DynAny_Test/test_dynenum.cpp
@@ -16,8 +16,6 @@
//
// ============================================================================
-#include "tao/corba.h"
-#include "tao/DynEnum_i.h"
#include "test_dynenum.h"
#include "da_testsC.h"
#include "data.h"
@@ -44,7 +42,7 @@ Test_DynEnum::test_name (void) const
int
Test_DynEnum::run_test (void)
{
- DynAnyTests::test_enum te;
+ DynAnyTests::test_enum te = DynAnyTests::ZEROTH;
TAO_TRY
{
@@ -52,9 +50,17 @@ Test_DynEnum::run_test (void)
"testing: constructor(Any)/value_as_ulong\n"));
CORBA_Any in_any1;
- in_any1 <<= DynAnyTests::SECOND;
- TAO_DynEnum_i de1 (in_any1);
- CORBA::ULong ul_out1 = de1.value_as_ulong (TAO_TRY_ENV);
+ in_any1 <<= te;
+ CORBA_DynAny_ptr dp1 = this->orb_->create_dyn_any (in_any1,
+ TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ CORBA_DynEnum_ptr de1 = CORBA_DynEnum::_narrow (dp1,
+ TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ de1->value_as_ulong (2,
+ TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ CORBA::ULong ul_out1 = de1->value_as_ulong (TAO_TRY_ENV);
TAO_CHECK_ENV;
if (ul_out1 == 2)
ACE_DEBUG ((LM_DEBUG,
@@ -65,9 +71,12 @@ Test_DynEnum::run_test (void)
ACE_DEBUG ((LM_DEBUG,
"testing: value_as_string\n"));
- CORBA::String s = de1.value_as_string (TAO_TRY_ENV);
+ de1->value_as_string ("FIRST",
+ TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ CORBA::String_var s = de1->value_as_string (TAO_TRY_ENV);
TAO_CHECK_ENV;
- if (!ACE_OS::strcmp (s, "SECOND"))
+ if (!ACE_OS::strcmp (s.in (), "FIRST"))
ACE_DEBUG ((LM_DEBUG,
"++ OK ++\n"));
else
@@ -77,15 +86,19 @@ Test_DynEnum::run_test (void)
ACE_DEBUG ((LM_DEBUG,
"testing: constructor(TypeCode)/from_any/to_any\n"));
- TAO_DynEnum_i de2 (DynAnyTests::_tc_test_enum);
- de2.from_any (in_any1,
+ CORBA_DynEnum_ptr de2 =
+ this->orb_->create_dyn_enum (DynAnyTests::_tc_test_enum,
+ TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ CORBA_Any in_any2;
+ in_any2 <<= DynAnyTests::THIRD;
+ de2->from_any (in_any2,
TAO_TRY_ENV);
TAO_CHECK_ENV;
- CORBA_Any* out_any1 = de2.to_any (TAO_TRY_ENV);
+ CORBA_Any* out_any1 = de2->to_any (TAO_TRY_ENV);
TAO_CHECK_ENV;
- ul_out1 = 0;
*out_any1 >>= te;
- if (te == DynAnyTests::SECOND)
+ if (te == DynAnyTests::THIRD)
ACE_DEBUG ((LM_DEBUG,
"++ OK ++\n"));
else
@@ -94,6 +107,13 @@ Test_DynEnum::run_test (void)
// Created with NEW
delete out_any1;
+ de1->destroy (TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ CORBA::release (de1);
+ de2->destroy (TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ CORBA::release (de2);
+ CORBA::release (dp1);
}
TAO_CATCHANY
{
diff --git a/TAO/tests/DynAny_Test/test_dynenum.h b/TAO/tests/DynAny_Test/test_dynenum.h
index 42b0e9f83ba..830122739a2 100644
--- a/TAO/tests/DynAny_Test/test_dynenum.h
+++ b/TAO/tests/DynAny_Test/test_dynenum.h
@@ -19,6 +19,8 @@
#if !defined (TEST_DYNENUM_H)
#define TEST_DYNENUM_H
+#include "tao/corba.h"
+
class Test_DynEnum
{
public:
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index d5c911a05ce..d0591261ffc 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -16,8 +16,6 @@
//
// ============================================================================
-#include "tao/corba.h"
-#include "tao/DynSequence_i.h"
#include "test_dynsequence.h"
#include "da_testsC.h"
#include "data.h"
@@ -62,37 +60,49 @@ Test_DynSequence::run_test (void)
ts[1] = data.m_string2;
CORBA_Any in_any1;
in_any1 <<= ts;
- TAO_DynSequence_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_string (data.m_string1,
- TAO_TRY_ENV);
+ CORBA_DynSequence_ptr fa1 = CORBA_DynSequence::_narrow (dp1,
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
- fa1.rewind (TAO_TRY_ENV);
+ fa1->seek (1,
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
- fa1.seek (1,
- TAO_TRY_ENV);
+ fa1->insert_string (data.m_string1,
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
- CORBA::String out_str = fa1.get_string (TAO_TRY_ENV);
+ fa1->rewind (TAO_TRY_ENV);
TAO_CHECK_ENV;
- if (!ACE_OS::strcmp (out_str, data.m_string1))
+ fa1->seek (1,
+ TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ CORBA::String out_str1 = fa1->get_string (TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ if (!ACE_OS::strcmp (out_str1, data.m_string1))
ACE_DEBUG ((LM_DEBUG,
"++ OK ++\n"));
else
++this->error_count_;
+ // Created with NEW
+ delete out_str1;
+
ACE_DEBUG ((LM_DEBUG,
"testing: constructor(TypeCode)/from_any/to_any\n"));
- TAO_DynSequence_i ftc1 (DynAnyTests::_tc_test_seq);
+ CORBA_DynSequence_ptr ftc1 =
+ this->orb_->create_dyn_sequence (DynAnyTests::_tc_test_seq,
+ TAO_TRY_ENV);
+ TAO_CHECK_ENV;
ts[0] = data.m_string1;
CORBA_Any in_any2;
in_any2 <<= ts;
- 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_seq* ts_out;
*out_any1 >>= ts_out;
@@ -109,12 +119,12 @@ Test_DynSequence::run_test (void)
ACE_DEBUG ((LM_DEBUG,
"testing: length/set_elements/get_elements\n"));
- if (ftc1.length (TAO_TRY_ENV) != 2)
+ if (ftc1->length (TAO_TRY_ENV) != 2)
++this->error_count_;
TAO_CHECK_ENV;
- ftc1.length (3,
- TAO_TRY_ENV);
+ ftc1->length (3,
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
AnySeq as_in (3);
as_in.length (3);
@@ -124,15 +134,15 @@ Test_DynSequence::run_test (void)
as_in[1] = in_any3;
in_any3 <<= CORBA::Any::from_string (data.m_string1, 0);
as_in[2] = 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)[2];
- CORBA::String str_out;
- out_any2 >>= CORBA::Any::to_string (str_out, 0);
- if (ACE_OS::strcmp (str_out, data.m_string1))
+ CORBA::String out_str2;
+ out_any2 >>= CORBA::Any::to_string (out_str2, 0);
+ if (ACE_OS::strcmp (out_str2, data.m_string1))
++this->error_count_;
if (this->error_count_ == 0)
ACE_DEBUG ((LM_DEBUG,
@@ -140,11 +150,15 @@ Test_DynSequence::run_test (void)
// Created with NEW
delete as_out;
+ delete out_str2;
- fa1.destroy (TAO_TRY_ENV);
+ fa1->destroy (TAO_TRY_ENV);
TAO_CHECK_ENV;
- ftc1.destroy (TAO_TRY_ENV);
+ CORBA::release (fa1);
+ CORBA::release (dp1);
+ ftc1->destroy (TAO_TRY_ENV);
TAO_CHECK_ENV;
+ CORBA::release (ftc1);
}
TAO_CATCHANY
{
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.h b/TAO/tests/DynAny_Test/test_dynsequence.h
index 58168189511..1b53a76b866 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.h
+++ b/TAO/tests/DynAny_Test/test_dynsequence.h
@@ -19,6 +19,8 @@
#if !defined (TEST_DYNSEQUENCE_H)
#define TEST_DYNSEQUENCE_H
+#include "tao/corba.h"
+
class Test_DynSequence
{
public:
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 7797cc8e7e3..2cdf9688b64 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -16,8 +16,6 @@
//
// ============================================================================
-#include "tao/corba.h"
-#include "tao/DynStruct_i.h"
#include "test_dynstruct.h"
#include "da_testsC.h"
#include "data.h"
@@ -47,6 +45,10 @@ Test_DynStruct::run_test (void)
Data data (this->orb_);
DynAnyTests::test_struct ts;
+ ts.c = data.m_char2;
+ ts.ll = data.m_longlong2;
+ ts.es.f = data.m_float2;
+ ts.es.s = data.m_short2;
TAO_TRY
{
@@ -55,35 +57,41 @@ Test_DynStruct::run_test (void)
CORBA_Any in_any1;
in_any1 <<= ts;
- TAO_DynStruct_i fa1 (in_any1);
- fa1.insert_char (data.m_char1,
- TAO_TRY_ENV);
+ CORBA_DynAny_ptr dp1 =
+ this->orb_->create_dyn_any (in_any1,
+ TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ CORBA_DynStruct_ptr fa1 = CORBA_DynStruct::_narrow (dp1,
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
- fa1.insert_longlong (data.m_longlong1,
+ fa1->insert_char (data.m_char1,
+ TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ fa1->insert_longlong (data.m_longlong1,
TAO_TRY_ENV);
TAO_CHECK_ENV;
- fa1.current_component (TAO_TRY_ENV)->insert_float (data.m_float1,
- TAO_TRY_ENV);
+ fa1->current_component (TAO_TRY_ENV)->insert_float (data.m_float1,
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
- fa1.current_component (TAO_TRY_ENV)->insert_short (data.m_short1,
- TAO_TRY_ENV);
+ fa1->current_component (TAO_TRY_ENV)->insert_short (data.m_short1,
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
- fa1.current_component (TAO_TRY_ENV)->rewind (TAO_TRY_ENV);
+ fa1->current_component (TAO_TRY_ENV)->rewind (TAO_TRY_ENV);
TAO_CHECK_ENV;
- fa1.rewind (TAO_TRY_ENV);
+ fa1->rewind (TAO_TRY_ENV);
TAO_CHECK_ENV;
- CORBA::Char c = fa1.get_char (TAO_TRY_ENV);
+ CORBA::Char c = fa1->get_char (TAO_TRY_ENV);
TAO_CHECK_ENV;
if (c != data.m_char1)
++this->error_count_;
- CORBA::LongLong ll = fa1.get_longlong (TAO_TRY_ENV);
+ CORBA::LongLong ll = fa1->get_longlong (TAO_TRY_ENV);
TAO_CHECK_ENV;
if (ll != data.m_longlong1)
++this->error_count_;
- fa1.current_component(TAO_TRY_ENV)->seek (1,
+ fa1->current_component(TAO_TRY_ENV)->seek (1,
TAO_TRY_ENV);
TAO_CHECK_ENV;
- CORBA::Short s = fa1.current_component (TAO_TRY_ENV)->get_short (TAO_TRY_ENV);
+ CORBA::Short s = fa1->current_component (TAO_TRY_ENV)->get_short (TAO_TRY_ENV);
TAO_CHECK_ENV;
if (s != data.m_short1)
++this->error_count_;
@@ -94,17 +102,20 @@ Test_DynStruct::run_test (void)
ACE_DEBUG ((LM_DEBUG,
"testing: constructor(TypeCode)/from_any/to_any\n"));
- TAO_DynStruct_i ftc1 (DynAnyTests::_tc_test_struct);
+ CORBA_DynStruct_ptr ftc1 =
+ this->orb_->create_dyn_struct (DynAnyTests::_tc_test_struct,
+ TAO_TRY_ENV);
+ TAO_CHECK_ENV;
ts.c = data.m_char1;
ts.ll = data.m_longlong1;
ts.es.f = data.m_float1;
ts.es.s = data.m_short1;
CORBA_Any in_any2;
in_any2 <<= ts;
- 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_struct* ts_out;
*out_any1 >>= ts_out;
@@ -120,14 +131,14 @@ Test_DynStruct::run_test (void)
ACE_DEBUG ((LM_DEBUG,
"testing: current_member_name/current_member_kind\n"));
- ftc1.seek (2,
+ ftc1->seek (2,
TAO_TRY_ENV);
TAO_CHECK_ENV;
- FieldName fn = ftc1.current_member_name (TAO_TRY_ENV);
+ FieldName fn = ftc1->current_member_name (TAO_TRY_ENV);
TAO_CHECK_ENV;
if (ACE_OS::strcmp (fn, "es"))
++this->error_count_;
- CORBA::TCKind tk = ftc1.current_member_kind (TAO_TRY_ENV);
+ CORBA::TCKind tk = ftc1->current_member_kind (TAO_TRY_ENV);
TAO_CHECK_ENV;
if (tk != CORBA::tk_struct)
++this->error_count_;
@@ -138,12 +149,15 @@ Test_DynStruct::run_test (void)
ACE_DEBUG ((LM_DEBUG,
"testing: get_members/set_members\n"));
- NameValuePairSeq* nvps = fa1.get_members (TAO_TRY_ENV);
- TAO_DynStruct_i sm (DynAnyTests::_tc_test_struct);
- sm.set_members (*nvps,
- TAO_TRY_ENV);
+ NameValuePairSeq* nvps = fa1->get_members (TAO_TRY_ENV);
+ CORBA_DynStruct_ptr sm =
+ this->orb_->create_dyn_struct (DynAnyTests::_tc_test_struct,
+ TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ sm->set_members (*nvps,
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
- NameValuePairSeq* gm = sm.get_members (TAO_TRY_ENV);
+ NameValuePairSeq* gm = sm->get_members (TAO_TRY_ENV);
TAO_CHECK_ENV;
if (ACE_OS::strcmp ((*gm)[2].id, "es"))
++this->error_count_;
@@ -152,12 +166,16 @@ Test_DynStruct::run_test (void)
delete nvps;
delete gm;
- fa1.destroy (TAO_TRY_ENV);
+ fa1->destroy (TAO_TRY_ENV);
TAO_CHECK_ENV;
- ftc1.destroy (TAO_TRY_ENV);
+ CORBA::release (fa1);
+ CORBA::release (dp1);
+ ftc1->destroy (TAO_TRY_ENV);
TAO_CHECK_ENV;
- sm.destroy (TAO_TRY_ENV);
+ CORBA::release (ftc1);
+ sm->destroy (TAO_TRY_ENV);
TAO_CHECK_ENV;
+ CORBA::release (sm);
}
TAO_CATCHANY
{
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.h b/TAO/tests/DynAny_Test/test_dynstruct.h
index b4329594411..770c496d672 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.h
+++ b/TAO/tests/DynAny_Test/test_dynstruct.h
@@ -19,6 +19,8 @@
#if !defined (TEST_DYNSTRUCT_H)
#define TEST_DYNSTRUCT_H
+#include "tao/corba.h"
+
class Test_DynStruct
{
public:
diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp
index 298fce3680d..33abad947ad 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.cpp
+++ b/TAO/tests/DynAny_Test/test_dynunion.cpp
@@ -16,8 +16,6 @@
//
// ============================================================================
-#include "tao/corba.h"
-#include "tao/DynUnion_i.h"
#include "test_dynunion.h"
#include "da_testsC.h"
#include "data.h"
@@ -58,13 +56,20 @@ Test_DynUnion::run_test (void)
"testing: constructor(Any)/insert/get\n"));
tu._d(DynAnyTests::FIRST);
+ tu.s (data.m_short2);
CORBA_Any in_any1;
in_any1 <<= tu;
- TAO_DynUnion_i fa1 (in_any1);
- fa1.insert_short (data.m_short1,
+ CORBA_DynAny_ptr dp1 =
+ this->orb_->create_dyn_any (in_any1,
+ TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ CORBA_DynUnion_ptr fa1 = CORBA_DynUnion::_narrow (dp1,
+ TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ fa1->insert_short (data.m_short1,
TAO_TRY_ENV);
TAO_CHECK_ENV;
- CORBA::Short s_out1 = fa1.get_short (TAO_TRY_ENV);
+ CORBA::Short s_out1 = fa1->get_short (TAO_TRY_ENV);
TAO_CHECK_ENV;
if (s_out1 == data.m_short1)
ACE_DEBUG ((LM_DEBUG,
@@ -75,13 +80,16 @@ Test_DynUnion::run_test (void)
ACE_DEBUG ((LM_DEBUG,
"testing: constructor(TypeCode)/from_any/to_any\n"));
- CORBA_Any* out_any1 = fa1.to_any (TAO_TRY_ENV);
+ CORBA_Any* out_any1 = fa1->to_any (TAO_TRY_ENV);
+ TAO_CHECK_ENV;
+ CORBA_DynUnion_ptr ftc1 =
+ this->orb_->create_dyn_union (DynAnyTests::_tc_test_union,
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
- TAO_DynUnion_i ftc1 (DynAnyTests::_tc_test_union);
- ftc1.from_any (*out_any1,
- TAO_TRY_ENV);
+ ftc1->from_any (*out_any1,
+ TAO_TRY_ENV);
TAO_CHECK_ENV;
- CORBA::Short s_out2 = ftc1.get_short (TAO_TRY_ENV);
+ CORBA::Short s_out2 = ftc1->get_short (TAO_TRY_ENV);
TAO_CHECK_ENV;
if (s_out2 == data.m_short1)
ACE_DEBUG ((LM_DEBUG,
@@ -95,51 +103,57 @@ Test_DynUnion::run_test (void)
ACE_DEBUG ((LM_DEBUG,
"testing: set_as_default\n"));
- if (!ftc1.set_as_default (TAO_TRY_ENV))
+ if (!ftc1->set_as_default (TAO_TRY_ENV))
ACE_DEBUG ((LM_DEBUG,
"++ OK ++\n"));
else
++this->error_count_;
+
TAO_CHECK_ENV;
ACE_DEBUG ((LM_DEBUG,
"testing:discriminator/discriminator_kind\n"));
- CORBA_DynAny_ptr dp1 = ftc1.discriminator (TAO_TRY_ENV);
+ CORBA_DynAny_ptr dp2 = ftc1->discriminator (TAO_TRY_ENV);
TAO_CHECK_ENV;
- if (dp1->type (TAO_TRY_ENV)->kind ()
- == ftc1.discriminator_kind (TAO_TRY_ENV))
+ if (dp2->type (TAO_TRY_ENV)->kind ()
+ == ftc1->discriminator_kind (TAO_TRY_ENV))
ACE_DEBUG ((LM_DEBUG,
"++ OK ++\n"));
else
- ++this->error_count_;
+ ++this->error_count_;
+
TAO_CHECK_ENV;
ACE_DEBUG ((LM_DEBUG,
"testing:member/member_kind/member_name\n"));
- CORBA_DynAny_ptr dp2 = ftc1.member (TAO_TRY_ENV);
+ CORBA_DynAny_ptr dp3 = ftc1->member (TAO_TRY_ENV);
TAO_CHECK_ENV;
- CORBA::String m_nm = ftc1.member_name (TAO_TRY_ENV);
+ CORBA::String m_nm = ftc1->member_name (TAO_TRY_ENV);
TAO_CHECK_ENV;
- CORBA::TCKind tk = ftc1.member_kind (TAO_TRY_ENV);
+ CORBA::TCKind tk = ftc1->member_kind (TAO_TRY_ENV);
TAO_CHECK_ENV;
if (!ACE_OS::strcmp (m_nm, "s") &&
tk == CORBA::tk_short &&
- dp2->get_short (TAO_TRY_ENV) == data.m_short1)
+ dp3->get_short (TAO_TRY_ENV) == data.m_short1)
ACE_DEBUG ((LM_DEBUG,
"++ OK ++\n"));
else
++this->error_count_;
-
- fa1.destroy (TAO_TRY_ENV);
- TAO_CHECK_ENV;
- ftc1.destroy (TAO_TRY_ENV);
+
TAO_CHECK_ENV;
- dp1->destroy (TAO_TRY_ENV);
+
+ // Created with string_dup
+ CORBA::string_free (m_nm);
+
+ fa1->destroy (TAO_TRY_ENV);
TAO_CHECK_ENV;
- dp2->destroy (TAO_TRY_ENV);
+ CORBA::release (fa1);
+ CORBA::release (dp1);
+ ftc1->destroy (TAO_TRY_ENV);
TAO_CHECK_ENV;
+ CORBA::release (ftc1);
}
TAO_CATCHANY
{
diff --git a/TAO/tests/DynAny_Test/test_dynunion.h b/TAO/tests/DynAny_Test/test_dynunion.h
index f9a04f1e3ab..0f5c7c51ab0 100644
--- a/TAO/tests/DynAny_Test/test_dynunion.h
+++ b/TAO/tests/DynAny_Test/test_dynunion.h
@@ -19,6 +19,8 @@
#if !defined (TEST_DYNUNION_H)
#define TEST_DYNUNION_H
+#include "tao/corba.h"
+
class Test_DynUnion
{
public:
View Lorry Controller Status