Skip to content

Commit 6ddb0b4

Browse files
TheDevMysticTheDevMystic
authored
Rename joint_reference_interfaces to reference_interface_names (#2008)
1 parent 6626451 commit 6ddb0b4

11 files changed

+31
-31
lines changed

‎ackermann_steering_controller/test/test_ackermann_steering_controller.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ TEST_F(AckermannSteeringControllerTest, check_exported_interfaces)
8282

8383
// check ref itfs
8484
auto reference_interfaces = controller_->export_reference_interfaces();
85-
ASSERT_EQ(reference_interfaces.size(), joint_reference_interfaces_.size());
86-
for (size_t i = 0; i < joint_reference_interfaces_.size(); ++i)
85+
ASSERT_EQ(reference_interfaces.size(), reference_interface_names_.size());
86+
for (size_t i = 0; i < reference_interface_names_.size(); ++i)
8787
{
8888
const std::string ref_itf_prefix_name =
89-
std::string(controller_->get_node()->get_name()) + "/" + joint_reference_interfaces_[i];
89+
std::string(controller_->get_node()->get_name()) + "/" + reference_interface_names_[i];
9090
EXPECT_EQ(
9191
reference_interfaces[i]->get_name(),
9292
ref_itf_prefix_name + "/" + hardware_interface::HW_IF_VELOCITY);
@@ -186,7 +186,7 @@ TEST_F(AckermannSteeringControllerTest, test_update_logic)
186186
1.4179821977774734, COMMON_THRESHOLD);
187187

188188
EXPECT_FALSE(std::isnan(controller_->input_ref_.get().twist.linear.x));
189-
EXPECT_EQ(controller_->reference_interfaces_.size(), joint_reference_interfaces_.size());
189+
EXPECT_EQ(controller_->reference_interfaces_.size(), reference_interface_names_.size());
190190
for (const auto & interface : controller_->reference_interfaces_)
191191
{
192192
EXPECT_TRUE(std::isnan(interface));
@@ -226,7 +226,7 @@ TEST_F(AckermannSteeringControllerTest, test_update_logic_chained)
226226
1.4179821977774734, COMMON_THRESHOLD);
227227

228228
EXPECT_TRUE(std::isnan(controller_->input_ref_.get().twist.linear.x));
229-
EXPECT_EQ(controller_->reference_interfaces_.size(), joint_reference_interfaces_.size());
229+
EXPECT_EQ(controller_->reference_interfaces_.size(), reference_interface_names_.size());
230230
for (const auto & interface : controller_->reference_interfaces_)
231231
{
232232
EXPECT_TRUE(std::isnan(interface));

‎ackermann_steering_controller/test/test_ackermann_steering_controller.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ class AckermannSteeringControllerFixture : public ::testing::Test
303303

304304
std::array<double, 4> joint_state_values_ = {{0.5, 0.5, 0.0, 0.0}};
305305
std::array<double, 4> joint_command_values_ = {{1.1, 3.3, 2.2, 4.4}};
306-
std::array<std::string, 2> joint_reference_interfaces_ = {{"linear", "angular"}};
306+
std::array<std::string, 2> reference_interface_names_ = {{"linear", "angular"}};
307307
std::string steering_interface_name_ = "position";
308308
// defined in setup
309309
std::string traction_interface_name_ = "";

‎ackermann_steering_controller/test/test_ackermann_steering_controller_preceding.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ TEST_F(AckermannSteeringControllerTest, check_exported_interfaces)
8484

8585
// check ref itfs
8686
auto reference_interfaces = controller_->export_reference_interfaces();
87-
ASSERT_EQ(reference_interfaces.size(), joint_reference_interfaces_.size());
88-
for (size_t i = 0; i < joint_reference_interfaces_.size(); ++i)
87+
ASSERT_EQ(reference_interfaces.size(), reference_interface_names_.size());
88+
for (size_t i = 0; i < reference_interface_names_.size(); ++i)
8989
{
9090
const std::string ref_itf_prefix_name =
91-
std::string(controller_->get_node()->get_name()) + "/" + joint_reference_interfaces_[i];
91+
std::string(controller_->get_node()->get_name()) + "/" + reference_interface_names_[i];
9292
EXPECT_EQ(
9393
reference_interfaces[i]->get_name(),
9494
ref_itf_prefix_name + "/" + hardware_interface::HW_IF_VELOCITY);

‎bicycle_steering_controller/test/test_bicycle_steering_controller.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ TEST_F(BicycleSteeringControllerTest, check_exported_interfaces)
6868

6969
// check ref itfs
7070
auto reference_interfaces = controller_->export_reference_interfaces();
71-
ASSERT_EQ(reference_interfaces.size(), joint_reference_interfaces_.size());
72-
for (size_t i = 0; i < joint_reference_interfaces_.size(); ++i)
71+
ASSERT_EQ(reference_interfaces.size(), reference_interface_names_.size());
72+
for (size_t i = 0; i < reference_interface_names_.size(); ++i)
7373
{
7474
const std::string ref_itf_prefix_name =
75-
std::string(controller_->get_node()->get_name()) + "/" + joint_reference_interfaces_[i];
75+
std::string(controller_->get_node()->get_name()) + "/" + reference_interface_names_[i];
7676
EXPECT_EQ(
7777
reference_interfaces[i]->get_name(),
7878
ref_itf_prefix_name + "/" + hardware_interface::HW_IF_VELOCITY);
@@ -165,7 +165,7 @@ TEST_F(BicycleSteeringControllerTest, test_update_logic)
165165
COMMON_THRESHOLD);
166166

167167
EXPECT_FALSE(std::isnan(controller_->input_ref_.get().twist.linear.x));
168-
EXPECT_EQ(controller_->reference_interfaces_.size(), joint_reference_interfaces_.size());
168+
EXPECT_EQ(controller_->reference_interfaces_.size(), reference_interface_names_.size());
169169
for (const auto & interface : controller_->reference_interfaces_)
170170
{
171171
EXPECT_TRUE(std::isnan(interface));
@@ -198,7 +198,7 @@ TEST_F(BicycleSteeringControllerTest, test_update_logic_chained)
198198
COMMON_THRESHOLD);
199199

200200
EXPECT_TRUE(std::isnan(controller_->input_ref_.get().twist.linear.x));
201-
EXPECT_EQ(controller_->reference_interfaces_.size(), joint_reference_interfaces_.size());
201+
EXPECT_EQ(controller_->reference_interfaces_.size(), reference_interface_names_.size());
202202
for (const auto & interface : controller_->reference_interfaces_)
203203
{
204204
EXPECT_TRUE(std::isnan(interface));

‎bicycle_steering_controller/test/test_bicycle_steering_controller.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ class BicycleSteeringControllerFixture : public ::testing::Test
272272

273273
std::array<double, 2> joint_state_values_ = {{3.3, 0.5}};
274274
std::array<double, 2> joint_command_values_ = {{1.1, 2.2}};
275-
std::array<std::string, 2> joint_reference_interfaces_ = {{"linear", "angular"}};
275+
std::array<std::string, 2> reference_interface_names_ = {{"linear", "angular"}};
276276
std::string steering_interface_name_ = "position";
277277

278278
// defined in setup

‎bicycle_steering_controller/test/test_bicycle_steering_controller_preceding.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ TEST_F(BicycleSteeringControllerTest, check_exported_interfaces)
7171

7272
// check ref itfs
7373
auto reference_interfaces = controller_->export_reference_interfaces();
74-
ASSERT_EQ(reference_interfaces.size(), joint_reference_interfaces_.size());
75-
for (size_t i = 0; i < joint_reference_interfaces_.size(); ++i)
74+
ASSERT_EQ(reference_interfaces.size(), reference_interface_names_.size());
75+
for (size_t i = 0; i < reference_interface_names_.size(); ++i)
7676
{
7777
const std::string ref_itf_prefix_name =
78-
std::string(controller_->get_node()->get_name()) + "/" + joint_reference_interfaces_[i];
78+
std::string(controller_->get_node()->get_name()) + "/" + reference_interface_names_[i];
7979
EXPECT_EQ(
8080
reference_interfaces[i]->get_name(),
8181
ref_itf_prefix_name + "/" + hardware_interface::HW_IF_VELOCITY);

‎steering_controllers_library/test/test_steering_controllers_library.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ TEST_F(SteeringControllersLibraryTest, check_exported_interfaces)
6666

6767
// check ref itfs
6868
auto reference_interfaces = controller_->export_reference_interfaces();
69-
ASSERT_EQ(reference_interfaces.size(), joint_reference_interfaces_.size());
70-
for (size_t i = 0; i < joint_reference_interfaces_.size(); ++i)
69+
ASSERT_EQ(reference_interfaces.size(), reference_interface_names_.size());
70+
for (size_t i = 0; i < reference_interface_names_.size(); ++i)
7171
{
7272
const std::string ref_itf_prefix_name =
73-
std::string(controller_->get_node()->get_name()) + "/" + joint_reference_interfaces_[i];
73+
std::string(controller_->get_node()->get_name()) + "/" + reference_interface_names_[i];
7474
EXPECT_EQ(reference_interfaces[i]->get_prefix_name(), ref_itf_prefix_name);
7575
EXPECT_EQ(
7676
reference_interfaces[i]->get_name(),

‎steering_controllers_library/test/test_steering_controllers_library.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ class SteeringControllersLibraryFixture : public ::testing::Test
320320
std::array<double, 4> joint_state_values_ = {{0.5, 0.5, 0.0, 0.0}};
321321
std::array<double, 4> joint_command_values_ = {{1.1, 3.3, 2.2, 4.4}};
322322

323-
std::array<std::string, 2> joint_reference_interfaces_ = {{"linear", "angular"}};
323+
std::array<std::string, 2> reference_interface_names_ = {{"linear", "angular"}};
324324
std::string steering_interface_name_ = "position";
325325
// defined in setup
326326
std::string traction_interface_name_ = "";

‎tricycle_steering_controller/test/test_tricycle_steering_controller.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ TEST_F(TricycleSteeringControllerTest, check_exported_interfaces)
7575

7676
// check ref itfs
7777
auto reference_interfaces = controller_->export_reference_interfaces();
78-
ASSERT_EQ(reference_interfaces.size(), joint_reference_interfaces_.size());
79-
for (size_t i = 0; i < joint_reference_interfaces_.size(); ++i)
78+
ASSERT_EQ(reference_interfaces.size(), reference_interface_names_.size());
79+
for (size_t i = 0; i < reference_interface_names_.size(); ++i)
8080
{
8181
const std::string ref_itf_prefix_name =
82-
std::string(controller_->get_node()->get_name()) + "/" + joint_reference_interfaces_[i];
82+
std::string(controller_->get_node()->get_name()) + "/" + reference_interface_names_[i];
8383
EXPECT_EQ(reference_interfaces[i]->get_prefix_name(), ref_itf_prefix_name);
8484
EXPECT_EQ(
8585
reference_interfaces[i]->get_name(),
@@ -175,7 +175,7 @@ TEST_F(TricycleSteeringControllerTest, test_update_logic)
175175
COMMON_THRESHOLD);
176176

177177
EXPECT_FALSE(std::isnan(controller_->input_ref_.get().twist.linear.x));
178-
EXPECT_EQ(controller_->reference_interfaces_.size(), joint_reference_interfaces_.size());
178+
EXPECT_EQ(controller_->reference_interfaces_.size(), reference_interface_names_.size());
179179
for (const auto & interface : controller_->reference_interfaces_)
180180
{
181181
EXPECT_TRUE(std::isnan(interface));
@@ -212,7 +212,7 @@ TEST_F(TricycleSteeringControllerTest, test_update_logic_chained)
212212
COMMON_THRESHOLD);
213213

214214
EXPECT_TRUE(std::isnan(controller_->input_ref_.get().twist.linear.x));
215-
EXPECT_EQ(controller_->reference_interfaces_.size(), joint_reference_interfaces_.size());
215+
EXPECT_EQ(controller_->reference_interfaces_.size(), reference_interface_names_.size());
216216
for (const auto & interface : controller_->reference_interfaces_)
217217
{
218218
EXPECT_TRUE(std::isnan(interface));

‎tricycle_steering_controller/test/test_tricycle_steering_controller.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ class TricycleSteeringControllerFixture : public ::testing::Test
288288

289289
std::array<double, 3> joint_state_values_{{0.5, 0.5, 0.0}};
290290
std::array<double, 3> joint_command_values_{{1.1, 3.3, 2.2}};
291-
std::array<std::string, 2> joint_reference_interfaces_{{"linear", "angular"}};
291+
std::array<std::string, 2> reference_interface_names_{{"linear", "angular"}};
292292
std::string steering_interface_name_ = "position";
293293
// defined in setup
294294
std::string traction_interface_name_ = "";

0 commit comments

Comments
 (0)