summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/Trading
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/Trading')
-rw-r--r--TAO/orbsvcs/tests/Trading/Offer_Importer.cpp2
-rw-r--r--TAO/orbsvcs/tests/Trading/TT_Info.cpp6
-rw-r--r--TAO/orbsvcs/tests/Trading/TT_Info.h1
-rw-r--r--TAO/orbsvcs/tests/Trading/Trading.mpc3
-rw-r--r--TAO/orbsvcs/tests/Trading/colocated_test.cpp11
-rw-r--r--TAO/orbsvcs/tests/Trading/export_test.cpp12
-rw-r--r--TAO/orbsvcs/tests/Trading/import_test.cpp8
7 files changed, 27 insertions, 16 deletions
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 13f5084d1f6..201d04d92df 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -99,7 +99,7 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
CORBA::ULong length = link_name_seq2->length ();
for (i = 0; i < length; i++)
{
- if (ACE_OS::strcmp (link_name_seq2[i], "Bootstrap") != 0)
+ if (ACE_OS::strcmp (static_cast<const char*>(link_name_seq2[i]), "Bootstrap") != 0)
break;
}
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index e13b3b0766b..b56bf53f635 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -272,7 +272,7 @@ TT_Parse_Args::TT_Parse_Args (int& argc, char** argv)
quiet_ (0),
ior_ (0)
{
- ACE_Arg_Shifter arg_shifter (argc, argv);
+ ACE_TArg_Shifter< char > arg_shifter (argc, argv);
while (arg_shifter.is_anything_left ())
{
@@ -299,7 +299,7 @@ TT_Parse_Args::TT_Parse_Args (int& argc, char** argv)
if (arg_shifter.is_parameter_next ())
{
const char* file_name = arg_shifter.get_current ();
- ior_file = ACE_OS::fopen (file_name, "r");
+ ior_file = ACE_OS::fopen (file_name, ACE_TEXT("r"));
if (ior_file == 0)
ACE_ERROR ((LM_ERROR,
@@ -309,7 +309,7 @@ TT_Parse_Args::TT_Parse_Args (int& argc, char** argv)
arg_shifter.consume_arg ();
}
else
- ior_file = ACE_OS::fdopen (ACE_STDIN, "r");
+ ior_file = ACE_OS::fdopen (ACE_STDIN, ACE_TEXT("r"));
if (ior_file != 0)
{
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index de4935df75c..fdda73a79c3 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -5,6 +5,7 @@
#include "TTestS.h"
#include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
#include "ace/Read_Buffer.h"
#include "orbsvcs/CosTradingC.h"
#include "orbsvcs/CosTradingReposC.h"
diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc
index 008ef7449a7..ef1fa9fec52 100644
--- a/TAO/orbsvcs/tests/Trading/Trading.mpc
+++ b/TAO/orbsvcs/tests/Trading/Trading.mpc
@@ -24,6 +24,7 @@ project(*Test Lib): orbsvcslib, trading_serv, naming, utils, pi, codecfactory {
}
project(*export test): namingexe, trading_serv, utils {
+ exename = export_test
after += Trading_Test_Lib
libs += TTest
@@ -36,6 +37,7 @@ project(*export test): namingexe, trading_serv, utils {
}
project(*import test): namingexe, trading_serv, utils {
+ exename = import_test
after += Trading_Test_Lib
libs += TTest
@@ -48,6 +50,7 @@ project(*import test): namingexe, trading_serv, utils {
}
project(*colocated test): namingexe, trading_serv, utils {
+ exename = colocated_test
after += Trading_Test_Lib
libs += TTest
diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
index 67d9232a315..965cead51a2 100644
--- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
@@ -2,6 +2,7 @@
#include "ace/Auto_Ptr.h"
#include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
#include "tao/Utils/ORB_Manager.h"
#include "Offer_Exporter.h"
#include "Offer_Importer.h"
@@ -18,7 +19,7 @@ parse_args (int argc, char *argv[],
CORBA::Boolean& verbose)
{
int opt;
- ACE_Get_Opt get_opt (argc, argv, "fq");
+ ACE_Get_Arg_Opt<char> get_opt (argc, argv, "fq");
verbose = 1;
while ((opt = get_opt ()) != EOF)
@@ -29,17 +30,19 @@ parse_args (int argc, char *argv[],
}
int
-main (int argc, char** argv)
+ACE_TMAIN (int argc, ACE_TCHAR** argv)
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
ACE_TRY_NEW_ENV
{
TAO_ORB_Manager orb_manager;
- orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
+ orb_manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// Command line argument interpretation.
CORBA::Boolean verbose = 0;
- ::parse_args (argc, argv, verbose);
+ ::parse_args (convert.get_argc(), convert.get_ASCII_argv(), verbose);
// Initialize ORB.
CORBA::ORB_var orb = orb_manager.orb ();
diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp
index 9078aa74b23..eeaa244912a 100644
--- a/TAO/orbsvcs/tests/Trading/export_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/export_test.cpp
@@ -13,16 +13,18 @@ ACE_RCSID (Trading,
"$Id$")
int
-main (int argc, char** argv)
+ACE_TMAIN (int argc, ACE_TCHAR** argv)
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
ACE_TRY_NEW_ENV
{
TAO_ORB_Manager orb_manager;
- orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
+ orb_manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// Command line argument interpretation.
- TT_Parse_Args parse_args (argc, argv);
+ TT_Parse_Args parse_args (convert.get_argc(), convert.get_ASCII_argv());
// Init the orb and bootstrap to the trading service.
CORBA::ORB_var orb = orb_manager.orb ();
@@ -129,14 +131,14 @@ main (int argc, char** argv)
size_t offset = 0;
char file[1024];
- ACE_OS::strcpy(file, argv[0]);
+ ACE_OS::string_copy(file, argv[0], sizeof(file)/sizeof(file[0]));
if ((offset = (size_t)ACE_OS::strrchr(file, '/')) != 0) {
offset -= ((size_t)file - 1);
}
ACE_OS::strcpy(file + offset, "export_test_ready");
FILE *ready_file =
- ACE_OS::fopen (file, "w");
+ ACE_OS::fopen (file, ACE_TEXT("w"));
if (ready_file != 0) {
ACE_OS::fprintf (ready_file, "The export test is ready\n");
ACE_OS::fclose (ready_file);
diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp
index f303d292998..0d21623d5f8 100644
--- a/TAO/orbsvcs/tests/Trading/import_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/import_test.cpp
@@ -6,16 +6,18 @@
ACE_RCSID(Trading, import_test, "$Id$")
int
-main (int argc, char** argv)
+ACE_TMAIN (int argc, ACE_TCHAR** argv)
{
+ ACE_Argv_Type_Converter convert (argc, argv);
+
ACE_TRY_NEW_ENV
{
TAO_ORB_Manager orb_manager;
- orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
+ orb_manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// Command line argument interpretation.
- TT_Parse_Args parse_args (argc, argv);
+ TT_Parse_Args parse_args (convert.get_argc(), convert.get_ASCII_argv());
// Initialize the ORB and bootstrap to the Lookup interface.
CORBA::ORB_var orb = orb_manager.orb ();
View Lorry Controller Status