Now using mspaint.exe as default executable to start/stop while running tests. This is better than using calc.exe since calc.exe is a stub/sandbox application to start CalculatorApp.exe. When launching calc.exe, we are unable to properly detect the process id of CAlculatorApp.exe.

Follow up to 319f594.

Author: end2endzone

src/tests/TestActionExecute.cpp

@@ -31,6 +31,8 @@
 #include "Workspace.h"
 #include "QuickLoader.h"
 #include "ArgumentsHandler.h"
+#include "SaUtils.h"
+
 #include "rapidassist/testing.h"
 #include "rapidassist/filesystem_utf8.h"
 #include "rapidassist/user.h"
@@ -39,6 +41,7 @@
 #include "rapidassist/process.h"
 #include "rapidassist/cli.h"
 #include "rapidassist/random.h"
+#include "rapidassist/errors.h"
 
 #ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN 1
@@ -212,6 +215,104 @@ namespace shellanything
       return false;
     }
 
+    void KillShellAnythingArgumentsDebuggerProcess()
+    {
+      printf("Killing all arguments.debugger.window.exe processes...\n");
+
+      if (ra::environment::IsConfigurationDebug())
+        system("cmd.exe /c taskkill /IM arguments.debugger.window-d.exe >NUL 2>NUL");
+      else
+        system("cmd.exe /c taskkill /IM arguments.debugger.window.exe   >NUL 2>NUL");
+
+      ra::timing::Millisleep(1000);
+
+      printf("killed.\n");
+    }
+
+    bool StartShellAnythingArgumentsDebuggerProcess(ra::process::processid_t& pId)
+    {
+      printf("Starting arguments.debugger.window.exe...\n");
+
+      // Build path of arguments.debugger.window.exe
+      std::string current_process_dir = ra::process::GetCurrentProcessDir();
+      std::string process_path;
+      if (ra::environment::IsConfigurationDebug())
+        process_path = current_process_dir + "\\arguments.debugger.window-d.exe";
+      else
+        process_path = current_process_dir + "\\arguments.debugger.window.exe";
+
+      // Assert that file exists
+      if (!ra::filesystem::FileExists(process_path.c_str()))
+      {
+        printf("Start process failed. File not found: '%s'.\n", process_path.c_str());
+        return false;
+      }
+
+      // Start the actual process
+      ra::process::processid_t tmp_pid = ra::process::StartProcess(process_path, current_process_dir.c_str());
+
+      // Asser created properly
+      if (tmp_pid == 0)
+      {
+        ra::errors::errorcode_t last_error = ra::errors::GetLastErrorCode();
+        std::string error_desc = ra::errors::GetErrorCodeDescription(last_error);
+
+        printf("Start process failed. Error code %s, %s.\n", ToHexString(last_error).c_str(), error_desc.c_str());
+        return false;
+      }
+
+      ra::timing::Millisleep(2000);
+
+      printf("started.\n");
+      pId = tmp_pid;
+      return true;
+    }
+
+    void KillMsPaintProcess()
+    {
+      printf("Killing all mspaint.exe processes...\n");
+
+      system("cmd.exe /c taskkill /IM mspaint.exe >NUL 2>NUL");
+      ra::timing::Millisleep(1000);
+
+      printf("killed.\n");
+    }
+
+    bool StartMsPaintProcess(ra::process::processid_t& pId)
+    {
+      printf("Starting mspaint.exe...\n");
+
+      // Build path of arguments.debugger.window.exe
+      std::string current_process_dir = ra::process::GetCurrentProcessDir();
+      std::string process_path = "C:\\Windows\\System32\\mspaint.exe";
+
+      // Assert that file exists
+      if (!ra::filesystem::FileExists(process_path.c_str()))
+      {
+        printf("Start process failed. File not found: '%s'.\n", process_path.c_str());
+        return false;
+      }
+
+      // Start the actual process
+      ra::process::processid_t tmp_pid = ra::process::StartProcess(process_path, current_process_dir.c_str());
+
+      // Asser created properly
+      if (tmp_pid == 0)
+      {
+        ra::errors::errorcode_t last_error = ra::errors::GetLastErrorCode();
+        std::string error_desc = ra::errors::GetErrorCodeDescription(last_error);
+
+        printf("Start process failed. Error code %s, %s.\n", ToHexString(last_error).c_str(), error_desc.c_str());
+        return false;
+      }
+
+      ra::timing::Millisleep(2000);
+
+      printf("started.\n");
+      pId = tmp_pid;
+      return true;
+    }
+
     namespace FindProcessWindows
     {
       static const uint32_t ERROR_PROCESS_NOT_FOUND = (uint32_t)-1;
@@ -296,7 +397,7 @@ namespace shellanything
 
       //Execute the action
       ActionExecute ae;
-      ae.SetPath("C:\\Windows\\System32\\calc.exe");
+      ae.SetPath("C:\\Windows\\System32\\mspaint.exe");
       ae.SetBaseDir("");
       ae.SetArguments("");
 
@@ -305,7 +406,7 @@ namespace shellanything
 
       //Cleanup
       ra::timing::Millisleep(500);
-      KillCalculatorProcess();
+      KillMsPaintProcess();
     }
     //--------------------------------------------------------------------------------------------------
     TEST_F(TestActionExecute, testBaseDir)
@@ -324,7 +425,7 @@ namespace shellanything
 
       //Execute the action
       ActionExecute ae;
-      ae.SetPath("calc.exe");
+      ae.SetPath("mspaint.exe");
       ae.SetBaseDir("C:\\Windows\\System32");
       ae.SetArguments("");
 

src/tests/TestPlugins.cpp

@@ -45,8 +45,10 @@ namespace shellanything
 {
   namespace test
   {
-    extern void KillCalculatorProcess();
-    extern bool StartCalculatorProcess(ra::process::processid_t& pId);
+    //extern void KillCalculatorProcess();
+    //extern bool StartCalculatorProcess(ra::process::processid_t& pId);
+    extern void KillMsPaintProcess();
+    extern bool StartMsPaintProcess(ra::process::processid_t& pId);
 
     static const ConfigFile* INVALID_CONFIGURATION = NULL;
 
@@ -209,8 +211,8 @@ namespace shellanything
 
       TRACE_LINE;
 
-      //Kill all instances of calc.exe
-      KillCalculatorProcess();
+      //Kill all instances of mspaint.exe
+      KillMsPaintProcess();
 
       TRACE_LINE;
 
@@ -247,9 +249,9 @@ namespace shellanything
 
       TRACE_LINE;
 
-      //Start calc
+      //Start mspaint
       ra::process::processid_t pId = 0;
-      ASSERT_TRUE( StartCalculatorProcess(pId) );
+      ASSERT_TRUE( StartMsPaintProcess(pId) );
 
       TRACE_LINE;
 
@@ -304,7 +306,7 @@ namespace shellanything
       TRACE_LINE;
 
       //Cleanup
-      KillCalculatorProcess();
+      KillMsPaintProcess();
       ASSERT_TRUE(workspace.Cleanup()) << "Failed deleting workspace directory '" << workspace.GetBaseDirectory() << "'.";
 
       TRACE_LINE;

src/tests/test_files/TestPlugins.testProcess.xml

@@ -14,28 +14,28 @@
   </plugins>
   <shell>
 
-    <menu name="Terminate Calc (by filename)">
-      <visibility process_filename="CalculatorApp.exe" />
+    <menu name="Terminate MsPaint (by filename)">
+      <visibility process_filename="mspaint.exe" />
       <actions>
-        <terminateprocess filename="CalculatorApp.exe" />
+        <terminateprocess filename="mspaint.exe" />
       </actions>
     </menu>
 
-    <menu name="Terminate Calc (by pid)">
+    <menu name="Terminate MsPaint (by pid)">
       <visibility process_pid="${sa_plugin_process.pid}" />
       <actions>
         <terminateprocess pid="${sa_plugin_process.pid}" />
       </actions>
     </menu>
 
-    <menu name="Kill Calc (by filename)">
-      <visibility process_filename="CalculatorApp.exe" />
+    <menu name="Kill MsPaint (by filename)">
+      <visibility process_filename="mspaint.exe" />
       <actions>
-        <killprocess filename="CalculatorApp.exe" />
+        <killprocess filename="mspaint.exe" />
       </actions>
     </menu>
 
-    <menu name="Kill Calc (by pid)">
+    <menu name="Kill MsPaint (by pid)">
       <visibility process_pid="${sa_plugin_process.pid}" />
       <actions>
         <killprocess pid="${sa_plugin_process.pid}" />