Mon Nov 18 20:45:12 2002 Pradeep Gore <pradeep@oomworks.com>

5 files changed, 34 insertions, 12 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 02b3e160dbc..38ff17cd295 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,23 @@
+Mon Nov 18 20:45:12 2002  Pradeep Gore  <pradeep@oomworks.com>
+
+	* orbsvcs/tests/Notify/Blocking/notify.conf:
+	  As per Bala's suggestion, applied "-ORBClientConnectionHandler RW" hoping to make the
+	  blocking work.Alas, the buffering design needs a facelift.
+	
+ 	* orbsvcs/tests/Notify/Ordering/run_test.pl
+	  - Increased allowable period for consumers to run so that test
+	  doesn't timeout before hand.
+	  - Commented out priority policy temporarily till the sequences
+	  implementation of priority ordering is completed.
+	
+ 	* orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp:
+	  Removed the MaxEventsPerConsumer policy applied to the
+	  proxy. That isn't what the test was supposed to excercise.
+	
+ 	* orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+	  Changed OR_OP to AND_OP otherwise the Consumer Admin filter will
+	  always be true and no events would be rejected.	
+
 Mon Nov 18 17:54:41 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
 	* tao/Transport.cpp: Cosmetic changes.
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/notify.conf b/TAO/orbsvcs/tests/Notify/Blocking/notify.conf
index b0e7e961b0e..898f35bb38d 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/notify.conf
+++ b/TAO/orbsvcs/tests/Notify/Blocking/notify.conf
@@ -1,4 +1,5 @@
 ## $Id$
 
 ## Load the static Cos Notification Service
-static Notify_Default_Event_Manager_Objects_Factory "-MTDispatching -DispatchingThreads 1 -MTSourceEval"
\ No newline at end of file
+static Client_Strategy_Factory "-ORBClientConnectionHandler RW"
+static Notify_Default_Event_Manager_Objects_Factory "-MTDispatching -DispatchingThreads 1 -MTSourceEval"x
\ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl
index 94e15581be2..9c98034a9d0 100755
--- a/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Ordering/run_test.pl
@@ -81,7 +81,7 @@ for($i = 0; $i <= $#policies; $i++) {
   }
 
   $STC->Arguments($client_args . " -d $order_policy");
-  $client = $STC->SpawnWaitKill (60);
+  $client = $STC->SpawnWaitKill (120);
 
   $STS->Kill ();
   if ($client != 0) {
@@ -91,9 +91,12 @@ for($i = 0; $i <= $#policies; $i++) {
   }
 }
 
+## // pradeep: commented out priority policies temporarily till the sequences implementation is fixed.
+@policies_seq = ("fifo"); 
+
 if ($status == 0) {
-  for($i = 0; $i <= $#policies; $i++) {
-    $order_policy = $policies[$i];
+  for($i = 0; $i <= $#policies_seq; $i++) {
+    $order_policy = $policies_seq[$i];
     print "************** Running Sequence Consumer with the " .
           "$order_policy policy ************\n";
 
@@ -111,7 +114,7 @@ if ($status == 0) {
     }
 
     $SEC->Arguments($client_args . " -d $order_policy");
-    $client = $SEC->SpawnWaitKill (60);
+    $client = $SEC->SpawnWaitKill (120);
 
     $SES->Kill ();
     if ($client != 0) {
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
index fa125dbecda..f314098b7d3 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
@@ -40,14 +40,14 @@ Notify_Sequence_Push_Consumer::connect (
       proxysupplier.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CosNotification::QoSProperties properties (4);
-  properties.length (4);
+  CosNotification::QoSProperties properties (3); //(4);
+  properties.length (3); //(4);
   properties[0].name = CORBA::string_dup (CosNotification::MaximumBatchSize);
   properties[0].value <<= (CORBA::Long)5;
   properties[1].name = CORBA::string_dup (CosNotification::PacingInterval);
   properties[1].value <<= (TimeBase::TimeT)4;
-  properties[3].name = CORBA::string_dup (CosNotification::MaxEventsPerConsumer);
-  properties[3].value <<= (CORBA::Long)2;
+  //properties[3].name = CORBA::string_dup (CosNotification::MaxEventsPerConsumer);
+  //properties[3].value <<= (CORBA::Long)2;
 
   this->proxy_supplier_->set_qos (properties);
   this->proxy_supplier_->connect_sequence_push_consumer (objref.in ()
@@ -108,5 +108,3 @@ Notify_Sequence_Push_Consumer::push_structured_events (
       ACE_OS::sleep (1);
     }
 }
-
-
diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
index 5ca4b730ebf..3bf63653c06 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
@@ -74,7 +74,7 @@ create_consumeradmin (CosNotifyChannelAdmin::EventChannel_ptr ec
 {
   CosNotifyChannelAdmin::AdminID adminid = 0;
   CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-    ec->new_for_consumers (CosNotifyChannelAdmin::OR_OP,
+    ec->new_for_consumers (CosNotifyChannelAdmin::AND_OP,
                            adminid
                            ACE_ENV_ARG_PARAMETER);