summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
diff options
context:
space:
mode:
authorsbw1 <sbw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-07-15 02:24:57 +0000
committersbw1 <sbw1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-07-15 02:24:57 +0000
commitd82e62067dfba6805754f993f6f9aa9cfc32e02c (patch)
treef77e388b8a8da1c13f53b742de8be8251923f16f /TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
parentef0fc9b621bb4c539172b32b2d79fb47f3419cd8 (diff)
downloadATCD-d82e62067dfba6805754f993f6f9aa9cfc32e02c.tar.gz
These tests now copmile with egcs. Added modify and withdraw_using_constraint
tests.
Diffstat (limited to 'TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp')
-rw-r--r--TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp38
1 files changed, 28 insertions, 10 deletions
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index 1cf3a0845cf..d5582e30274 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -3,8 +3,10 @@
TAO_Service_Type_Exporter::
TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if,
+ CORBA::Boolean verbose,
CORBA::Environment& _env)
- : lookup_ (lookup_if)
+ : verbose_ (verbose),
+ lookup_ (lookup_if)
{
// Obtain the Service Type Repository.
CosTrading::TypeRepository_ptr obj = lookup_if->type_repos (_env);
@@ -221,7 +223,11 @@ TAO_Service_Type_Exporter::list_all_types (CORBA::Environment& _env)
for (int i = type_names->length () - 1; i >= 0; i--)
{
- ACE_DEBUG ((LM_DEBUG, "type name: %s\n", (const char *)type_names[i]));
+ if (this->verbose_)
+ {
+ ACE_DEBUG ((LM_DEBUG, "type name: %s\n",
+ ACE_static_cast (const char *, type_names[i])));
+ }
}
}
TAO_CATCHANY
@@ -250,8 +256,11 @@ TAO_Service_Type_Exporter::describe_all_types (CORBA::Environment& _env)
TAO_TRY_ENV);
TAO_CHECK_ENV;
- this->dump_typestruct (TT_Info::INTERFACE_NAMES[i], type_struct.in ());
- ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
+ if (this->verbose_)
+ {
+ this->dump_typestruct (TT_Info::INTERFACE_NAMES[i], type_struct.in ());
+ ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
+ }
}
}
TAO_CATCHANY
@@ -280,9 +289,12 @@ TAO_Service_Type_Exporter::fully_describe_all_types (CORBA::Environment& _env)
TAO_TRY_ENV);
TAO_CHECK_ENV;
- this->dump_typestruct (TT_Info::INTERFACE_NAMES[i], type_struct.in ());
- ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
- }
+ if (this->verbose_)
+ {
+ this->dump_typestruct (TT_Info::INTERFACE_NAMES[i], type_struct.in ());
+ ACE_DEBUG ((LM_DEBUG, "------------------------------\n"));
+ }
+ }
}
TAO_CATCHANY
{
@@ -328,7 +340,7 @@ void
TAO_Service_Type_Exporter::create_types (void)
{
TT_Info::Remote_Output ro;
- this->type_structs_[TT_Info::REMOTE_IO].props.length (5);
+ this->type_structs_[TT_Info::REMOTE_IO].props.length (6);
this->type_structs_[TT_Info::REMOTE_IO].props[0].name =
TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::NAME];
this->type_structs_[TT_Info::REMOTE_IO].props[0].value_type =
@@ -340,13 +352,13 @@ TAO_Service_Type_Exporter::create_types (void)
this->type_structs_[TT_Info::REMOTE_IO].props[1].value_type =
CORBA::TypeCode::_duplicate (CORBA::_tc_string);
this->type_structs_[TT_Info::REMOTE_IO].props[1].mode =
- CosTradingRepos::ServiceTypeRepository::PROP_NORMAL;
+ CosTradingRepos::ServiceTypeRepository::PROP_MANDATORY;
this->type_structs_[TT_Info::REMOTE_IO].props[2].name =
TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::DESCRIPTION];
this->type_structs_[TT_Info::REMOTE_IO].props[2].value_type =
CORBA::TypeCode::_duplicate (CORBA::_tc_string);
this->type_structs_[TT_Info::REMOTE_IO].props[2].mode =
- CosTradingRepos::ServiceTypeRepository::PROP_MANDATORY;
+ CosTradingRepos::ServiceTypeRepository::PROP_NORMAL;
this->type_structs_[TT_Info::REMOTE_IO].props[3].name =
TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::HOST_NAME];
this->type_structs_[TT_Info::REMOTE_IO].props[3].value_type =
@@ -359,6 +371,12 @@ TAO_Service_Type_Exporter::create_types (void)
CORBA::TypeCode::_duplicate (CORBA::_tc_string);
this->type_structs_[TT_Info::REMOTE_IO].props[4].mode =
CosTradingRepos::ServiceTypeRepository::PROP_NORMAL;
+ this->type_structs_[TT_Info::REMOTE_IO].props[5].name =
+ TT_Info::REMOTE_IO_PROPERTY_NAMES[TT_Info::MISCELLANEOUS];
+ this->type_structs_[TT_Info::REMOTE_IO].props[5].value_type =
+ CORBA::TypeCode::_duplicate (CORBA::_tc_string);
+ this->type_structs_[TT_Info::REMOTE_IO].props[5].mode =
+ CosTradingRepos::ServiceTypeRepository::PROP_NORMAL;
this->type_structs_[TT_Info::REMOTE_IO].if_name =
ro._interface_repository_id ();