diff options
| author | dbudko <dbudko@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-11-26 10:45:22 +0000 |
|---|---|---|
| committer | dbudko <dbudko@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-11-26 10:45:22 +0000 |
| commit | 9ffc5bbe35fd887ed36bde271f575ffc53a544d6 (patch) | |
| tree | 6e3d4ca9645cb3ad9894f13273563a4f5b106cf3 | |
| parent | 87326a75a33ffd050f27082add0f0359586669ac (diff) | |
| download | ATCD-9ffc5bbe35fd887ed36bde271f575ffc53a544d6.tar.gz | |
Thu Nov 26 10:42:27 UTC 2009 Denis Budko <denis.budko@remedy.nl>
* orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp:
* orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp:
* orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp:
* orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp:
Tests are converted to use new test framework and added to fuzz build.
5 files changed, 16 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 63ba236b7b2..6ef82ecc28e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Thu Nov 26 10:42:27 UTC 2009 Denis Budko <denis.budko@remedy.nl> + + * orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp: + * orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp: + * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp: + + Tests are converted to use new test framework and added to fuzz build. + Wed Nov 25 15:37:11 UTC 2009 Vladimir Zykov <vladimir.zykov@prismtech.com> * tao/RTCORBA/RT_ORB_Loader.cpp: diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp index 9b2bf403b1f..6b8f15dbcec 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp @@ -6,8 +6,8 @@ #include "tao/IFR_Client/IFR_ComponentsC.h" #include "ace/Get_Opt.h" -const ACE_TCHAR *ifr_ior= "file://ifr.ior"; -const ACE_TCHAR *member_type_id= "IDL:arrayOfStruct:1.0"; +const ACE_TCHAR *ifr_ior= ACE_TEXT("file://ifr.ior"); +const ACE_TCHAR *member_type_id= ACE_TEXT("IDL:arrayOfStruct:1.0"); int parse_args (int argc, ACE_TCHAR *argv[]) @@ -65,7 +65,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, "Looking up %C", member_type_id )); CORBA::Contained_var - dependency = ifr->lookup_id (member_type_id); + dependency = ifr->lookup_id (ACE_TEXT_ALWAYS_CHAR(member_type_id)); if (CORBA::is_nil (dependency.in ())) { ACE_DEBUG ((LM_DEBUG, " *** failed ***\n" )); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp index ae88059d5cf..aedbaa8910d 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp @@ -11,7 +11,7 @@ ACE_RCSID (Application_Controlled, LB_server::LB_server (int argc, ACE_TCHAR **argv) : argc_ (argc) , argv_ (argv) - , ior_output_file_("obj.ior") + , ior_output_file_(ACE_TEXT("obj.ior")) { } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp index 0e301f86599..86b6fd95662 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp @@ -12,7 +12,7 @@ ACE_RCSID (Infrastructure_Controlled, LB_server::LB_server (int argc, ACE_TCHAR **argv) : argc_ (argc) , argv_ (argv) - , ior_output_file_("obj.ior") + , ior_output_file_(ACE_TEXT("obj.ior")) { } diff --git a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp index 14f05c84232..d17740078c4 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp @@ -96,7 +96,7 @@ void loadunloadcycle() ACE_TEXT ("(%P|%t) loadunloadcycle - loading\n") )); - result = ACE_Service_Config::process_directive(ACE_TEXT_ALWAYS_CHAR(scpc_loadOrb)); + result = ACE_Service_Config::process_directive(scpc_loadOrb); ACE_DEBUG(( LM_DEBUG, ACE_TEXT ("(%P|%t) loadunloadcycle - loading ORB done\n") @@ -125,7 +125,7 @@ void loadunloadcycle() ACE_TEXT ("(%P|%t) loadunloadcycle - v_rootPOA OK\n") )); - result = ACE_Service_Config::process_directive(ACE_TEXT_ALWAYS_CHAR(scpc_loadNotifyService)); + result = ACE_Service_Config::process_directive(scpc_loadNotifyService); ACE_DEBUG(( LM_DEBUG, ACE_TEXT ("(%P|%t) loadunloadcycle - loading NotifyService done\n") |