ChangeLogTag: Sun Apr 6 17:37:24 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

7 files changed, 32 insertions, 14 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 48a9bc9bc8a..7470661c10a 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Sun Apr  6 17:37:24 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tests/Portable_Interceptors/AMI/client.cpp:
+
+	  Modified code to make it possible to change the number of iterations
+	  in 3 separate loops and in correctness checks by changing one 
+	  constant at the top of the file.
+
+        * tests/Portable_Interceptors/Benchmark/server.cpp:
+        * tests/Portable_Interceptors/Dynamic/server.cpp:
+        * tests/Portable_Interceptors/IORInterceptor/server.cpp:
+        * tests/Portable_Interceptors/PICurrent/server.cpp:
+        * tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp:
+
+	  Added default IOR filename.
+
 Sun Apr  6 15:04:35 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tao/Any_T.cpp:
diff --git a/TAO/tests/Portable_Interceptors/AMI/client.cpp b/TAO/tests/Portable_Interceptors/AMI/client.cpp
index 81c76af0fd1..0490db9d37a 100644
--- a/TAO/tests/Portable_Interceptors/AMI/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/client.cpp
@@ -12,6 +12,7 @@ ACE_RCSID (AMI,
 
 const char *ior = "file://test.ior";
 static int exit_status = 0;
+const int ITERATIONS = 100;
 
 int
 parse_args (int argc, char *argv[])
@@ -134,7 +135,7 @@ static void test_synchronous (Test::Echo_ptr echo
     Echo_Client_Request_Interceptor::request_count;
   unsigned long initial_reply_count =
     Echo_Client_Request_Interceptor::reply_count;
-  for(int i = 0; i != 100; ++i)
+  for(int i = 0; i != ITERATIONS; ++i)
   {
     CORBA::String_var s =
       echo->echo_operation ("dummy message"
@@ -146,8 +147,8 @@ static void test_synchronous (Test::Echo_ptr echo
   unsigned long total_reply_count =
     Echo_Client_Request_Interceptor::reply_count - initial_reply_count;
 
-  if (total_request_count != 100
-      || total_reply_count != 100)
+  if (total_request_count != ITERATIONS
+      || total_reply_count != ITERATIONS)
     {
       ACE_ERROR((LM_ERROR,
                  "ERROR: Invalid or mismatched request/reply "
@@ -174,7 +175,7 @@ static void test_ami (Test::Echo_ptr echo
   unsigned long initial_other_count =
     Echo_Client_Request_Interceptor::other_count;
 
-  for(int i = 0; i != 100; ++i)
+  for(int i = 0; i != ITERATIONS; ++i)
     {
       echo->sendc_echo_operation(
         echo_handler.in (), "dummy message" ACE_ENV_ARG_PARAMETER);
@@ -186,8 +187,8 @@ static void test_ami (Test::Echo_ptr echo
   unsigned long total_other_count =
     Echo_Client_Request_Interceptor::other_count - initial_other_count;
 
-  if (total_request_count != 100
-      || total_other_count != 100)
+  if (total_request_count != ITERATIONS
+      || total_other_count != ITERATIONS)
     {
       ACE_ERROR((LM_ERROR,
                  "ERROR: In test_ami() unexpected request/other "
@@ -206,6 +207,7 @@ static void wait_for_exception (CORBA::ORB_ptr orb,
   ACE_CHECK;
 
   bool exception_detected = false;
+
   while(!exception_detected)
     {
       ACE_TRY
@@ -248,7 +250,7 @@ static void test_ami_errors (CORBA::ORB_ptr orb,
   unsigned long initial_exception_count =
     Echo_Client_Request_Interceptor::exception_count;
 
-  for (int i = 0; i != 100; ++i)
+  for (int i = 0; i != ITERATIONS; ++i)
     {
       ACE_TRY
         {
@@ -267,8 +269,8 @@ static void test_ami_errors (CORBA::ORB_ptr orb,
   unsigned long total_exception_count =
     Echo_Client_Request_Interceptor::exception_count - initial_exception_count;
 
-  if (total_request_count != 100
-      || total_exception_count != 100)
+  if (total_request_count != ITERATIONS
+      || total_exception_count != ITERATIONS)
     {
       ACE_ERROR((LM_ERROR,
                  "ERROR: In test_ami_errors() unexpected request/exception "
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
index 9d8610b2857..dafcb0fc8b0 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
@@ -8,7 +8,7 @@
 
 ACE_RCSID(Benchmark, server, "$Id$")
 
-const char *ior_output_file = 0;
+const char *ior_output_file = "test.ior";
 int register_interceptor = 1;
 
 int
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
index 62696682ac3..7e078380002 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
@@ -9,7 +9,7 @@ ACE_RCSID (Dynamic,
            server,
            "$Id$")
 
-const char *ior_output_file = 0;
+const char *ior_output_file = "test.ior";
 
 int
 parse_args (int argc, char *argv[])
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
index 4d9e10f5536..d5e3eac30eb 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
@@ -9,7 +9,7 @@ ACE_RCSID (IORInterceptor,
            server,
            "$Id$")
 
-const char *ior_output_file = 0;
+const char *ior_output_file = "test.ior";
 
 int
 parse_args (int argc, char *argv[])
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
index 4414b4966cc..7e49efe2bf6 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
@@ -9,7 +9,7 @@ ACE_RCSID (PICurrent,
            server,
            "$Id$")
 
-const char *ior_output_file = 0;
+const char *ior_output_file = "test.ior";
 
 extern PortableInterceptor::SlotId slot_id;
 
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
index 15de32386a0..473f7bbca98 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
@@ -9,7 +9,7 @@ ACE_RCSID (Service_Context_Manipulation,
            server,
            "$Id$")
 
-const char *ior_output_file = 0;
+const char *ior_output_file = "test.ior";
 
 int
 parse_args (int argc, char *argv[])