@@ -242,18 +242,7 @@ void test_original_writer_forwarding(
242242 }
243243 ASSERT_EQ (subscriber.original_writer_guid (), publisher.original_writer_guid ());
244244
245- // CASE 2: Send message with original_writer_param set to unknown, should be set to other value
246- sent_msg.index (++samples_sent);
247- eprosima::fastdds::rtps::WriteParams params;
248- params.original_writer_info (eprosima::fastdds::rtps::OriginalWriterInfo::unknown ());
249- ASSERT_EQ (publisher.publish_with_params (sent_msg, params), eprosima::fastdds::dds::RETCODE_OK );
250- // Waiting for the message to be received
251- while (samples_received.load () < 2 )
252- {
253- }
254- ASSERT_EQ (subscriber.original_writer_guid (), publisher.original_writer_guid ());
255-
256- // CASE 3: Send message with original_writer_param set to some value, value must be kept
245+ // CASE 2: Send message with original_writer_param set to some value, value must be kept
257246 sent_msg.index (++samples_sent);
258247 eprosima::fastdds::rtps::WriteParams params_with_og_writer;
259248 eprosima::fastdds::rtps::GUID_t guid ({}, 0x12345678 );
@@ -265,6 +254,17 @@ void test_original_writer_forwarding(
265254 }
266255 ASSERT_EQ (subscriber.original_writer_guid (), guid);
267256
257+ // CASE 3: Send message with original_writer_param set to unknown, should be set to other value
258+ sent_msg.index (++samples_sent);
259+ eprosima::fastdds::rtps::WriteParams params;
260+ params.original_writer_info (eprosima::fastdds::rtps::OriginalWriterInfo::unknown ());
261+ ASSERT_EQ (publisher.publish_with_params (sent_msg, params), eprosima::fastdds::dds::RETCODE_OK );
262+ // Waiting for the message to be received
263+ while (samples_received.load () < 2 )
264+ {
265+ }
266+ ASSERT_EQ (subscriber.original_writer_guid (), publisher.original_writer_guid ());
267+
268268 router.stop ();
269269}
270270
0 commit comments