Apply suggestions from code review

Author: urfeex

tests/test_external_control_program.cpp

@@ -39,7 +39,6 @@ const std::string OUTPUT_RECIPE = "resources/rtde_output_recipe.txt";
 const std::string INPUT_RECIPE = "resources/rtde_input_recipe.txt";
 std::string g_ROBOT_IP = "192.168.56.101";
 bool g_HEADLESS = true;
-char g_modified_script[] = "urscript.XXXXXX";
 
 std::unique_ptr<ExampleRobotWrapper> g_my_robot;
 
@@ -58,40 +57,42 @@ class ExternalControlProgramTest : public ::testing::Test
 protected:
   void SetUp() override
   {
-    extendScript();
-    std::string script_file = "../resources/external_control.urscript";
+    std::string modified_script_path = extendScript(SCRIPT_FILE);
 
     g_my_robot = std::make_unique<ExampleRobotWrapper>(g_ROBOT_IP, OUTPUT_RECIPE, INPUT_RECIPE, g_HEADLESS,
-                                                       "external_control.urp", g_modified_script);
+                                                       "external_control.urp", modified_script_path);
     if (!g_my_robot->isHealthy())
     {
       ASSERT_TRUE(g_my_robot->resendRobotProgram());
       ASSERT_TRUE(g_my_robot->waitForProgramRunning(500));
     }
   }
 
-  void extendScript()
+  std::string extendScript(const std::string& script_path)
   {
+    char modified_script_path[] = "urscript.XXXXXX";
 #ifdef _WIN32
 #  define mkstemp _mktemp_s
 #endif
-    std::ignore = mkstemp(g_modified_script);
+    std::ignore = mkstemp(modified_script_path);
 
-    std::ofstream ofs(g_modified_script);
+    std::ofstream ofs(modified_script_path);
     if (ofs.bad())
     {
       std::cout << "Failed to create temporary files" << std::endl;
-      GTEST_FAIL();
+      throw std::runtime_error("Failed to create temporary files");
     }
-    std::ifstream in_file(SCRIPT_FILE);
+    std::ifstream in_file(script_path);
     std::string prog((std::istreambuf_iterator<char>(in_file)), (std::istreambuf_iterator<char>()));
     prog += "\nsocket_open(\"{{SERVER_IP_REPLACE}}\", 60005, \"test_socket\")\n";
     prog += "\nsleep(0.6)\n";
     prog += "\ntextmsg(\"sleeping done.\")\n";
     std::ofstream out_file;
-    out_file.open(g_modified_script);
+    out_file.open(modified_script_path);
     out_file << prog;
     out_file.close();
+
+    return modified_script_path;
   }
 
   bool waitForConnectionCallback(int milliseconds = 100)
@@ -146,13 +147,13 @@ int main(int argc, char* argv[])
     if (std::string(argv[i]) == "--robot_ip" && i + 1 < argc)
     {
       g_ROBOT_IP = argv[i + 1];
-      break;
+      ++i;
     }
     if (std::string(argv[i]) == "--headless" && i + 1 < argc)
     {
       std::string headless = argv[i + 1];
       g_HEADLESS = headless == "true" || headless == "1" || headless == "True" || headless == "TRUE";
-      break;
+      ++i;
     }
   }