From 1db1a5f99392f4c473068b27392bcc9f44698856 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 30 May 2013 18:53:19 +0000 Subject: Thu May 30 18:52:55 UTC 2013 Johnny Willemsen * orbsvcs/tests/Trading/colocated_test.cpp: * orbsvcs/tests/Trading/export_test.cpp: * orbsvcs/tests/Trading/import_test.cpp: Wchar fixes --- TAO/ChangeLog | 7 +++++++ TAO/orbsvcs/tests/Trading/colocated_test.cpp | 5 ++--- TAO/orbsvcs/tests/Trading/export_test.cpp | 5 ++--- TAO/orbsvcs/tests/Trading/import_test.cpp | 5 ++--- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 01f7af90eec..d4f7555668b 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Thu May 30 18:52:55 UTC 2013 Johnny Willemsen + + * orbsvcs/tests/Trading/colocated_test.cpp: + * orbsvcs/tests/Trading/export_test.cpp: + * orbsvcs/tests/Trading/import_test.cpp: + Wchar fixes + Thu May 30 17:39:37 UTC 2013 Phil Mesnier * orbsvcs/ImplRepo_Service/LiveCheck.h: diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp index 772302f4674..ecd6c299330 100644 --- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp +++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp @@ -25,7 +25,7 @@ parse_args (int argc, ACE_TCHAR *argv[], case 'h': ACE_DEBUG ((LM_INFO, - ACE_TEXT("\nUsage: colocated_test \n" + "\nUsage: colocated_test \n" "Test both the trader's exporter and importer roles.\n" "The options are:\n" "-quiet or -q (optional) Run the tests in quiet mode, don't show the query and\n" @@ -37,8 +37,7 @@ parse_args (int argc, ACE_TCHAR *argv[], "then use the other tests:\n" " - 'export_test' (needs running 'Trading_Service')\n" " - 'import_test'\n" - "See also TAO/docs/releasenotes/trader.html.\n\n" - ) )); + "See also TAO/docs/releasenotes/trader.html.\n\n")); return -1; } } diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index 3faf33b0d60..c2a4e1c6657 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -17,7 +17,7 @@ parse_args_spec (int argc, ACE_TCHAR *argv[], int help) if (help!=0) { ACE_DEBUG ((LM_INFO, - ACE_TEXT("\nUsage: export_test \n" + "\nUsage: export_test \n" "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" @@ -27,8 +27,7 @@ parse_args_spec (int argc, ACE_TCHAR *argv[], int help) "\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" - ) )); + "See also TAO/docs/releasenotes/trader.html.\n\n")); return -1; } else diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp index a7735173506..0392f4620a8 100644 --- a/TAO/orbsvcs/tests/Trading/import_test.cpp +++ b/TAO/orbsvcs/tests/Trading/import_test.cpp @@ -13,7 +13,7 @@ int failure = 0; if (argc<=1) { ACE_DEBUG ((LM_INFO, - ACE_TEXT("\nUsage: import_test \n" + "\nUsage: import_test \n" "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" @@ -21,8 +21,7 @@ int failure = 0; "-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" - ) )); + "See also TAO/docs/releasenotes/trader.html.\n\n")); return 1; }; TAO_ORB_Manager orb_manager; -- cgit v1.2.1