@@ -25,61 +25,61 @@ using ::testing::UnorderedElementsAre;
25
25
26
26
TEST (test_message_definition_cache, can_find_idl_includes) {
27
27
const char sample[] = R"r(
28
- #include "rosbag2_storage_mcap_test_fixture_interfaces /msg/BasicIdlA.idl"
28
+ #include "rosbag2_storage_mcap_testdata /msg/BasicIdlA.idl"
29
29
30
- #include <rosbag2_storage_mcap_test_fixture_interfaces /msg/BasicIdlB.idl>
30
+ #include <rosbag2_storage_mcap_testdata /msg/BasicIdlB.idl>
31
31
32
- module rosbag2_storage_mcap_test_fixture_interfaces {
32
+ module rosbag2_storage_mcap_testdata {
33
33
module msg {
34
34
struct ComplexIdl {
35
- rosbag2_storage_mcap_test_fixture_interfaces ::msg::BasicIdlA a;
36
- rosbag2_storage_mcap_test_fixture_interfaces ::msg::BasicIdlB b;
35
+ rosbag2_storage_mcap_testdata ::msg::BasicIdlA a;
36
+ rosbag2_storage_mcap_testdata ::msg::BasicIdlB b;
37
37
};
38
38
};
39
39
};
40
40
41
41
)r" ;
42
42
std::set<std::string> dependencies = parse_dependencies (Format::IDL, sample, " " );
43
43
ASSERT_THAT (dependencies,
44
- UnorderedElementsAre (" rosbag2_storage_mcap_test_fixture_interfaces /msg/BasicIdlA" ,
45
- " rosbag2_storage_mcap_test_fixture_interfaces /msg/BasicIdlB" ));
44
+ UnorderedElementsAre (" rosbag2_storage_mcap_testdata /msg/BasicIdlA" ,
45
+ " rosbag2_storage_mcap_testdata /msg/BasicIdlB" ));
46
46
}
47
47
48
48
TEST (test_message_definition_cache, can_find_msg_deps) {
49
49
MessageDefinitionCache cache;
50
50
auto [format, content] =
51
- cache.get_full_text (" rosbag2_storage_mcap_test_fixture_interfaces /ComplexMsg" );
51
+ cache.get_full_text (" rosbag2_storage_mcap_testdata /ComplexMsg" );
52
52
ASSERT_EQ (format, Format::MSG);
53
53
ASSERT_EQ (content,
54
- R"r( rosbag2_storage_mcap_test_fixture_interfaces /BasicMsg b
54
+ R"r( rosbag2_storage_mcap_testdata /BasicMsg b
55
55
56
56
================================================================================
57
- MSG: rosbag2_storage_mcap_test_fixture_interfaces /BasicMsg
57
+ MSG: rosbag2_storage_mcap_testdata /BasicMsg
58
58
float32 c
59
59
)r" );
60
60
}
61
61
62
62
TEST (test_message_definition_cache, can_find_idl_deps) {
63
63
MessageDefinitionCache cache;
64
64
auto [format, content] =
65
- cache.get_full_text (" rosbag2_storage_mcap_test_fixture_interfaces /msg/ComplexIdl" );
65
+ cache.get_full_text (" rosbag2_storage_mcap_testdata /msg/ComplexIdl" );
66
66
EXPECT_EQ (format, Format::IDL);
67
67
EXPECT_EQ (content,
68
68
R"r( ================================================================================
69
- IDL: rosbag2_storage_mcap_test_fixture_interfaces /msg/ComplexIdl
70
- #include "rosbag2_storage_mcap_test_fixture_interfaces /msg/BasicIdl.idl"
69
+ IDL: rosbag2_storage_mcap_testdata /msg/ComplexIdl
70
+ #include "rosbag2_storage_mcap_testdata /msg/BasicIdl.idl"
71
71
72
- module rosbag2_storage_mcap_test_fixture_interfaces {
72
+ module rosbag2_storage_mcap_testdata {
73
73
module msg {
74
74
struct ComplexIdl {
75
- rosbag2_storage_mcap_test_fixture_interfaces ::msg::BasicIdl a;
75
+ rosbag2_storage_mcap_testdata ::msg::BasicIdl a;
76
76
};
77
77
};
78
78
};
79
79
80
80
================================================================================
81
- IDL: rosbag2_storage_mcap_test_fixture_interfaces /msg/BasicIdl
82
- module rosbag2_storage_mcap_test_fixture_interfaces {
81
+ IDL: rosbag2_storage_mcap_testdata /msg/BasicIdl
82
+ module rosbag2_storage_mcap_testdata {
83
83
module msg {
84
84
struct BasicIdl {
85
85
float x;
@@ -92,28 +92,28 @@ module rosbag2_storage_mcap_test_fixture_interfaces {
92
92
TEST (test_message_definition_cache, can_resolve_msg_with_idl_deps) {
93
93
MessageDefinitionCache cache;
94
94
auto [format, content] =
95
- cache.get_full_text (" rosbag2_storage_mcap_test_fixture_interfaces /msg/ComplexMsgDependsOnIdl" );
95
+ cache.get_full_text (" rosbag2_storage_mcap_testdata /msg/ComplexMsgDependsOnIdl" );
96
96
EXPECT_EQ (format, Format::IDL);
97
97
EXPECT_EQ (content,
98
98
R"r( ================================================================================
99
- IDL: rosbag2_storage_mcap_test_fixture_interfaces /msg/ComplexMsgDependsOnIdl
99
+ IDL: rosbag2_storage_mcap_testdata /msg/ComplexMsgDependsOnIdl
100
100
// generated from rosidl_adapter/resource/msg.idl.em
101
- // with input from rosbag2_storage_mcap_test_fixture_interfaces /msg/ComplexMsgDependsOnIdl.msg
101
+ // with input from rosbag2_storage_mcap_testdata /msg/ComplexMsgDependsOnIdl.msg
102
102
// generated code does not contain a copyright notice
103
103
104
- #include "rosbag2_storage_mcap_test_fixture_interfaces /msg/BasicIdl.idl"
104
+ #include "rosbag2_storage_mcap_testdata /msg/BasicIdl.idl"
105
105
106
- module rosbag2_storage_mcap_test_fixture_interfaces {
106
+ module rosbag2_storage_mcap_testdata {
107
107
module msg {
108
108
struct ComplexMsgDependsOnIdl {
109
- rosbag2_storage_mcap_test_fixture_interfaces ::msg::BasicIdl a;
109
+ rosbag2_storage_mcap_testdata ::msg::BasicIdl a;
110
110
};
111
111
};
112
112
};
113
113
114
114
================================================================================
115
- IDL: rosbag2_storage_mcap_test_fixture_interfaces /msg/BasicIdl
116
- module rosbag2_storage_mcap_test_fixture_interfaces {
115
+ IDL: rosbag2_storage_mcap_testdata /msg/BasicIdl
116
+ module rosbag2_storage_mcap_testdata {
117
117
module msg {
118
118
struct BasicIdl {
119
119
float x;
0 commit comments