From ecffe8329fd0e006865111d9363eca6673eb7f2a Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 29 May 2013 10:14:23 +0000 Subject: Fuzz fixes --- ACE/tests/Compiler_Features_20_DLL.h | 2 +- TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp | 4 +- TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp | 3 +- TAO/orbsvcs/tests/Trading/Offer_Importer.cpp | 24 +++++------ .../tests/Trading/Service_Type_Exporter.cpp | 6 +-- TAO/orbsvcs/tests/Trading/colocated_test.cpp | 48 +++++++++++----------- TAO/orbsvcs/tests/Trading/export_test.cpp | 10 ++--- TAO/orbsvcs/tests/Trading/import_test.cpp | 8 ++-- 8 files changed, 48 insertions(+), 57 deletions(-) diff --git a/ACE/tests/Compiler_Features_20_DLL.h b/ACE/tests/Compiler_Features_20_DLL.h index fd9bc905b29..a749abb240b 100644 --- a/ACE/tests/Compiler_Features_20_DLL.h +++ b/ACE/tests/Compiler_Features_20_DLL.h @@ -1,7 +1,7 @@ //============================================================================= /** - * @file Compile_Features_20_DLL.h + * @file Compiler_Features_20_DLL.h * * $Id$ * diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp index f866b6e48c7..43fdd82e222 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp @@ -2,8 +2,6 @@ #include "orbsvcs/Trader/Offer_Iterators.h" - - TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO_Offer_Iterator::TAO_Offer_Iterator (const TAO_Property_Filter& pfilter) @@ -244,7 +242,7 @@ TAO_Offer_Id_Iterator::next_n (CORBA::ULong n, ACE_NEW_RETURN (_ids, CosTrading::OfferIdSeq(returnable_items), (items_left > 0)); - _ids->length(returnable_items); + _ids->length(returnable_items); // Transfer OfferIds chunk. for (CORBA::ULong i = 0; i < returnable_items; i++) diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp index f2a2f49e059..2ae8d3b4c9d 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp @@ -4,7 +4,6 @@ #include "ace/INET_Addr.h" #include "ace/OS_NS_stdio.h" - TAO_Offer_Exporter:: TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if, CORBA::Boolean verbose) @@ -307,7 +306,7 @@ TAO_Offer_Exporter::grab_offerids (void) offer_id_seq_result.out(), offer_id_iter.out()); - // We might already have seq results but may have to process additional + // We might already have seq results but may have to process additional // iterator result fragments. if (!CORBA::is_nil (offer_id_iter.in())) { diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp index fef66fc1a15..51551c6760e 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp @@ -2,8 +2,6 @@ #include "Offer_Importer.h" - - TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if, CORBA::Boolean verbose) : verbose_ (verbose), @@ -124,7 +122,7 @@ TAO_Offer_Importer::perform_queries_with_policies ( CosTrading::PropertyNameSeq prop_name_seq (4, 4, props, 0); desired_props.prop_names (prop_name_seq); - + for (int i = 0; i < TT_Info::NUM_QUERIES; i++) { ACE_DEBUG ((LM_DEBUG, "\n")); @@ -138,7 +136,7 @@ TAO_Offer_Importer::perform_queries_with_policies ( // Test with different how_many amount, both should work. // Initially try to get this amount in the sequence. CORBA::ULong how_many = 8; - if (i&0x0001) + if (i&0x0001) { how_many=0; // 0: Don't retrieve in offers but all in iterator. }; @@ -167,7 +165,7 @@ TAO_Offer_Importer::perform_queries_with_policies ( ,expected ,i ,seqlen - ,itrlen + ,itrlen ,total )); throw CORBA::TRANSIENT(); // Try again later? @@ -179,11 +177,11 @@ TAO_Offer_Importer::perform_queries_with_policies ( ,expected ,i ,seqlen - ,itrlen + ,itrlen ,total )); }; - + if (this->verbose_) { ACE_DEBUG ((LM_DEBUG, "*** Results:\n\n")); @@ -221,7 +219,7 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, for (CORBA::ULong i = 0; i < offer_seq.length (); i++) { // Call back to the exported object. - // FIXME: shouldn't this be done in a separate 'verify_results' method? + // FIXME: shouldn't this be done in a separate 'verify_results' method? // (confirm () now skipped in quiet mode) TAO_Trader_Test::Remote_Output_var remote_output = TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in ()); @@ -240,17 +238,17 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, do { CosTrading::OfferSeq_var offers; - // Use of iterator->max_left() to get all iterator results is not - // recommended? (see p.879 Advanced CORBA programming book) + // Use of iterator->max_left() to get all iterator results is not + // recommended? (see p.879 Advanced CORBA programming book) // Howmany to process is a choice between next_n call 'dispatch // costs' and 'larges results marshalling bandwidth costs'. - CORBA::ULong how_many = 100; + CORBA::ULong how_many = 100; any_left = offer_iterator->next_n (how_many, offers.out()); - + for (CORBA::ULong i = 0; i < offers->length (); i++) { // Call back to the exported object. - // FIXME: shouldn't this be done in a separate 'verify_results' method? + // FIXME: shouldn't this be done in a separate 'verify_results' method? // (confirm () now skipped in quiet mode) TAO_Trader_Test::Remote_Output_var remote_output = TAO_Trader_Test::Remote_Output::_narrow ((*offers)[i].reference.in ()); diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp index eb8a110008a..c4b3b0700a8 100644 --- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp @@ -2,8 +2,6 @@ #include "Service_Type_Exporter.h" - - TAO_Service_Type_Exporter:: TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if, CORBA::Boolean verbose) @@ -107,7 +105,7 @@ TAO_Service_Type_Exporter::add_all_types_to_all (void) catch (const CORBA::Exception& e) { e._tao_print_exception ("TAO_Service_Type_Exporter::add_all_types_to_all"); - throw; + throw; } this->add_all_types_to (str); @@ -202,7 +200,7 @@ TAO_Service_Type_Exporter::list_all_types (void) catch (const CORBA::Exception& e) { e._tao_print_exception ("TAO_Service_Type_Exporter::list_all_types"); - throw; + throw; } } diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index 166b2830169..772302f4674 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -63,7 +63,7 @@ int failure = 0; //------------------------------------------------------------------------- ACE_DEBUG ((LM_DEBUG, "*** Setup an embedded TradingService.\n")); - // Create a Service Type Repository and a Trader Object so the test can + // Create a Service Type Repository and a Trader Object so the test can // run without an external trading service. // Start of Trading service scope. { @@ -71,61 +71,61 @@ int failure = 0; auto_ptr trader (TAO_Trader_Factory::create_trader (argc, argv)); TAO_Support_Attributes_i& sup_attr = trader->support_attributes (); TAO_Trading_Components_i& trd_comp = trader->trading_components (); - + // Set the service type repository sup_attr.type_repos (type_repos._this ()); - + CosTrading::Lookup_var lookup_if = CosTrading::Lookup::_duplicate( trd_comp.lookup_if()); // Run the POA manager. orb_manager.activate_poa_manager(); - + // Run the Service Type Exporter tests. ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n")); TAO_Service_Type_Exporter type_exporter(lookup_if.in(), verbose); - + type_exporter.remove_all_types (); - + type_exporter.add_all_types (); - + type_exporter.list_all_types (); - + type_exporter.describe_all_types (); - + 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(lookup_if.in(), verbose); - + offer_exporter.withdraw_offers (); - + offer_exporter.export_offers (); - + offer_exporter.describe_offers (); - + offer_exporter.modify_offers (); - + offer_exporter.describe_offers (); - + offer_exporter.withdraw_offers_using_constraints (); - + offer_exporter.describe_offers (); - + offer_exporter.withdraw_offers (); - + offer_exporter.export_offers (); - + offer_exporter.describe_offers (); - + // Run the Offer Importer tests. ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Importer tests.\n")); TAO_Offer_Importer offer_importer(lookup_if.in(), verbose); - + offer_importer.perform_queries (); - - }; // End of Trading service scope. + + }; // End of Trading service scope. //----------------------------------------------------------------------- ACE_DEBUG ((LM_DEBUG, "*** Shutting down.\n")); orb_manager.fini(); diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index 98922543cd0..3faf33b0d60 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -21,15 +21,15 @@ parse_args_spec (int argc, ACE_TCHAR *argv[], int help) "Test the trader's exporter role, the options are:\n" "-ORBInitRef E.g. '-ORBInitRef TradingService=iiop://localhost:8901/TradingService'\n" "-quiet or -q (optional) Run the tests in quiet mode, don't show the query and list results.\n" - "-federate or -f (optional) Setup for federated trader tests.\n" - "-iorfile or -i (optional) Get TradingService reference through IOR instead of resolve.\n" + "-federate or -f (optional) Setup for federated trader tests.\n" + "-iorfile or -i (optional) Get TradingService reference through IOR instead of resolve.\n" "-d (optional) Filename for signalling that we are ready for serving dynamic properties (for import_test).\n" "\n" "This test needs an external TradingServer running, example:\n" " Trading_Service -ORBEndpoint iiop://:8901 -TSdumpior trading.ior\n" "See also TAO/docs/releasenotes/trader.html.\n\n" ) )); - return -1; + return -1; } else { @@ -106,7 +106,7 @@ int failure = 0; type_exporter.describe_all_types (); type_exporter.fully_describe_all_types (); - + ACE_DEBUG ((LM_DEBUG, ACE_TEXT("*** Service Type Exporter tests complete.\n"))); // Run the Offer Exporter tests. @@ -142,7 +142,7 @@ int failure = 0; ACE_DEBUG ((LM_DEBUG, ACE_TEXT("*** Offer Exporter tests complete.\n"))); ACE_DEBUG ((LM_DEBUG, ACE_TEXT("*** Now serving dynamic properties.\n"))); - + // Next file can flag other external apps that we now arrived at serving // dynamic properties. size_t offset = 0; diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp index 9922ea652d3..a7735173506 100644 --- a/TAO/orbsvcs/tests/Trading/import_test.cpp +++ b/TAO/orbsvcs/tests/Trading/import_test.cpp @@ -3,8 +3,6 @@ #include "tao/Utils/ORB_Manager.h" #include "Offer_Importer.h" - - int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { @@ -19,13 +17,13 @@ int failure = 0; "Test the trader's importer role, the options are:\n" "-ORBInitRef E.g. '-ORBInitRef TradingService=file://trading.ior'\n" "-quiet or -q (optional) Run the tests in quiet mode, don't show the query and list results.\n" - "-federate or -f (optional) Perform federated trader tests.\n" - "-iorfile or -i (optional) Get TradingService reference through IOR instead of resolve.\n" + "-federate or -f (optional) Perform federated trader tests.\n" + "-iorfile or -i (optional) Get TradingService reference through IOR instead of resolve.\n" "\n" "This test needs the 'export_test' running so the trader has the right offers.\n" "See also TAO/docs/releasenotes/trader.html.\n\n" ) )); - return 1; + return 1; }; TAO_ORB_Manager orb_manager; orb_manager.init (argc, argv); -- cgit v1.2.1