Skip to content
This repository was archived by the owner on Nov 30, 2022. It is now read-only.

Commit 9d67fa1

Browse files
james-rmsjames-rms
authored
rename test_fixture_interfaces package to testdata (#64)
Signed-off-by: James Smith <[email protected]> Signed-off-by: James Smith <[email protected]>
1 parent fcd2564 commit 9d67fa1

File tree

14 files changed

+46
-49
lines changed

14 files changed

+46
-49
lines changed

‎rosbag2_storage_mcap/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<test_depend>rosbag2_cpp</test_depend>
2424
<test_depend>rosbag2_test_common</test_depend>
2525
<test_depend>std_msgs</test_depend>
26-
<test_depend>rosbag2_storage_mcap_test_fixture_interfaces</test_depend>
26+
<test_depend>rosbag2_storage_mcap_testdata</test_depend>
2727

2828
<export>
2929
<build_type>ament_cmake</build_type>

‎rosbag2_storage_mcap/test/rosbag2_storage_mcap/test_message_definition_cache.cpp

+25-28
Original file line numberDiff line numberDiff line change
@@ -25,61 +25,58 @@ using ::testing::UnorderedElementsAre;
2525

2626
TEST(test_message_definition_cache, can_find_idl_includes) {
2727
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"
2929
30-
#include <rosbag2_storage_mcap_test_fixture_interfaces/msg/BasicIdlB.idl>
30+
#include <rosbag2_storage_mcap_testdata/msg/BasicIdlB.idl>
3131
32-
module rosbag2_storage_mcap_test_fixture_interfaces {
32+
module rosbag2_storage_mcap_testdata {
3333
module msg {
3434
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;
3737
};
3838
};
3939
};
4040
4141
)r";
4242
std::set<std::string> dependencies = parse_dependencies(Format::IDL, sample, "");
43-
ASSERT_THAT(dependencies,
44-
UnorderedElementsAre("rosbag2_storage_mcap_test_fixture_interfaces/msg/BasicIdlA",
45-
"rosbag2_storage_mcap_test_fixture_interfaces/msg/BasicIdlB"));
43+
ASSERT_THAT(dependencies, UnorderedElementsAre("rosbag2_storage_mcap_testdata/msg/BasicIdlA",
44+
"rosbag2_storage_mcap_testdata/msg/BasicIdlB"));
4645
}
4746

4847
TEST(test_message_definition_cache, can_find_msg_deps) {
4948
MessageDefinitionCache cache;
50-
auto [format, content] =
51-
cache.get_full_text("rosbag2_storage_mcap_test_fixture_interfaces/ComplexMsg");
49+
auto [format, content] = cache.get_full_text("rosbag2_storage_mcap_testdata/ComplexMsg");
5250
ASSERT_EQ(format, Format::MSG);
5351
ASSERT_EQ(content,
54-
R"r(rosbag2_storage_mcap_test_fixture_interfaces/BasicMsg b
52+
R"r(rosbag2_storage_mcap_testdata/BasicMsg b
5553
5654
================================================================================
57-
MSG: rosbag2_storage_mcap_test_fixture_interfaces/BasicMsg
55+
MSG: rosbag2_storage_mcap_testdata/BasicMsg
5856
float32 c
5957
)r");
6058
}
6159

6260
TEST(test_message_definition_cache, can_find_idl_deps) {
6361
MessageDefinitionCache cache;
64-
auto [format, content] =
65-
cache.get_full_text("rosbag2_storage_mcap_test_fixture_interfaces/msg/ComplexIdl");
62+
auto [format, content] = cache.get_full_text("rosbag2_storage_mcap_testdata/msg/ComplexIdl");
6663
EXPECT_EQ(format, Format::IDL);
6764
EXPECT_EQ(content,
6865
R"r(================================================================================
69-
IDL: rosbag2_storage_mcap_test_fixture_interfaces/msg/ComplexIdl
70-
#include "rosbag2_storage_mcap_test_fixture_interfaces/msg/BasicIdl.idl"
66+
IDL: rosbag2_storage_mcap_testdata/msg/ComplexIdl
67+
#include "rosbag2_storage_mcap_testdata/msg/BasicIdl.idl"
7168
72-
module rosbag2_storage_mcap_test_fixture_interfaces {
69+
module rosbag2_storage_mcap_testdata {
7370
module msg {
7471
struct ComplexIdl {
75-
rosbag2_storage_mcap_test_fixture_interfaces::msg::BasicIdl a;
72+
rosbag2_storage_mcap_testdata::msg::BasicIdl a;
7673
};
7774
};
7875
};
7976
8077
================================================================================
81-
IDL: rosbag2_storage_mcap_test_fixture_interfaces/msg/BasicIdl
82-
module rosbag2_storage_mcap_test_fixture_interfaces {
78+
IDL: rosbag2_storage_mcap_testdata/msg/BasicIdl
79+
module rosbag2_storage_mcap_testdata {
8380
module msg {
8481
struct BasicIdl {
8582
float x;
@@ -92,28 +89,28 @@ module rosbag2_storage_mcap_test_fixture_interfaces {
9289
TEST(test_message_definition_cache, can_resolve_msg_with_idl_deps) {
9390
MessageDefinitionCache cache;
9491
auto [format, content] =
95-
cache.get_full_text("rosbag2_storage_mcap_test_fixture_interfaces/msg/ComplexMsgDependsOnIdl");
92+
cache.get_full_text("rosbag2_storage_mcap_testdata/msg/ComplexMsgDependsOnIdl");
9693
EXPECT_EQ(format, Format::IDL);
9794
EXPECT_EQ(content,
9895
R"r(================================================================================
99-
IDL: rosbag2_storage_mcap_test_fixture_interfaces/msg/ComplexMsgDependsOnIdl
96+
IDL: rosbag2_storage_mcap_testdata/msg/ComplexMsgDependsOnIdl
10097
// generated from rosidl_adapter/resource/msg.idl.em
101-
// with input from rosbag2_storage_mcap_test_fixture_interfaces/msg/ComplexMsgDependsOnIdl.msg
98+
// with input from rosbag2_storage_mcap_testdata/msg/ComplexMsgDependsOnIdl.msg
10299
// generated code does not contain a copyright notice
103100
104-
#include "rosbag2_storage_mcap_test_fixture_interfaces/msg/BasicIdl.idl"
101+
#include "rosbag2_storage_mcap_testdata/msg/BasicIdl.idl"
105102
106-
module rosbag2_storage_mcap_test_fixture_interfaces {
103+
module rosbag2_storage_mcap_testdata {
107104
module msg {
108105
struct ComplexMsgDependsOnIdl {
109-
rosbag2_storage_mcap_test_fixture_interfaces::msg::BasicIdl a;
106+
rosbag2_storage_mcap_testdata::msg::BasicIdl a;
110107
};
111108
};
112109
};
113110
114111
================================================================================
115-
IDL: rosbag2_storage_mcap_test_fixture_interfaces/msg/BasicIdl
116-
module rosbag2_storage_mcap_test_fixture_interfaces {
112+
IDL: rosbag2_storage_mcap_testdata/msg/BasicIdl
113+
module rosbag2_storage_mcap_testdata {
117114
module msg {
118115
struct BasicIdl {
119116
float x;

‎rosbag2_storage_mcap_test_fixture_interfaces/CHANGELOG.rst

-6
This file was deleted.

‎rosbag2_storage_mcap_test_fixture_interfaces/msg/ComplexIdl.idl

-9
This file was deleted.

‎rosbag2_storage_mcap_test_fixture_interfaces/msg/ComplexMsg.msg

-1
This file was deleted.

‎rosbag2_storage_mcap_test_fixture_interfaces/msg/ComplexMsgDependsOnIdl.msg

-1
This file was deleted.

‎rosbag2_storage_mcap_testdata/CHANGELOG.rst

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package rosbag2_storage_mcap_testdata
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
5+
0.4.0 (2022-10-06)
6+
------------------

‎rosbag2_storage_mcap_test_fixture_interfaces/CMakeLists.txt ‎rosbag2_storage_mcap_testdata/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.8)
2-
project(rosbag2_storage_mcap_test_fixture_interfaces)
2+
project(rosbag2_storage_mcap_testdata)
33

44
if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
55
add_compile_options(-Wall -Wextra -Wpedantic)

‎rosbag2_storage_mcap_test_fixture_interfaces/msg/BasicIdl.idl ‎rosbag2_storage_mcap_testdata/msg/BasicIdl.idl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module rosbag2_storage_mcap_test_fixture_interfaces {
1+
module rosbag2_storage_mcap_testdata {
22
module msg {
33
struct BasicIdl {
44
float x;

‎rosbag2_storage_mcap_test_fixture_interfaces/msg/BasicMsg.msg ‎rosbag2_storage_mcap_testdata/msg/BasicMsg.msg

File renamed without changes.

‎rosbag2_storage_mcap_testdata/msg/ComplexIdl.idl

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#include "rosbag2_storage_mcap_testdata/msg/BasicIdl.idl"
2+
3+
module rosbag2_storage_mcap_testdata {
4+
module msg {
5+
struct ComplexIdl {
6+
rosbag2_storage_mcap_testdata::msg::BasicIdl a;
7+
};
8+
};
9+
};

‎rosbag2_storage_mcap_testdata/msg/ComplexMsg.msg

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rosbag2_storage_mcap_testdata/BasicMsg b

‎rosbag2_storage_mcap_testdata/msg/ComplexMsgDependsOnIdl.msg

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rosbag2_storage_mcap_testdata/BasicIdl a

‎rosbag2_storage_mcap_test_fixture_interfaces/package.xml ‎rosbag2_storage_mcap_testdata/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<name>rosbag2_storage_mcap_test_fixture_interfaces</name>
4+
<name>rosbag2_storage_mcap_testdata</name>
55
<version>0.4.0</version>
66
<description>message definition test fixtures for MCAP schema recording</description>
77
<maintainer email="[email protected]">James Smith</maintainer>

0 commit comments

Comments
 (0)