From 6d5431fcba23946e58bfaa28f8d521931f5cf0b8 Mon Sep 17 00:00:00 2001 From: Jesus Perez Date: Fri, 15 Dec 2023 15:01:15 +0100 Subject: [PATCH] Rename locators from failing tests Signed-off-by: Jesus Perez --- .../DatabaseQueue/DatabaseQueueTests.cpp | 24 +++++++++---------- .../StatisticsReaderListenerTests.cpp | 6 ++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/test/unittest/DatabaseQueue/DatabaseQueueTests.cpp b/test/unittest/DatabaseQueue/DatabaseQueueTests.cpp index 52a033cd8..b2d135a7f 100644 --- a/test/unittest/DatabaseQueue/DatabaseQueueTests.cpp +++ b/test/unittest/DatabaseQueue/DatabaseQueueTests.cpp @@ -2480,7 +2480,7 @@ TEST_F(database_queue_tests, push_network_latency) std::string src_locator_str = "01.02.03.04.05.06.07.08.09.0a.0b.0c|d.e.f.10"; std::array dst_locator_address = {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; uint32_t dst_locator_port = 2048; - std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048"; + std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048-0"; // Build the source locator DatabaseDataQueue::StatisticsLocator src_locator; @@ -2546,7 +2546,7 @@ TEST_F(database_queue_tests, push_network_latency_no_participant) std::string src_locator_str = "01.02.03.04.05.06.07.08.09.0a.0b.0c|d.e.f.10"; std::array dst_locator_address = {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; uint32_t dst_locator_port = 2048; - std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048"; + std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048-0"; // Build the source locator DatabaseDataQueue::StatisticsLocator src_locator; @@ -2598,7 +2598,7 @@ TEST_F(database_queue_tests, push_network_latency_wrong_participant_format) std::string src_locator_str = "01.02.03.04.05.06.07.08.09.0a.0b.0c|d.e.f.10"; std::array dst_locator_address = {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; uint32_t dst_locator_port = 2048; - std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048"; + std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048-0"; // Build the source locator DatabaseDataQueue::StatisticsLocator src_locator; @@ -2649,7 +2649,7 @@ TEST_F(database_queue_tests, push_network_latency_no_destination_locator) std::string src_locator_str = "01.02.03.04.05.06.07.08.09.0a.0b.0c|d.e.f.10"; std::array dst_locator_address = {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; uint32_t dst_locator_port = 2048; - std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048"; + std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048-0"; // Build the source locator DatabaseDataQueue::StatisticsLocator src_locator; @@ -2923,7 +2923,7 @@ TEST_F(database_queue_tests, push_rtps_sent) std::array dst_locator_address = {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; uint32_t dst_locator_port = 2048; std::string writer_guid_str = "01.02.03.04.05.06.07.08.09.0a.0b.0c|0.0.0.2"; - std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048"; + std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048-0"; // Build the writer GUID DatabaseDataQueue::StatisticsGuidPrefix writer_prefix; @@ -3013,7 +3013,7 @@ TEST_F(database_queue_tests, push_rtps_sent_no_writer) std::array dst_locator_address = {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; uint32_t dst_locator_port = 2048; std::string writer_guid_str = "01.02.03.04.05.06.07.08.09.0a.0b.0c|0.0.0.2"; - std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048"; + std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048-0"; // Build the writer GUID DatabaseDataQueue::StatisticsGuidPrefix writer_prefix; @@ -3071,7 +3071,7 @@ TEST_F(database_queue_tests, push_rtps_sent_no_locator) std::array dst_locator_address = {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; uint32_t dst_locator_port = 2048; std::string writer_guid_str = "01.02.03.04.05.06.07.08.09.0a.0b.0c|0.0.0.2"; - std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048"; + std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048-0"; // Build the writer GUID DatabaseDataQueue::StatisticsGuidPrefix writer_prefix; @@ -3176,7 +3176,7 @@ TEST_F(database_queue_tests, push_rtps_lost) std::array dst_locator_address = {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; uint32_t dst_locator_port = 2048; std::string writer_guid_str = "01.02.03.04.05.06.07.08.09.0a.0b.0c|0.0.0.2"; - std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048"; + std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048-0"; // Build the writer GUID DatabaseDataQueue::StatisticsGuidPrefix writer_prefix; @@ -3266,7 +3266,7 @@ TEST_F(database_queue_tests, push_rtps_lost_no_writer) std::array dst_locator_address = {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; uint32_t dst_locator_port = 2048; std::string writer_guid_str = "01.02.03.04.05.06.07.08.09.0a.0b.0c|0.0.0.2"; - std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048"; + std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048-0"; // Build the writer GUID DatabaseDataQueue::StatisticsGuidPrefix writer_prefix; @@ -3324,7 +3324,7 @@ TEST_F(database_queue_tests, push_rtps_lost_no_locator) std::array dst_locator_address = {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; uint32_t dst_locator_port = 2048; std::string writer_guid_str = "01.02.03.04.05.06.07.08.09.0a.0b.0c|0.0.0.2"; - std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048"; + std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048-0"; // Build the writer GUID DatabaseDataQueue::StatisticsGuidPrefix writer_prefix; @@ -3428,7 +3428,7 @@ TEST_F(database_queue_tests, push_rtps_bytes_no_writer) std::array dst_locator_address = {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; uint32_t dst_locator_port = 2048; std::string writer_guid_str = "01.02.03.04.05.06.07.08.09.0a.0b.0c|0.0.0.2"; - std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048"; + std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048-0"; // Build the writer GUID DatabaseDataQueue::StatisticsGuidPrefix writer_prefix; @@ -3481,7 +3481,7 @@ TEST_F(database_queue_tests, push_rtps_bytes_no_locator) std::array dst_locator_address = {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; uint32_t dst_locator_port = 2048; std::string writer_guid_str = "01.02.03.04.05.06.07.08.09.0a.0b.0c|0.0.0.2"; - std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048"; + std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048-0"; // Build the writer GUID DatabaseDataQueue::StatisticsGuidPrefix writer_prefix; diff --git a/test/unittest/StatisticsReaderListener/StatisticsReaderListenerTests.cpp b/test/unittest/StatisticsReaderListener/StatisticsReaderListenerTests.cpp index 3e350bcc6..5311e7601 100644 --- a/test/unittest/StatisticsReaderListener/StatisticsReaderListenerTests.cpp +++ b/test/unittest/StatisticsReaderListener/StatisticsReaderListenerTests.cpp @@ -356,7 +356,7 @@ TEST_F(statistics_reader_listener_tests, new_network_latency_received) std::string src_locator_str = "01.02.03.04.05.06.07.08.09.0a.0b.0c|d.e.f.10"; std::array dst_locator_address = {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; uint32_t dst_locator_port = 2048; - std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048"; + std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048-0"; // Build the source locator DatabaseDataQueue::StatisticsLocator src_locator; @@ -536,7 +536,7 @@ TEST_F(statistics_reader_listener_tests, new_rtps_sent_received) std::array dst_locator_address = {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; uint32_t dst_locator_port = 2048; std::string writer_guid_str = "01.02.03.04.05.06.07.08.09.0a.0b.0c|0.0.0.2"; - std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048"; + std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048-0"; // Build the writer GUID DatabaseDataQueue::StatisticsGuidPrefix writer_prefix; @@ -624,7 +624,7 @@ TEST_F(statistics_reader_listener_tests, new_rtps_lost_received) std::array dst_locator_address = {16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1}; uint32_t dst_locator_port = 2048; std::string writer_guid_str = "01.02.03.04.05.06.07.08.09.0a.0b.0c|0.0.0.2"; - std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048"; + std::string dst_locator_str = "TCPv4:[4.3.2.1]:2048-0"; // Build the writer GUID DatabaseDataQueue::StatisticsGuidPrefix writer_prefix;