Address peer review comments.

Signed-off-by: Michel Hidalgo <michel@ekumenlabs.com>
ros2 · Aug 31, 2020 · 85c7445 · 85c7445
1 parent b49350d
commit 85c7445
Showing 1 changed file with 21 additions and 20 deletions.
diff --git a/rcl/test/rcl/test_arguments.cpp b/rcl/test/rcl/test_arguments.cpp
@@ -229,34 +229,18 @@ TEST_F(CLASSNAME(TestArgumentsFixture, RMW_IMPLEMENTATION), check_valid_vs_inval
 
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r"}));
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "--remap"}));
-
-  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", ":="}));
-  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", "foo:="}));
-  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", ":=bar"}));
-
-  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p"}));
-  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "--params-file"}));
-
-  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", ":"}));
-  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "1"}));
-  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "~"}));
-  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "::="}));
-  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "1:="}));
-  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "~:="}));
-  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "__node:="}));
-  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "__node:=/foo/bar"}));
-  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "__ns:=foo"}));
-  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", ":__node:=nodename"}));
-  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "~:__node:=nodename"}));
-
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", ":"}));
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", "1"}));
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", "~"}));
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", ":="}));
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", "foo:="}));
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", ":=bar"}));
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", "::="}));
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", "1:="}));
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", "~:="}));
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", "__node:="}));
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", "__node:=/foo/bar"}));
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", "__ns:="}));
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", "__ns:=foo"}));
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", ":__node:=nodename"}));
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", "~:__node:=nodename"}));
@@ -269,6 +253,23 @@ TEST_F(CLASSNAME(TestArgumentsFixture, RMW_IMPLEMENTATION), check_valid_vs_inval
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", "rostopic://:=rosservice"}));
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-r", "rostopic::=rosservice"}));
 
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p"}));
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", ":="}));
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "foo:="}));
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", ":=bar"}));
+
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", ":"}));
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "1"}));
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "~"}));
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "::="}));
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "1:="}));
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "~:="}));
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "__node:="}));
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "__node:=/foo/bar"}));
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "__ns:=foo"}));
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", ":__node:=nodename"}));
+  EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "~:__node:=nodename"}));
+
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "}foo:=/bar"}));
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "--param", "}foo:=/bar"}));
   EXPECT_FALSE(are_valid_ros_args({"--ros-args", "-p", "f oo:=/bar"}));