From b66eb2deb6a8f6ab1f11fe0a04963a5347d918bc Mon Sep 17 00:00:00 2001 From: Tomoya Fujita Date: Sat, 14 Dec 2024 15:56:37 -0800 Subject: [PATCH 1/2] fix RHEL CI warning for rosbag2_storage_mcap. Signed-off-by: Tomoya Fujita --- .../test_message_definition_cache.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/rosbag2_storage_mcap/test/rosbag2_storage_mcap/test_message_definition_cache.cpp b/rosbag2_storage_mcap/test/rosbag2_storage_mcap/test_message_definition_cache.cpp index 2b5a2e01f..3dd51d033 100644 --- a/rosbag2_storage_mcap/test/rosbag2_storage_mcap/test_message_definition_cache.cpp +++ b/rosbag2_storage_mcap/test/rosbag2_storage_mcap/test_message_definition_cache.cpp @@ -151,10 +151,14 @@ TEST(test_message_definition_cache, get_service_message_definitions) TEST(test_local_message_definition_source, throw_definition_not_found_for_unknown_msg) { MessageDefinitionCache source; - ASSERT_THROW({ source.get_full_text("rosbag2_test_msgdefs/msg/UnknownMessage"); }, - rosbag2_storage_mcap::internal::DefinitionNotFoundError); + ASSERT_THROW({ + auto result = + source.get_full_text("rosbag2_test_msgdefs/msg/UnknownMessage"); + }, rosbag2_storage_mcap::internal::DefinitionNotFoundError); // Throw DefinitionNotFoundError for not found message definition package name - ASSERT_THROW({ source.get_full_text("not_found_msgdefs_pkg/msg/UnknownMessage"); }, - rosbag2_storage_mcap::internal::DefinitionNotFoundError); + ASSERT_THROW({ + auto result = + source.get_full_text("not_found_msgdefs_pkg/msg/UnknownMessage"); + }, rosbag2_storage_mcap::internal::DefinitionNotFoundError); } From 9987b6da093b00910bff4c1abf60e87292c044fa Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Wed, 18 Dec 2024 21:10:12 +0000 Subject: [PATCH 2/2] Style fix. Signed-off-by: Chris Lalancette --- .../test_message_definition_cache.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/rosbag2_storage_mcap/test/rosbag2_storage_mcap/test_message_definition_cache.cpp b/rosbag2_storage_mcap/test/rosbag2_storage_mcap/test_message_definition_cache.cpp index 3dd51d033..450204451 100644 --- a/rosbag2_storage_mcap/test/rosbag2_storage_mcap/test_message_definition_cache.cpp +++ b/rosbag2_storage_mcap/test/rosbag2_storage_mcap/test_message_definition_cache.cpp @@ -151,14 +151,10 @@ TEST(test_message_definition_cache, get_service_message_definitions) TEST(test_local_message_definition_source, throw_definition_not_found_for_unknown_msg) { MessageDefinitionCache source; - ASSERT_THROW({ - auto result = - source.get_full_text("rosbag2_test_msgdefs/msg/UnknownMessage"); - }, rosbag2_storage_mcap::internal::DefinitionNotFoundError); + ASSERT_THROW(source.get_full_text("rosbag2_test_msgdefs/msg/UnknownMessage"), + rosbag2_storage_mcap::internal::DefinitionNotFoundError); // Throw DefinitionNotFoundError for not found message definition package name - ASSERT_THROW({ - auto result = - source.get_full_text("not_found_msgdefs_pkg/msg/UnknownMessage"); - }, rosbag2_storage_mcap::internal::DefinitionNotFoundError); + ASSERT_THROW(source.get_full_text("not_found_msgdefs_pkg/msg/UnknownMessage"), + rosbag2_storage_mcap::internal::DefinitionNotFoundError); }