Skip to content

Commit 0666616

Browse files
committed
Fix variable naming in test files
1 parent 9f10791 commit 0666616

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

tests/test_instruction_executor.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const std::string SCRIPT_FILE = "../resources/external_control.urscript";
4646
const std::string OUTPUT_RECIPE = "resources/rtde_output_recipe.txt";
4747
const std::string INPUT_RECIPE = "resources/rtde_input_recipe.txt";
4848
const std::string CALIBRATION_CHECKSUM = "calib_12788084448423163542";
49-
std::string ROBOT_IP = "192.168.56.101";
49+
std::string g_ROBOT_IP = "192.168.56.101";
5050
bool g_HEADLESS = true;
5151

5252
std::unique_ptr<ExampleRobotWrapper> g_my_robot;
@@ -58,12 +58,12 @@ class InstructionExecutorTest : public ::testing::Test
5858

5959
static void SetUpTestSuite()
6060
{
61-
if (!(robotVersionLessThan(ROBOT_IP, "10.0.0") || g_HEADLESS))
61+
if (!(robotVersionLessThan(g_ROBOT_IP, "10.0.0") || g_HEADLESS))
6262
{
6363
GTEST_SKIP_("Running URCap tests for PolyScope X is currently not supported.");
6464
}
6565
// Setup driver
66-
g_my_robot = std::make_unique<ExampleRobotWrapper>(ROBOT_IP, OUTPUT_RECIPE, INPUT_RECIPE, g_HEADLESS,
66+
g_my_robot = std::make_unique<ExampleRobotWrapper>(g_ROBOT_IP, OUTPUT_RECIPE, INPUT_RECIPE, g_HEADLESS,
6767
"external_control.urp", SCRIPT_FILE);
6868
}
6969
void SetUp() override
@@ -249,7 +249,7 @@ TEST_F(InstructionExecutorTest, canceling_without_running_trajectory_returns_fal
249249

250250
TEST(InstructionExecutorTestStandalone, canceling_without_receiving_answer_returns_false)
251251
{
252-
if (!(robotVersionLessThan(ROBOT_IP, "10.0.0") || g_HEADLESS))
252+
if (!(robotVersionLessThan(g_ROBOT_IP, "10.0.0") || g_HEADLESS))
253253
{
254254
GTEST_SKIP_("Running URCap tests for PolyScope X is currently not supported.");
255255
}
@@ -269,7 +269,7 @@ TEST(InstructionExecutorTestStandalone, canceling_without_receiving_answer_retur
269269
}
270270
}
271271
out_file.close();
272-
auto my_robot = std::make_unique<ExampleRobotWrapper>(ROBOT_IP, OUTPUT_RECIPE, INPUT_RECIPE, g_HEADLESS,
272+
auto my_robot = std::make_unique<ExampleRobotWrapper>(g_ROBOT_IP, OUTPUT_RECIPE, INPUT_RECIPE, g_HEADLESS,
273273
"external_control.urp", test_script_file);
274274
auto executor = std::make_unique<InstructionExecutor>(my_robot->ur_driver_);
275275
my_robot->clearProtectiveStop();
@@ -371,7 +371,7 @@ int main(int argc, char* argv[])
371371
{
372372
if (std::string(argv[i]) == "--robot_ip" && i + 1 < argc)
373373
{
374-
ROBOT_IP = argv[i + 1];
374+
g_ROBOT_IP = argv[i + 1];
375375
break;
376376
}
377377
if (std::string(argv[i]) == "--headless" && i + 1 < argc)

0 commit comments

Comments
 (0)