Skip to content

Commit 03ef3b4

Browse files
author
Minggang Wang
committed
Remove actionlib related tests
This patch remove actionlib related tests, as the actionlib feature has been deprecated, see https://github.com/RobotWebTools/rclnodejs#experimental---deprecated Meanwhile, the patch fixes some cpp files used for testing interacting with rclcpp. Fix #None
1 parent 9a93d55 commit 03ef3b4

File tree

13 files changed

+23
-519
lines changed

13 files changed

+23
-519
lines changed

.circleci/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ jobs:
2020
- run: brew update
2121
- run: brew uninstall python
2222
- run: brew install python
23-
- run: brew install wget cmake cppcheck tinyxml tinyxml2 eigen pcre poco
23+
- run: brew install wget cmake cppcheck tinyxml tinyxml2 eigen pcre
24+
- run: brew install https://raw.githubusercontent.com/alebcay/homebrew-core/419873be053a08233d9fd3952f2615c139902434/Formula/poco.rb
2425
- run: brew install openssl
2526
- run: brew install asio console_bridge
2627
- run: python3 -m pip install catkin_pkg empy git+https://github.com/lark-parser/[email protected] pyparsing pyyaml setuptools argcomplete colcon-common-extensions numpy

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ branches:
66
- develop
77
- actionlib
88

9-
image: Visual Studio 2017
9+
image: Visual Studio 2019
1010

1111
environment:
1212
nodejs_version: "10"
@@ -50,6 +50,6 @@ build_script:
5050
- npm run lint
5151

5252
test_script:
53-
- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tools\VsDevCmd.bat"
53+
- cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat"
5454
- "SET PATH=%PYTHON3%;%PYTHON3%\\bin;%PYTHON3%\\Scripts;C:\\Program Files\\CMake\\bin;%PATH%"
5555
- npm test

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
},
3131
"devDependencies": {
3232
"eslint": "^5.14.1",
33-
"mocha": "^6.0.1"
33+
"mocha": "^6.0.1",
34+
"tree-kill": "^1.2.1"
3435
},
3536
"dependencies": {
3637
"bindings": "^1.2.1",

scripts/compile_tests.js

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -106,26 +106,4 @@ if (!fs.existsSync(publisherPath) && !fs.existsSync(subscriptionPath) &&
106106
} else {
107107
copyAll([publisherPath, subscriptionPath, , listenerPath, clientPath], testCppDir);
108108
}
109-
110-
let actionPath = path.join(rootDir, 'test', 'ros1_actions');
111-
process.env.AMENT_PREFIX_PATH = process.env.AMENT_PREFIX_PATH + path.delimiter + actionPath;
112-
113-
const generator = require('../rosidl_gen/index.js');
114-
115-
generator.generateAll(true).then(() => {
116-
console.log('Generation is done.');
117-
118-
let actionBuildProcess = child.spawn('colcon', ['build', '--base-paths', actionPath]);
119-
actionBuildProcess.on('close', (code) => {
120-
copyPkgToRos2('ros1_actions');
121-
});
122-
actionBuildProcess.stdout.on('data', (data) => {
123-
console.log(`${data}`);
124-
});
125-
actionBuildProcess.stderr.on('data', (data) => {
126-
console.log(`${data}`);
127-
});
128-
}).catch((e) => {
129-
console.log(`Caught error: ${e}`);
130-
});
131109
/* eslint-enable */

test/cpp/add_two_ints_client.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ int main(int argc, char ** argv)
5757
{
5858
rclcpp::init(argc, argv);
5959

60-
auto node = rclcpp::Node::make_shared("add_two_ints_client");
60+
auto node = rclcpp::Node::make_shared("add_two_ints_client", rclcpp::NodeOptions());
6161

6262
if (rcutils_cli_option_exist(argv, argv + argc, "-h")) {
6363
print_usage();

test/cpp/listener.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void chatterCallback(const std_msgs::msg::String::SharedPtr msg)
4242
int main(int argc, char * argv[])
4343
{
4444
rclcpp::init(argc, argv);
45-
auto node = rclcpp::Node::make_shared("listener");
45+
auto node = rclcpp::Node::make_shared("listener", rclcpp::NodeOptions());
4646

4747
if (rcutils_cli_option_exist(argv, argv + argc, "-h")) {
4848
print_usage();

test/cpp/publisher_msg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ int main(int argc, char* argv[]) {
7373

7474
rclcpp::init(argc, argv);
7575

76-
auto node = rclcpp::Node::make_shared("cpp_publisher");
76+
auto node = rclcpp::Node::make_shared("cpp_publisher", rclcpp::NodeOptions());
7777

7878
if (rcutils_cli_option_exist(argv, argv + argc, "-h")) {
7979
print_usage();

test/cpp/subscription_msg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ void jointstateCallback(sensor_msgs::msg::JointState::SharedPtr msg) {
135135
int main(int argc, char * argv[])
136136
{
137137
rclcpp::init(argc, argv);
138-
auto node = rclcpp::Node::make_shared("cpp_subscription");
138+
auto node = rclcpp::Node::make_shared("cpp_subscription", rclcpp::NodeOptions());
139139

140140
// Bool
141141
bool_pub = node->create_publisher<std_msgs::msg::Bool>(

test/ros1_actions/DoDishes.action

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

test/test-action2msg.js

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

0 commit comments

Comments
 (0)