Refs #24038. Regression test

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

Author: richiware

src/cpp/rtps/writer/ReaderProxy.cpp

@@ -147,6 +147,7 @@ void ReaderProxy::start(
     {
         initial_heartbeat_event_->restart_timer();
     }
+    std::cout << "frist_irrelevant_removed_: " << first_irrelevant_removed_ << std::endl;
 
     EPROSIMA_LOG_INFO(RTPS_READER_PROXY, "Reader Proxy started");
 }
@@ -247,6 +248,7 @@ void ReaderProxy::add_change(
                 {
                     first_irrelevant_removed_ = seq_num;
                     last_irrelevant_removed_ = seq_num;
+                    std::cout << "set first_irrelevant_removed_ to " << first_irrelevant_removed_ << std::endl;
                 }
                 else if  (seq_num == last_irrelevant_removed_ + 1)
                 {

test/blackbox/api/dds-pim/PubSubReader.hpp

@@ -187,6 +187,7 @@ class PubSubReader
         void on_data_available(
                 eprosima::fastdds::dds::DataReader* datareader) override
         {
+            std::cout << "yeah" << std::endl;
             ASSERT_NE(datareader, nullptr);
             {
                 std::lock_guard<std::mutex> guard(reader_.message_receive_mutex_);

test/blackbox/common/DDSBlackboxTestsContentFilter.cpp

@@ -877,7 +877,7 @@ TEST_P(DDSContentFilter, CorrectGAPSendingTwoReader)
             {
                 total_count_2 = status.total_count;
             }).init();
-    ASSERT_TRUE(reader.isInitialized());
+    ASSERT_TRUE(reader_2.isInitialized());
 
     // Set up the writer
     PubSubWriter<HelloWorldPubSubType> writer(TEST_TOPIC_NAME);
@@ -946,6 +946,97 @@ TEST(DDSContentFilter, filter_other_type_name)
     ASSERT_EQ(dds::DomainParticipantFactory::get_instance()->delete_participant(participant), RETCODE_OK);
 }
 
+
+/*
+ * Regression test for https://eprosima.easyredmine.com/issues/24038
+ *
+ * This test checks that a DDSSQL content filter can be created with a type name that is different from the one
+ * in the generated type support.
+ */
+TEST(DDSContentFilter, reusing_reader_proxy)
+{
+    int32_t total_count {0};
+    int32_t total_count_2 {0};
+
+    PubSubReader<HelloWorldPubSubType> reader(TEST_TOPIC_NAME, "index = 1 OR index = 2 OR index = 6", {}, true, false,
+            false);
+    reader
+            .reliability(RELIABLE_RELIABILITY_QOS)
+            .durability_kind(TRANSIENT_LOCAL_DURABILITY_QOS)
+            .sample_lost_status_functor([&total_count](const SampleLostStatus& status)
+            {
+                total_count = status.total_count;
+            }).init();
+    ASSERT_TRUE(reader.isInitialized());
+
+    auto udp_transport = std::make_shared<UDPv4TransportDescriptor>();
+
+    // Set up the writer
+    PubSubWriter<HelloWorldPubSubType> writer(TEST_TOPIC_NAME);
+    writer
+            .add_user_transport_to_pparams(udp_transport)
+            .disable_builtin_transport()
+            .durability_kind(TRANSIENT_LOCAL_DURABILITY_QOS)
+            .history_depth(10)
+    //.heartbeat_period_seconds(100)
+            .init();
+    ASSERT_TRUE(writer.isInitialized());
+
+    // Wait for discovery
+    reader.wait_discovery();
+    writer.wait_discovery();
+
+    // Send 10 samples
+    auto data = default_helloworld_data_generator();
+
+    decltype(data) expected_data;
+    expected_data.push_back(*data.begin()); // index 1
+    expected_data.push_back(*std::next(data.begin())); // index 2
+    expected_data.push_back(*std::next(data.begin(), 5)); // index 6
+    decltype(data) expected_data_2;
+    expected_data_2.push_back(*std::next(data.begin(), 8)); // index 9
+    expected_data_2.push_back(*std::next(data.begin(), 2)); // index 3
+    expected_data_2.push_back(*std::next(data.begin(), 3)); // index 4
+
+    reader.startReception(expected_data);
+
+    writer.send(data, 50);
+
+    // Wait for reception and check
+    reader.block_for_all();
+    ASSERT_EQ(0, total_count);
+
+    reader.destroy();
+
+    data = default_helloworld_data_generator(4);
+
+    writer.send(data, 50);
+
+    PubSubReader<HelloWorldPubSubType> reader_2(TEST_TOPIC_NAME, "index = 3 OR index = 4 OR index = 9", {}, true, false,
+            false);
+    reader_2
+            .reliability(RELIABLE_RELIABILITY_QOS)
+            .durability_kind(TRANSIENT_LOCAL_DURABILITY_QOS)
+            .sample_lost_status_functor([&total_count_2](const SampleLostStatus& status)
+            {
+                total_count_2 += status.total_count;
+            }).init();
+    ASSERT_TRUE(reader_2.isInitialized());
+
+
+    reader_2.wait_discovery();
+    writer.wait_discovery();
+
+    data = default_helloworld_data_generator(1);
+
+    writer.send(data, 50);
+
+    reader_2.startReception(expected_data_2);
+
+    // Wait for reception and check
+    reader_2.block_for_all();
+}
+
 #ifdef INSTANTIATE_TEST_SUITE_P
 #define GTEST_INSTANTIATE_TEST_MACRO(x, y, z, w) INSTANTIATE_TEST_SUITE_P(x, y, z, w)
 #else