Refs #22682: Fix blackbox tests

Signed-off-by: Carlosespicur <[email protected]>

Author: Carlosespicur

src/cpp/fastdds/topic/ContentFilteredTopicImpl.cpp

@@ -43,11 +43,11 @@ bool ContentFilteredTopicImpl::is_relevant(
 
     if (!check_filter_signature(change, ret_val))
     {
-        IContentFilter::FilterSampleInfo filter_info
-        {
-            change.write_params.sample_identity(),
-            change.write_params.related_sample_identity()
-        };
+        IContentFilter::FilterSampleInfo filter_info;
+        filter_info.sample_identity.writer_guid(change.writerGUID);
+        filter_info.sample_identity.sequence_number(change.sequenceNumber);
+        FASTDDS_TODO_BEFORE(4, 0, "Use change.write_params.related_sample_identity()");
+        filter_info.related_sample_identity = change.write_params.sample_identity();
         ret_val = filter_instance->evaluate(change.serializedPayload, filter_info, reader_guid);
     }
 

test/blackbox/api/dds-pim/ReqRepHelloWorldReplier.cpp

@@ -95,6 +95,8 @@ void ReqRepHelloWorldReplier::init_with_custom_qos(
 
     // Create replier
     replier_ = participant_->create_service_replier(service_, qos);
+    ASSERT_NE(replier_, nullptr);
+    ASSERT_EQ(replier_->is_enabled(), true);
 
     init_processing_thread();
 

test/blackbox/api/dds-pim/ReqRepHelloWorldRequester.cpp

@@ -98,6 +98,8 @@ void ReqRepHelloWorldRequester::init_with_custom_qos(
 
     // Create requester
     requester_ = participant_->create_service_requester(service_, requester_qos);
+    ASSERT_NE(requester_, nullptr);
+    ASSERT_EQ(requester_->is_enabled(), true);
 
     init_processing_thread();
 
@@ -189,19 +191,16 @@ void ReqRepHelloWorldRequester::send(
 
 const Duration_t ReqRepHelloWorldRequester::datawriter_latency_budget_duration() const
 {
-    assert(requester_ != nullptr);
     return requester_->get_requester_writer()->get_qos().latency_budget().duration;
 }
 
 const Duration_t ReqRepHelloWorldRequester::datareader_latency_budget_duration() const
 {
-    assert(requester_ != nullptr);
     return requester_->get_requester_reader()->get_qos().latency_budget().duration;
 }
 
 void ReqRepHelloWorldRequester::init_processing_thread()
 {
-    assert(requester_ != nullptr);
     wait_set_.attach_condition(stop_processing_thread_);
     wait_set_.attach_condition(requester_->get_requester_writer()->get_statuscondition());
     wait_set_.attach_condition(requester_->get_requester_reader()->get_statuscondition());

test/blackbox/api/dds-pim/ReqRepHelloWorldService.cpp

@@ -44,6 +44,6 @@ ReqRepHelloWorldService::ReqRepHelloWorldService()
 Service* ReqRepHelloWorldService::init(
         DomainParticipant* participant)
 {
-    assert(participant->register_service_type(service_type_, service_type_name_) == RETCODE_OK);
+    participant->register_service_type(service_type_, service_type_name_);
     return participant->create_service(service_name_, service_type_name_);
 }

test/blackbox/api/dds-pim/TCPReqRepHelloWorldReplier.cpp

@@ -140,6 +140,8 @@ void TCPReqRepHelloWorldReplier::init(
 
     // Create replier
     replier_ = participant_->create_service_replier(service_, create_replier_qos());
+    ASSERT_NE(replier_, nullptr);
+    ASSERT_EQ(replier_->is_enabled(), true);
 
     init_processing_thread();
 
@@ -269,7 +271,7 @@ void TCPReqRepHelloWorldReplier::process_status_changes()
 
                 if (status_changes.is_active(StatusMask::publication_matched()))
                 {
-                    std::cout << "TCPRequester: Processing publication matched status" << std::endl;
+                    std::cout << "TCPReplier: Processing publication matched status" << std::endl;
 
                     DataWriter* writer = dynamic_cast<DataWriter*>(entity);
                     ASSERT_NE(writer, nullptr);
@@ -278,7 +280,7 @@ void TCPReqRepHelloWorldReplier::process_status_changes()
                     PublicationMatchedStatus status;
                     if (RETCODE_OK != writer->get_publication_matched_status(status))
                     {
-                        std::cout << "TCPRequester: Error processing publication matched status" << std::endl;
+                        std::cout << "TCPReplier: Error processing publication matched status" << std::endl;
                         continue;
                     }
 
@@ -293,7 +295,7 @@ void TCPReqRepHelloWorldReplier::process_status_changes()
                 }
                 else if (status_changes.is_active(StatusMask::subscription_matched()))
                 {
-                    std::cout << "TCPRequester: Processing subscription matched status" << std::endl;
+                    std::cout << "TCPReplier: Processing subscription matched status" << std::endl;
 
                     DataReader* reader = dynamic_cast<DataReader*>(entity);
                     ASSERT_NE(reader, nullptr);
@@ -302,7 +304,7 @@ void TCPReqRepHelloWorldReplier::process_status_changes()
                     SubscriptionMatchedStatus status;
                     if (RETCODE_OK != reader->get_subscription_matched_status(status))
                     {
-                        std::cout << "TCPRequester: Error processing subscription matched status" << std::endl;
+                        std::cout << "TCPReplier: Error processing subscription matched status" << std::endl;
                         continue;
                     }
 
@@ -317,7 +319,7 @@ void TCPReqRepHelloWorldReplier::process_status_changes()
                 }
                 else if (status_changes.is_active(StatusMask::data_available()))
                 {
-                    std::cout << "TCPRequester: Processing data available status" << std::endl;
+                    std::cout << "TCPReplier: Processing data available status" << std::endl;
 
                     DataReader* reader = dynamic_cast<DataReader*>(entity);
                     ASSERT_NE(reader, nullptr);

test/blackbox/api/dds-pim/TCPReqRepHelloWorldRequester.cpp

@@ -184,6 +184,8 @@ void TCPReqRepHelloWorldRequester::init(
 
     // Create requester
     requester_ = participant_->create_service_requester(service_, create_requester_qos());
+    ASSERT_NE(requester_, nullptr);
+    ASSERT_EQ(requester_->is_enabled(), true);
 
     init_processing_thread();
 

test/blackbox/api/dds-pim/TCPReqRepHelloWorldService.cpp

@@ -44,6 +44,6 @@ TCPReqRepHelloWorldService::TCPReqRepHelloWorldService()
 Service* TCPReqRepHelloWorldService::init(
         DomainParticipant* participant)
 {
-    assert(participant->register_service_type(service_type_, service_type_name_) == RETCODE_OK);
+    participant->register_service_type(service_type_, service_type_name_);
     return participant->create_service(service_name_, service_type_name_);
 }