Find child processes in Quit,Close to fix issue Process Terminated.

Author: quangnt

CHANGELOG.md

@@ -8,8 +8,7 @@
 
 ## v1.6.0
 
-- Allow switching process name to `realProcessName` for an apps starting
-with a launcher. That can fix exception Process Not Found in close/quit function
+- Fix exception Process Not Found in close/quit function
 - Fix throw exceptions in getting some gui element's attributes
 
 

src/Winium.Desktop.Driver/CommandExecutors/CloseExecutor.cs

@@ -1,5 +1,12 @@
 namespace Winium.Desktop.Driver.CommandExecutors
 {
+    #region using
+
+    using System.Collections.Generic;
+    using System.Diagnostics;
+
+    #endregion
+
     internal class CloseExecutor : CommandExecutorBase
     {
         #region Methods
@@ -8,7 +15,26 @@ protected override string DoImpl()
         {
             if (!this.Automator.ActualCapabilities.DebugConnectToRunningApp)
             {
-                if (!this.Automator.Application.Close())
+                // If application had exited, find and terminate all children processes
+                if (this.Automator.Application.HasExited())
+                {
+                    List<Process> children = new List<Process>();
+                    children = this.Automator.Application.GetChildPrecesses(this.Automator.Application.GetProcessId());
+                    if (children.Count == 0)
+                    {
+                        children = this.Automator.Application.GetAllPrecessesByName(this.Automator.Application.GetProcessName());
+                    }
+                    foreach (var child in children)
+                    {
+                        if (!child.HasExited && !this.Automator.Application.Close(child))
+                        {
+                            this.Automator.Application.Kill(child);
+                        }
+                    }
+                }
+
+                // If application is still running, terminate it as normal case
+                else if (!this.Automator.Application.Close())
                 {
                     this.Automator.Application.Kill();
                 }

src/Winium.Desktop.Driver/CommandExecutors/QuitExecutor.cs

@@ -1,5 +1,12 @@
 namespace Winium.Desktop.Driver.CommandExecutors
 {
+    #region using
+
+    using System.Collections.Generic;
+    using System.Diagnostics;
+
+    #endregion
+
     internal class QuitExecutor : CommandExecutorBase
     {
         #region Methods
@@ -8,7 +15,26 @@ protected override string DoImpl()
         {
             if (!this.Automator.ActualCapabilities.DebugConnectToRunningApp)
             {
-                if (!this.Automator.Application.Close())
+                // If application had exited, find and terminate all children processes
+                if (this.Automator.Application.HasExited())
+                {
+                    List<Process> children = new List<Process>();
+                    children = this.Automator.Application.GetChildPrecesses(this.Automator.Application.GetProcessId());
+                    if (children.Count == 0)
+                    {
+                        children = this.Automator.Application.GetAllPrecessesByName(this.Automator.Application.GetProcessName());
+                    }
+                    foreach (var child in children)
+                    {
+                        if (!child.HasExited && !this.Automator.Application.Close(child))
+                        {
+                            this.Automator.Application.Kill(child);
+                        }
+                    }
+                }
+
+                // If application is still running, terminate it as normal case
+                else if (!this.Automator.Application.Close())
                 {
                     this.Automator.Application.Kill();
                 }