diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Trading/colocated_test.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/colocated_test.cpp | 67 |
1 files changed, 22 insertions, 45 deletions
diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index 67d9232a315..2a7ed294e0f 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -31,11 +31,10 @@ parse_args (int argc, char *argv[], int main (int argc, char** argv) { - ACE_TRY_NEW_ENV + try { TAO_ORB_Manager orb_manager; - orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + orb_manager.init (argc, argv); // Command line argument interpretation. CORBA::Boolean verbose = 0; @@ -51,83 +50,61 @@ main (int argc, char** argv) TAO_Trading_Components_i& trd_comp = trader->trading_components (); // Set the service type repository - sup_attr.type_repos (type_repos._this (ACE_ENV_SINGLE_ARG_PARAMETER)); - ACE_TRY_CHECK; + sup_attr.type_repos (type_repos._this ()); // Run the Service Type Exporter tests ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n")); TAO_Service_Type_Exporter type_exporter (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()), - verbose - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + verbose); - type_exporter.remove_all_types (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + type_exporter.remove_all_types (); - type_exporter.add_all_types (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + type_exporter.add_all_types (); - type_exporter.list_all_types (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + type_exporter.list_all_types (); - type_exporter.describe_all_types (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + type_exporter.describe_all_types (); - type_exporter.fully_describe_all_types (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + type_exporter.fully_describe_all_types (); // Run the Offer Exporter tests ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n")); TAO_Offer_Exporter offer_exporter (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()), - verbose - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + verbose); - offer_exporter.withdraw_offers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + offer_exporter.withdraw_offers (); - offer_exporter.export_offers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + offer_exporter.export_offers (); - offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + offer_exporter.describe_offers (); - offer_exporter.modify_offers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + offer_exporter.modify_offers (); - offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + offer_exporter.describe_offers (); - offer_exporter.withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + offer_exporter.withdraw_offers_using_constraints (); - offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + offer_exporter.describe_offers (); - offer_exporter.withdraw_offers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + offer_exporter.withdraw_offers (); - offer_exporter.export_offers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + offer_exporter.export_offers (); - offer_exporter.describe_offers (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + offer_exporter.describe_offers (); // Run the Offer Importer tests ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Importer tests.\n")); TAO_Offer_Importer offer_importer (CosTrading::Lookup::_duplicate (trd_comp.lookup_if ()), verbose); - offer_importer.perform_queries (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + offer_importer.perform_queries (); } - ACE_CATCHANY + catch (const CORBA::Exception&) { ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "Trader Export Tests Failed"), -1); } - ACE_ENDTRY; return 0; } |