Merge branch 'detach-to-prevent-closing' of https://github.com/Roemer/White into Roemer-detach-to-prevent-closing

Author: Roemer

src/TestStack.White/Application.cs

@@ -58,9 +58,9 @@ public static Application Launch(ProcessStartInfo processStartInfo)
             if (string.IsNullOrEmpty(processStartInfo.WorkingDirectory)) processStartInfo.WorkingDirectory = ".";
 
             Logger.DebugFormat("[Launching process:{0}] [Working directory:{1}] [Process full path:{2}] [Current Directory:{3}]",
-                                             processStartInfo.FileName, 
+                                             processStartInfo.FileName,
                                              new DirectoryInfo(processStartInfo.WorkingDirectory).FullName,
-                                             new FileInfo(processStartInfo.FileName).FullName, 
+                                             new FileInfo(processStartInfo.FileName).FullName,
                                              Environment.CurrentDirectory);
             Process process;
             try
@@ -283,7 +283,10 @@ public override int GetHashCode()
 
         public virtual void Dispose()
         {
-            Kill();
+            if (!CoreAppXmlConfiguration.Instance.KeepOpenOnDispose)
+            {
+                Kill();
+            }
         }
 
         public virtual Window FindSplash()

src/TestStack.White/Configuration/CoreAppXmlConfiguration.cs

@@ -11,9 +11,8 @@ namespace TestStack.White.Configuration
 {
     public class CoreAppXmlConfiguration : AssemblyConfiguration, ICoreConfiguration
     {
-        private static ICoreConfiguration instance;
+        private static ICoreConfiguration instance = new CoreAppXmlConfiguration();
         private readonly DynamicProxyInterceptors interceptors = new DynamicProxyInterceptors();
-
         private static readonly Dictionary<string, object> DefaultValues = new Dictionary<string, object>();
 
         static CoreAppXmlConfiguration()
@@ -35,12 +34,12 @@ static CoreAppXmlConfiguration()
             DefaultValues.Add("MaxElementSearchDepth", 10);
             DefaultValues.Add("DoubleClickInterval", 0);
             DefaultValues.Add("MoveMouseToGetStatusOfHourGlass", true);
-            DefaultValues.Add("InvertMouseButtons", true);
+            DefaultValues.Add("KeepOpenOnDispose", false);            
         }
 
         public static ICoreConfiguration Instance
         {
-            get { return instance ?? (instance = new CoreAppXmlConfiguration()); }
+            get { return instance; }
         }
 
         private CoreAppXmlConfiguration()
@@ -51,15 +50,32 @@ private CoreAppXmlConfiguration()
             LoggerFactory = new WhiteDefaultLoggerFactory(LoggerLevel.Info);
         }
 
+        public virtual ILoggerFactory LoggerFactory { get; set; }
+
+        public virtual IDisposable ApplyTemporarySetting(Action<ICoreConfiguration> changes)
+        {
+            var existing = new Dictionary<string, string>(UsedValues);
+            changes(this);
+
+            return new DelegateDisposable(() =>
+            {
+                foreach (var value in existing)
+                {
+                    SetUsedValue(value.Key, value.Value);
+                }
+            });
+        }
+
         private void SetUsedValue(string key, object value)
         {
             UsedValues[key] = value.ToString();
         }
 
-        public virtual DirectoryInfo WorkSessionLocation
+        public virtual IWaitHook AdditionalWaitHook { get; set; }
+
+        public virtual DynamicProxyInterceptors Interceptors
         {
-            get { return new DirectoryInfo(UsedValues["WorkSessionLocation"]); }
-            set { SetUsedValue("WorkSessionLocation", value); }
+            get { return interceptors; }
         }
 
         public virtual int BusyTimeout
@@ -80,9 +96,10 @@ public virtual bool WaitBasedOnHourGlass
             set { SetUsedValue("WaitBasedOnHourGlass", value); }
         }
 
-        public virtual DynamicProxyInterceptors Interceptors
+        public virtual DirectoryInfo WorkSessionLocation
         {
-            get { return interceptors; }
+            get { return new DirectoryInfo(UsedValues["WorkSessionLocation"]); }
+            set { SetUsedValue("WorkSessionLocation", value); }
         }
 
         public virtual int UIAutomationZeroWindowBugTimeout
@@ -139,46 +156,37 @@ public virtual bool ComboBoxItemsPopulatedWithoutDropDownOpen
             set { SetUsedValue("ComboBoxItemsPopulatedWithoutDropDownOpen", value); }
         }
 
-        public virtual bool MoveMouseToGetStatusOfHourGlass
-        {
-            get { return Convert.ToBoolean(UsedValues["MoveMouseToGetStatusOfHourGlass"]); }
-            set { SetUsedValue("MoveMouseToGetStatusOfHourGlass", value); }
-        }
-
-        public virtual ILoggerFactory LoggerFactory { get; set; }
-
-        public virtual IDisposable ApplyTemporarySetting(Action<ICoreConfiguration> changes)
+        public virtual bool RawElementBasedSearch
         {
-            var existing = new Dictionary<string, string>(UsedValues);
-            changes(this);
-
-            return new DelegateDisposable(() =>
-            {
-                foreach (var value in existing)
-                {
-                    SetUsedValue(value.Key, value.Value);
-                }
-            });
+            get { return Convert.ToBoolean(UsedValues["RawElementBasedSearch"]); }
+            set { SetUsedValue("RawElementBasedSearch", value); }
         }
 
-        public virtual IWaitHook AdditionalWaitHook { get; set; }
-
         public virtual int MaxElementSearchDepth
         {
             get { return Convert.ToInt32(UsedValues["MaxElementSearchDepth"]); }
             set { SetUsedValue("MaxElementSearchDepth", value); }
         }
 
-        public virtual bool RawElementBasedSearch
-        {
-            get { return Convert.ToBoolean(UsedValues["RawElementBasedSearch"]); }
-            set { SetUsedValue("RawElementBasedSearch", value); }
-        }
-
         public virtual int DoubleClickInterval
         {
             get { return Convert.ToInt32(UsedValues["DoubleClickInterval"]); }
             set { SetUsedValue("DoubleClickInterval", value); }
         }
+
+        public virtual bool MoveMouseToGetStatusOfHourGlass
+        {
+            get { return Convert.ToBoolean(UsedValues["MoveMouseToGetStatusOfHourGlass"]); }
+            set { SetUsedValue("MoveMouseToGetStatusOfHourGlass", value); }
+        }
+
+        /// <summary>
+        /// Implements <see cref="ICoreConfiguration.KeepOpenOnDispose"/>
+        /// </summary>
+        public virtual bool KeepOpenOnDispose
+        {
+            get { return Convert.ToBoolean(UsedValues["KeepOpenOnDispose"]); }
+            set { SetUsedValue("KeepOpenOnDispose", value); }
+        }
     }
 }

src/TestStack.White/Configuration/ICoreConfiguration.cs

@@ -11,13 +11,17 @@ namespace TestStack.White.Configuration
     /// </summary>
     public interface ICoreConfiguration
     {
+        ILoggerFactory LoggerFactory { get; set; }
+        IDisposable ApplyTemporarySetting(Action<ICoreConfiguration> changes);
+        IWaitHook AdditionalWaitHook { get; set; }
+        DynamicProxyInterceptors Interceptors { get; }
+
         /// <summary>
         /// In Milliseconds
         /// </summary>
         int BusyTimeout { get; set; }
         int FindWindowTimeout { get; set; }
         bool WaitBasedOnHourGlass { get; set; }
-        DynamicProxyInterceptors Interceptors { get; }
         DirectoryInfo WorkSessionLocation { get; set; }
         int UIAutomationZeroWindowBugTimeout { get; set; }
         int PopupTimeout { get; set; }
@@ -28,12 +32,14 @@ public interface ICoreConfiguration
         int DragStepCount { get; set; }
         bool InProc { get; set; }
         bool ComboBoxItemsPopulatedWithoutDropDownOpen { get; set; }
-        IWaitHook AdditionalWaitHook { get; set; }
-        int MaxElementSearchDepth { get; set; }
         bool RawElementBasedSearch { get; set; }
+        int MaxElementSearchDepth { get; set; }
         int DoubleClickInterval { get; set; }
         bool MoveMouseToGetStatusOfHourGlass { get; set; }
-        ILoggerFactory LoggerFactory { get; set; }
-        IDisposable ApplyTemporarySetting(Action<ICoreConfiguration> changes);
+        /// <summary>
+        /// Flag to allow keeping the <see cref="TestStack.White.Application"/> and <see cref="TestStack.White.UIItems.WindowItems.Window" />
+        /// open after White has disposed it's objects.
+        /// </summary>
+        bool KeepOpenOnDispose { get;set;}
     }
 }

src/TestStack.White/UIItems/WindowItems/Window.cs

@@ -365,7 +365,10 @@ public override string ToString()
 
         public virtual void Dispose()
         {
-            Close();
+            if (!CoreAppXmlConfiguration.Instance.KeepOpenOnDispose)
+            {
+                Close();
+            }
         }
 
         /// <summary>