Removed unnecessary test case. Updated tests to use ACE_TEXT for

literal strings.

4 files changed, 55 insertions, 64 deletions

diff --git a/TAO/OCI_RE_ChangeLog b/TAO/OCI_RE_ChangeLog
index 6c771339687..f02be96a336 100644
--- a/TAO/OCI_RE_ChangeLog
+++ b/TAO/OCI_RE_ChangeLog
@@ -1,3 +1,14 @@
+Thu Jan 17 19:36:08 UTC 2013  Kevin Stanley  <stanleyk@ociweb.com>
+
+        * orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp:
+        * orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp:
+
+          Wrapped literal strings in ACE_TEXT.
+
+        * utils/nsgroup/run_test.pl:
+
+          Removed test steps for Bug #468.
+
 Thu Jan 17 15:32:12 UTC 2013  Byron Harris  <harrisb@ociweb.com>
 
         * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
index 018b06e812b..3bcff5045b7 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp
@@ -19,16 +19,12 @@ LB_server::destroy (void)
   try
     {
       this->naming_manager_->delete_object_group ("Basic Group");
-
-      //TODO: Does the FT_NamingManager need a destroy method?
-//      this->naming_manager_->destroy (1, 1);
-
       this->orb_->destroy ();
     }
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception (
-        "Exception caught while destroying LB_server\n");
+        ACE_TEXT ("Exception caught while destroying LB_server\n"));
       return -1;
     }
   return 0;
@@ -62,7 +58,7 @@ LB_server::write_ior_to_file (const char *ior)
   if (output_file == 0)
     {
       ACE_ERROR ((LM_ERROR,
-                  "Cannot open output file for writing IOR:"));
+                  ACE_TEXT ("Cannot open output file for writing IOR:")));
       return -1;
     }
 
@@ -86,9 +82,9 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[])
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
+                           ACE_TEXT ("usage:  %s ")
+                           ACE_TEXT ("-o <iorfile>")
+                           ACE_TEXT ("\n"),
                            argv [0]),
                           -1);
       }
@@ -109,7 +105,7 @@ LB_server::start_orb_and_poa (void)
 
       if (CORBA::is_nil (poa_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
+                           ACE_TEXT (" (%P|%t) Unable to initialize the POA.\n")),
                           -1);
 
       this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ());
@@ -122,7 +118,8 @@ LB_server::start_orb_and_poa (void)
       ACE_Time_Value timeout (10); // Wait up to 10 seconds for the naming service
       if (name_svc_.init (this->orb_, &timeout) != 0)
         ACE_ERROR_RETURN ((LM_DEBUG,
-                           "LB_server: Could not connect to naming service.\n"),
+                           ACE_TEXT ("LB_server: Could not connect to naming ")
+                           ACE_TEXT ("service.\n")),
                            -1);
 
       CORBA::Object_var obj =
@@ -133,13 +130,15 @@ LB_server::start_orb_and_poa (void)
 
       if (CORBA::is_nil (this->naming_manager_.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to get Naming Manager Reference\n"),
+                           ACE_TEXT (" (%P|%t) Unable to get Naming ")
+                           ACE_TEXT ("Manager Reference\n")),
                           -1);
 
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Exception raised initialising ORB or POA");
+      ex._tao_print_exception (
+        ACE_TEXT ("Exception raised initialising ORB or POA"));
       return -1;
     }
 
@@ -163,13 +162,13 @@ LB_server::create_object_group (void)
 
       // Set the membership style property
       mem_style.nam[0].id =
-        CORBA::string_dup ("org.omg.PortableGroup.MembershipStyle");
+        CORBA::string_dup (ACE_TEXT ("org.omg.PortableGroup.MembershipStyle"));
       PortableGroup::MembershipStyleValue msv =
         PortableGroup::MEMB_APP_CTRL;
       mem_style.val <<= msv;
 
       this->object_group_ = this->naming_manager_->create_object_group (
-        "Basic Group",
+        ACE_TEXT ("Basic Group"),
         FT_Naming::ROUND_ROBIN,
         criteria);
 
@@ -181,7 +180,7 @@ LB_server::create_object_group (void)
   catch (const CORBA::Exception& ex)
     {
       ex._tao_print_exception (
-        "Exception raised while creating object group");
+        ACE_TEXT ("Exception raised while creating object group"));
       return -1;
     }
 
@@ -208,7 +207,8 @@ LB_server::register_servant (Basic *servant, const char *loc)
     }
   catch (const CORBA::Exception& ex)
     {
-      ex._tao_print_exception ("Exception raised while registering servant");
+      ex._tao_print_exception (
+        ACE_TEXT ("Exception raised while registering servant"));
       return -1;
     }
 
diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
index 322aeb14734..17a8b7ad7d6 100644
--- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/client.cpp
@@ -23,9 +23,9 @@ parse_args (int argc, ACE_TCHAR *argv[])
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "\n",
+                           ACE_TEXT ("usage:  %s ")
+                           ACE_TEXT ("-k <ior> ")
+                           ACE_TEXT ("\n"),
                            argv [0]),
                           -1);
       }
@@ -44,7 +44,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       if (parse_args (argc, argv) != 0)
         return 1;
 
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Acquiring Name Service\n"));
+      ACE_DEBUG ((LM_DEBUG,
+                  ACE_TEXT ("(%P|%t) - Acquiring Name Service\n")));
 
       TAO_Naming_Client name_svc;
       try {
@@ -52,12 +53,15 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         ACE_Time_Value timeout (10); // Wait up to 10 seconds for the naming service
         if (name_svc.init (orb.in (), &timeout) != 0)
           ACE_ERROR_RETURN ((LM_DEBUG,
-                             "client: Could not connect to naming service.\n"),
-                             1);
+                             ACE_TEXT ("client: Could not connect to ")
+                             ACE_TEXT ("naming service.\n")),
+                            1);
       }
       catch (const CORBA::Exception& ex)
       {
-        ex._tao_print_exception ("Exception caught while initializing name service facade:");
+        ex._tao_print_exception (
+          ACE_TEXT ("Exception caught while initializing name ")
+          ACE_TEXT ("service facade:"));
         return 1;
       }
 
@@ -84,13 +88,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
         }
         catch (CORBA::Exception& ex)
           {
-            ex._tao_print_exception ("Error resolving name.\n");
+            ex._tao_print_exception (ACE_TEXT ("Error resolving name.\n"));
           }
 
         if (CORBA::is_nil (basic.in ()))
           {
             ACE_ERROR_RETURN ((LM_DEBUG,
-                               "Server obj ref not obtained from Load Balancing Name Service\n",
+                               ACE_TEXT ("Server obj ref not obtained ")
+                               ACE_TEXT ("from Load Balancing Name Service\n"),
                                ior),
                               1);
           }
@@ -99,13 +104,16 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           CORBA::String_var the_string =
             basic->get_string ();
 
-          ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Client request handled by object at <%s>\n",
+          ACE_DEBUG ((LM_DEBUG,
+                      ACE_TEXT ("(%P|%t) - Client request handled ")
+                      ACE_TEXT ("by object at <%s>\n"),
                       the_string.in ()));
 
         }
         catch (CORBA::Exception& ex)
           {
-            ex._tao_print_exception ("Error invoking get_string on Basic object.\n");
+            ex._tao_print_exception (
+              ACE_TEXT ("Error invoking get_string on Basic object.\n"));
             return 1;
           }
 
@@ -119,7 +127,8 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
             }
             catch (CORBA::Exception& ex)
               {
-                ex._tao_print_exception ("Error invoking get_string on Basic object.\n");
+                ex._tao_print_exception (
+                  ACE_TEXT ("Error invoking get_string on Basic object.\n"));
                 return 1;
               }
           }
@@ -129,18 +138,21 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 
         basic->shutdown ();
 
-        ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Shutting down server\n"));
+        ACE_DEBUG ((LM_DEBUG,
+                    ACE_TEXT ("(%P|%t) - Shutting down server\n")));
       }
       catch (CORBA::Exception& ex)
       {
-        ex._tao_print_exception ("Error invoking get_string on Basic object.\n");
+        ex._tao_print_exception (
+          ACE_TEXT ("Error invoking get_string on Basic object.\n"));
         return 1;
       }
       orb->destroy ();
   }
   catch (const CORBA::Exception& ex)
   {
-    ex._tao_print_exception ("Exception caught in client.cpp:");
+    ex._tao_print_exception (
+      ACE_TEXT ("Exception caught in client.cpp:"));
     return 1;
   }
 
diff --git a/TAO/utils/nsgroup/run_test.pl b/TAO/utils/nsgroup/run_test.pl
index 252e144091f..c1070004ec6 100755
--- a/TAO/utils/nsgroup/run_test.pl
+++ b/TAO/utils/nsgroup/run_test.pl
@@ -261,38 +261,6 @@ sub run_clients ()
         "group_list",
         $POSITIVE_TEST_RESULT);
 
-# Test BAE issue #468
-    run_client (
-        "group_create -group another_group -policy round",
-        $POSITIVE_TEST_RESULT);
-
-    run_client (
-        "group_list",
-        $POSITIVE_TEST_RESULT);
-
-    run_client (
-        "member_list -group another_group",
-        $POSITIVE_TEST_RESULT);
-
-# Add an inactive object IOR - will never exist during test.
-    run_client (
-        "member_add -group another_group -location explicit -ior IOR:010000002f00000049444c3a44415441424153454143434553532f45784461746162617365416363657373536572766963653a312e3000000100000000000000c600000001010000130000006d636b6e65726e65792d6c6e78362d6465760069b036642ea200000014010f004e5550000000750000000001000000526f6f74504f41006261652e756e636c6173735f757374696c2e636f72652d66756c6c2e51756572794461746162617365416363657373536572766963652e6d636b6e65726e65792d6c6e78362d6465762f51756572794461746162617365416363657373536572766963650000000000010000005175657279446174616261736541636365737353657276696365",
-        $POSITIVE_TEST_RESULT);
-
-    run_client (
-        "member_list -group another_group",
-        $POSITIVE_TEST_RESULT);
-
-    run_client (
-        "group_remove -group another_group",
-        $POSITIVE_TEST_RESULT);
-
-#end test of BAE #468
-
-    run_client (
-        "group_list",
-        $POSITIVE_TEST_RESULT);
-
     run_client (
         "group_create -group ieee -policy round",
         $POSITIVE_TEST_RESULT);