summaryrefslogtreecommitdiff
path: root/TAO/tests/DynAny_Test/test_dynstruct.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/DynAny_Test/test_dynstruct.cpp')
-rw-r--r--TAO/tests/DynAny_Test/test_dynstruct.cpp117
1 files changed, 37 insertions, 80 deletions
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index 1281471c19e..2bb8ede9fb8 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -59,12 +59,10 @@ Test_DynStruct::run_test (void)
CORBA::Object_var factory_obj =
this->orb_->resolve_initial_references ("DynAnyFactory"
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::DynAnyFactory_var dynany_factory =
DynamicAny::DynAnyFactory::_narrow (factory_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (dynany_factory.in ()))
{
@@ -82,70 +80,54 @@ Test_DynStruct::run_test (void)
DynamicAny::DynAny_var dp1 =
dynany_factory->create_dyn_any (in_any1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
DynamicAny::DynStruct_var fa1 =
DynamicAny::DynStruct::_narrow (dp1.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
fa1->insert_char (data.m_char1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
+ fa1->next ();
+
fa1->insert_short_seq (data.m_shortseq1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+
+ fa1->next ();
DynamicAny::DynAny_var cc =
- fa1->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+ fa1->current_component ();
+
cc->insert_float (data.m_float1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- cc->next (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
+ cc->next ();
+
cc->insert_short (data.m_short1
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- cc->rewind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ cc->rewind ();
// To show that calling destroy() on a component does
// nothing, as required by the spec.
- cc->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ cc->destroy ();
+
+ fa1->rewind ();
- fa1->rewind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
- CORBA::Char c = fa1->get_char (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Char c = fa1->get_char ();
if (c != data.m_char1)
{
++this->error_count_;
}
- fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+ fa1->next ();
+
data.m_shortseq2 =
- fa1->get_short_seq (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ fa1->get_short_seq ();
bool good =
data.m_shortseq2->length () == data.m_shortseq1.length ();
-
+
if (good)
{
for (CORBA::ULong i = 0; i < data.m_shortseq1.length (); ++i)
@@ -162,17 +144,13 @@ Test_DynStruct::run_test (void)
++this->error_count_;
}
- fa1->next (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ fa1->next ();
+
+ cc = fa1->current_component ();
- cc = fa1->current_component (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
cc->seek (1 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
- CORBA::Short s = cc->get_short (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ CORBA::Short s = cc->get_short ();
if (s != data.m_short1)
{
@@ -193,12 +171,10 @@ Test_DynStruct::run_test (void)
DynAnyTests::_tc_test_struct
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
DynamicAny::DynStruct_var ftc1 =
DynamicAny::DynStruct::_narrow (ftc1_base.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (ftc1.in ()))
{
@@ -215,14 +191,11 @@ Test_DynStruct::run_test (void)
in_any2 <<= ts;
ftc1->from_any (in_any2
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
analyzer.analyze (ftc1.in () ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
CORBA::Any_var out_any1 =
- ftc1->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ftc1->to_any ();
DynAnyTests::test_struct* ts_out;
out_any1.in () >>= ts_out;
@@ -279,9 +252,8 @@ Test_DynStruct::run_test (void)
// CORBA::Boolean status = ftc2->next ();
// CORBA::Long lo = ftc2->get_long ();
// analyzer.analyze (ftc2.in () ACE_ENV_ARG_PARAMETER);
-// ACE_TRY_CHECK;
- out_any2 = ftc2->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
+ out_any2 = ftc2->to_any ();
ACE_TRY_CHECK_EX (bad_kind);
if (!(out_any2.in () >>= ts_out2)) // problem
@@ -293,7 +265,6 @@ Test_DynStruct::run_test (void)
{
}
ACE_ENDTRY;
- ACE_TRY_CHECK;
if (ts_out2 != 0 && ts_out2->es.s == data.m_short1)
{
@@ -310,11 +281,9 @@ Test_DynStruct::run_test (void)
"testing: current_member_name/current_member_kind\n"));
ftc1->seek (2 ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
-
+
DynamicAny::FieldName_var fn =
- ftc1->current_member_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ftc1->current_member_name ();
if (ACE_OS::strcmp (fn.in (), "es"))
{
@@ -322,8 +291,7 @@ Test_DynStruct::run_test (void)
}
CORBA::TCKind tk =
- ftc1->current_member_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ftc1->current_member_kind ();
if (tk != CORBA::tk_struct)
{
@@ -341,11 +309,9 @@ Test_DynStruct::run_test (void)
"with alias\n"));
ftc2->seek (2
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::FieldName_var fn2 =
- ftc2->current_member_name (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ftc2->current_member_name ();
if (ACE_OS::strcmp (fn2.in (), "es"))
{
@@ -353,8 +319,7 @@ Test_DynStruct::run_test (void)
}
CORBA::TCKind tk2 =
- ftc2->current_member_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ftc2->current_member_kind ();
if (tk2 != CORBA::tk_struct)
{
@@ -371,20 +336,17 @@ Test_DynStruct::run_test (void)
"testing: get_members/set_members\n"));
DynamicAny::NameValuePairSeq_var nvps =
- fa1->get_members (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ fa1->get_members ();
DynamicAny::DynAny_var sm_base =
dynany_factory->create_dyn_any_from_type_code (
DynAnyTests::_tc_test_struct
ACE_ENV_ARG_PARAMETER
);
- ACE_TRY_CHECK;
DynamicAny::DynStruct_var sm =
DynamicAny::DynStruct::_narrow (sm_base.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
if (CORBA::is_nil (sm.in ()))
{
@@ -395,11 +357,9 @@ Test_DynStruct::run_test (void)
sm->set_members (nvps.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_TRY_CHECK;
DynamicAny::NameValuePairSeq_var gm =
- sm->get_members (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sm->get_members ();
CORBA::ULong index = 2;
@@ -408,14 +368,11 @@ Test_DynStruct::run_test (void)
++this->error_count_;
}
- fa1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ fa1->destroy ();
- ftc1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ ftc1->destroy ();
- sm->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
- ACE_TRY_CHECK;
+ sm->destroy ();
}
ACE_CATCHANY
{
View Lorry Controller Status