Skip to content

Commit 55c5c74

Browse files
Use the FilterTest fixture instead (#439) (#446)
(cherry picked from commit 608f56a) Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
1 parent 862d687 commit 55c5c74

File tree

2 files changed

+11
-69
lines changed

2 files changed

+11
-69
lines changed

control_toolbox/test/control_filters/test_gravity_compensation.cpp

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,24 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "test_gravity_compensation.hpp"
15+
#include "test_filter_util.hpp"
1616

17+
#include <memory>
1718
#include <vector>
1819

19-
TEST_F(GravityCompensationTest, TestGravityCompensationFilterThrowsUnconfigured)
20+
#include "control_filters/gravity_compensation.hpp"
21+
#include "geometry_msgs/msg/wrench_stamped.hpp"
22+
#include "gmock/gmock.h"
23+
24+
TEST_F(FilterTest, TestGravityCompensationFilterThrowsUnconfigured)
2025
{
2126
std::shared_ptr<filters::FilterBase<geometry_msgs::msg::WrenchStamped>> filter_ =
2227
std::make_shared<control_filters::GravityCompensation<geometry_msgs::msg::WrenchStamped>>();
2328
geometry_msgs::msg::WrenchStamped in, out;
2429
ASSERT_THROW(filter_->update(in, out), std::runtime_error);
2530
}
2631

27-
TEST_F(GravityCompensationTest, TestGravityCompensationMissingParameters)
32+
TEST_F(FilterTest, TestGravityCompensationMissingParameters)
2833
{
2934
std::shared_ptr<filters::FilterBase<geometry_msgs::msg::WrenchStamped>> filter_ =
3035
std::make_shared<control_filters::GravityCompensation<geometry_msgs::msg::WrenchStamped>>();
@@ -40,7 +45,7 @@ TEST_F(GravityCompensationTest, TestGravityCompensationMissingParameters)
4045
*/
4146
}
4247

43-
TEST_F(GravityCompensationTest, TestGravityCompensationInvalidThenFixedParameter)
48+
TEST_F(FilterTest, TestGravityCompensationInvalidThenFixedParameter)
4449
{
4550
std::shared_ptr<filters::FilterBase<geometry_msgs::msg::WrenchStamped>> filter_ =
4651
std::make_shared<control_filters::GravityCompensation<geometry_msgs::msg::WrenchStamped>>();
@@ -67,7 +72,7 @@ TEST_F(GravityCompensationTest, TestGravityCompensationInvalidThenFixedParameter
6772
node_->get_node_parameters_interface()));
6873
}
6974

70-
TEST_F(GravityCompensationTest, TestGravityCompensationMissingTransform)
75+
TEST_F(FilterTest, TestGravityCompensationMissingTransform)
7176
{
7277
std::shared_ptr<filters::FilterBase<geometry_msgs::msg::WrenchStamped>> filter_ =
7378
std::make_shared<control_filters::GravityCompensation<geometry_msgs::msg::WrenchStamped>>();
@@ -86,7 +91,7 @@ TEST_F(GravityCompensationTest, TestGravityCompensationMissingTransform)
8691
ASSERT_FALSE(filter_->update(in, out));
8792
}
8893

89-
TEST_F(GravityCompensationTest, TestGravityCompensationComputation)
94+
TEST_F(FilterTest, TestGravityCompensationComputation)
9095
{
9196
std::shared_ptr<filters::FilterBase<geometry_msgs::msg::WrenchStamped>> filter_ =
9297
std::make_shared<control_filters::GravityCompensation<geometry_msgs::msg::WrenchStamped>>();

control_toolbox/test/control_filters/test_gravity_compensation.hpp

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)