Fix failures

Author: sonndinh

tests/DCPS/RecorderReplayer/Args.h

@@ -21,7 +21,7 @@ const char* ACTOR_REPLAYER = "Replayer";
 const char* ACTOR_SUBSCRIBER = "Subscriber";
 
 const char* EVENT_RECORDER_JOINED = "RecorderJoined";
-const char* EVENT_RECEIVED_ALL_SAMPLES = "ReceivedAllSamples";
+const char* EVENT_RECORDER_RECEIVED_ALL_SAMPLES = "RecorderReceivedAllSamples";
 const char* EVENT_SUBSCRIBER_JOINED = "SubscriberJoined";
 
 const int NUM_SAMPLES = 10;

tests/DCPS/RecorderReplayer/Publisher.cpp

@@ -143,7 +143,7 @@ int ACE_TMAIN(int argc, ACE_TCHAR *argv[])
     }
 
     // Wait until all samples are received by the Recorder
-    dcs->wait_for(ACTOR_PUBLISHER, ACTOR_RECORDER, EVENT_RECEIVED_ALL_SAMPLES);
+    dcs->wait_for(ACTOR_PUBLISHER, ACTOR_RECORDER, EVENT_RECORDER_RECEIVED_ALL_SAMPLES);
 
     ACE_DEBUG((LM_DEBUG, "(%P|%t) Stop publisher\n"));
 

tests/DCPS/RecorderReplayer/Relay.cpp

@@ -38,12 +38,10 @@ class MessengerReplayerListener : public OpenDDS::DCPS::ReplayerListener {
                                    const ::DDS::PublicationMatchedStatus & status)
   {
     if (status.current_count > 0 ) {
-      ACE_DEBUG((LM_DEBUG,
-                 ACE_TEXT("MessengerReplayerListener -- a reader connect to replayer\n")));
+      ACE_DEBUG((LM_DEBUG, "MessengerReplayerListener -- a reader connect to replayer\n"));
       connected_readers_.insert(status.last_subscription_handle);
     } else if (status.current_count == 0 && status.total_count > 0) {
-      ACE_DEBUG((LM_DEBUG,
-                 ACE_TEXT("MessengerRecorderListener -- reader disconnect with replayer\n")));
+      ACE_DEBUG((LM_DEBUG, "MessengerReplayerListener -- reader disconnect with replayer\n"));
     }
   }
 
@@ -74,11 +72,10 @@ class MessengerRecorderListener : public OpenDDS::DCPS::RecorderListener {
   virtual void on_sample_data_received(OpenDDS::DCPS::Recorder*,
                                        const OpenDDS::DCPS::RawDataSample& sample)
   {
-    ACE_DEBUG((LM_DEBUG,
-               ACE_TEXT("MessengerRecorderListener::on_sample_data_received\n")));
+    ACE_DEBUG((LM_DEBUG, "MessengerRecorderListener::on_sample_data_received\n"));
 
     if (++sample_count_ >= NUM_SAMPLES) {
-      dcs_->post(ACTOR_RECORDER, EVENT_RECEIVED_ALL_SAMPLES);
+      dcs_->post(ACTOR_RECORDER, EVENT_RECORDER_RECEIVED_ALL_SAMPLES);
     }
 
     MessengerReplayerListener* replayer_listener =
@@ -116,7 +113,7 @@ class MessengerRecorderListener : public OpenDDS::DCPS::RecorderListener {
   {
     // In the main thread, wait for the publisher to associate
     ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, match_status_mutex_, -1);
-    while (match_status_ == UNMATCHED) {
+    while (match_status_ != MATCHED) {
       if (match_cond_.wait() != 0) {
         return -1;
       }
@@ -128,11 +125,12 @@ class MessengerRecorderListener : public OpenDDS::DCPS::RecorderListener {
   {
     // In the main thread, wait for the publisher to deassociate
     ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, match_status_mutex_, -1);
-    while (match_status_ == MATCHED) {
+    while (match_status_ != UNMATCHED) {
       if (unmatch_cond_.wait() != 0) {
         return -1;
       }
     }
+    return 0;
   }
 
 private:

tests/DCPS/RecorderReplayer/run_test.pl

@@ -11,6 +11,7 @@
 use Env (ACE_ROOT);
 use lib "$ACE_ROOT/bin";
 use PerlDDS::Run_Test;
+use File::Path;
 use strict;
 
 PerlDDS::add_lib_path('../ConsolidatedMessengerIdl');
@@ -139,7 +140,7 @@
 $test->start_process("subscriber");
 $test->start_process("relay");
 
-my $result = $test->finish(300);
+my $result = $test->finish(60);
 if ($result != 0) {
     print STDERR "ERROR: test returned $result\n";
     $status = 1;