Skip to content

Commit bb4af6d

Browse files
authored
Make all packages use gmock, not gtest (#2162)
1 parent 7e8750a commit bb4af6d

File tree

49 files changed

+65
-99
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+65
-99
lines changed

controller_interface/test/test_chainable_controller_interface.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414

1515
#include "test_chainable_controller_interface.hpp"
1616

17-
#include <gmock/gmock.h>
1817
#include <memory>
1918

19+
#include "gmock/gmock.h"
20+
2021
using ::testing::IsEmpty;
2122
using ::testing::SizeIs;
2223

controller_interface/test/test_chainable_controller_interface.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
#ifndef TEST_CHAINABLE_CONTROLLER_INTERFACE_HPP_
1616
#define TEST_CHAINABLE_CONTROLLER_INTERFACE_HPP_
1717

18-
#include <gmock/gmock.h>
19-
2018
#include <string>
2119
#include <vector>
2220

2321
#include "controller_interface/chainable_controller_interface.hpp"
22+
#include "gmock/gmock.h"
2423
#include "hardware_interface/handle.hpp"
2524

2625
constexpr char TEST_CONTROLLER_NAME[] = "testable_chainable_controller";

controller_interface/test/test_controller_interface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414

1515
#include "test_controller_interface.hpp"
1616

17-
#include <gmock/gmock.h>
1817
#include <memory>
1918
#include <string>
2019
#include <vector>
2120

21+
#include "gmock/gmock.h"
2222
#include "lifecycle_msgs/msg/state.hpp"
2323
#include "rclcpp/executor_options.hpp"
2424
#include "rclcpp/executors/multi_threaded_executor.hpp"

controller_interface/test/test_controller_with_options.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414

1515
#include "test_controller_with_options.hpp"
1616

17-
#include <gtest/gtest.h>
1817
#include <string>
1918

19+
#include "gmock/gmock.h"
20+
2021
class FriendControllerWithOptions : public controller_with_options::ControllerWithOptions
2122
{
2223
FRIEND_TEST(ControllerWithOption, init_with_overrides);

controller_interface/test/test_force_torque_sensor.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@
1919
#ifndef TEST_FORCE_TORQUE_SENSOR_HPP_
2020
#define TEST_FORCE_TORQUE_SENSOR_HPP_
2121

22-
#include <gmock/gmock.h>
23-
2422
#include <memory>
2523
#include <string>
2624
#include <vector>
2725

26+
#include "gmock/gmock.h"
2827
#include "semantic_components/force_torque_sensor.hpp"
2928

3029
// implementing and friending so we can access member variables

controller_interface/test/test_gps_sensor.cpp

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

15-
#include <gmock/gmock.h>
16-
#include <gtest/gtest.h>
1715
#include <algorithm>
1816
#include <array>
1917
#include <string>
2018
#include <vector>
19+
20+
#include "gmock/gmock.h"
2121
#include "hardware_interface/handle.hpp"
2222
#include "hardware_interface/loaned_state_interface.hpp"
2323
#include "semantic_components/gps_sensor.hpp"

controller_interface/test/test_imu_sensor.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,11 @@
1919
#ifndef TEST_IMU_SENSOR_HPP_
2020
#define TEST_IMU_SENSOR_HPP_
2121

22-
#include <gmock/gmock.h>
23-
2422
#include <memory>
2523
#include <string>
2624
#include <vector>
2725

26+
#include "gmock/gmock.h"
2827
#include "semantic_components/imu_sensor.hpp"
2928

3029
// implementing and friending so we can access member variables

controller_interface/test/test_led_rgb_device.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
#ifndef TEST_LED_RGB_DEVICE_HPP_
1616
#define TEST_LED_RGB_DEVICE_HPP_
1717

18-
#include <gmock/gmock.h>
19-
2018
#include <array>
2119
#include <limits>
2220
#include <memory>
2321
#include <string>
2422
#include <vector>
2523

24+
#include "gmock/gmock.h"
2625
#include "semantic_components/led_rgb_device.hpp"
2726

2827
class TestableLedDevice : public semantic_components::LedRgbDevice

controller_interface/test/test_pose_sensor.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515
#ifndef TEST_POSE_SENSOR_HPP_
1616
#define TEST_POSE_SENSOR_HPP_
1717

18-
#include <gmock/gmock.h>
19-
2018
#include <array>
2119
#include <memory>
2220
#include <string>
2321
#include <vector>
2422

23+
#include "gmock/gmock.h"
2524
#include "semantic_components/pose_sensor.hpp"
2625

2726
class TestablePoseSensor : public semantic_components::PoseSensor

controller_interface/test/test_semantic_component_command_interface.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@
1818
#ifndef TEST_SEMANTIC_COMPONENT_COMMAND_INTERFACE_HPP_
1919
#define TEST_SEMANTIC_COMPONENT_COMMAND_INTERFACE_HPP_
2020

21-
#include <gmock/gmock.h>
22-
2321
#include <memory>
2422
#include <string>
2523

2624
#include "geometry_msgs/msg/pose.hpp"
25+
#include "gmock/gmock.h"
2726
#include "semantic_components/semantic_component_command_interface.hpp"
2827

2928
// implementing and friending so we can access member variables

0 commit comments

Comments
 (0)