From 24554dde870ad7dc20eb3d5328323bc1118a5696 Mon Sep 17 00:00:00 2001
From: AaronJamesY <personal.ajy@gmail.com>
Date: Sun, 12 Feb 2017 23:00:48 +0000
Subject: [PATCH] Client and dependencies are now properly disposed of

---
 BankingBot/BankingClient.cs         | 48 ++++++++++++++++++++++++-----
 BankingBot/BrowserBot.cs            | 38 ++++++++++++++++++++---
 BankingBot/Contracts/IBrowserBot.cs |  3 +-
 3 files changed, 76 insertions(+), 13 deletions(-)

diff --git a/BankingBot/BankingClient.cs b/BankingBot/BankingClient.cs
index 05dd794..1fd7645 100644
--- a/BankingBot/BankingClient.cs
+++ b/BankingBot/BankingClient.cs
@@ -10,14 +10,13 @@ using BankingBot.Enums;
 
 namespace BankingBot
 {
-    public class BankingClient <T> : IClient
+    public class BankingClient <T> : IClient, IDisposable
         where T : IWebDriver
     {
         #region Dependencies
         readonly ILoginManager loginManager;
         readonly IAccountManager accountManager;
-
-        protected readonly IBrowserBot BrowserBot;
+        readonly IBrowserBot browserBot;
         #endregion
 
         public ILoginCredentials LoginCredentials { get; private set; }
@@ -30,10 +29,9 @@ namespace BankingBot
 
         public BankingClient()
         {
-            BrowserBot = new BrowserBot<T>();
-
-            loginManager = new LoginManager(BrowserBot);
-            accountManager = new AccountManager(BrowserBot);
+            browserBot = new BrowserBot<T>();
+            loginManager = new LoginManager(browserBot);
+            accountManager = new AccountManager(browserBot);
         }
 
         #region Actions - Login Manager
@@ -67,5 +65,41 @@ namespace BankingBot
         }
 
         #endregion
+
+        #region IDisposable Support
+        private bool disposedValue = false; // To detect redundant calls
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    browserBot.Dispose();
+                }
+
+                // TODO: free unmanaged resources (unmanaged objects) and override a finalizer below.
+                // TODO: set large fields to null.
+
+                disposedValue = true;
+            }
+        }
+
+        // TODO: override a finalizer only if Dispose(bool disposing) above has code to free unmanaged resources.
+        // ~BankingClient() {
+        //   // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
+        //   Dispose(false);
+        // }
+
+        // This code added to correctly implement the disposable pattern.
+        public void Dispose()
+        {
+            // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
+            Dispose(true);
+            // TODO: uncomment the following line if the finalizer is overridden above.
+            // GC.SuppressFinalize(this);
+        }
+        #endregion
+
     }
 }
diff --git a/BankingBot/BrowserBot.cs b/BankingBot/BrowserBot.cs
index 081f25c..68e719b 100644
--- a/BankingBot/BrowserBot.cs
+++ b/BankingBot/BrowserBot.cs
@@ -1,14 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using BankingBot.Contracts;
 using OpenQA.Selenium;
 
 namespace BankingBot
 {
-    public class BrowserBot<T> : IBrowserBot
+    public class BrowserBot<T> : IBrowserBot, IDisposable
         where T : IWebDriver
     {
         public IWebDriver WebDriver { get; private set; }
@@ -17,5 +13,37 @@ namespace BankingBot
         {
             WebDriver = (IWebDriver)Activator.CreateInstance(typeof(T));
         }
+
+        #region IDisposable Support
+        private bool disposedValue = false; // To detect redundant calls
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposedValue)
+            {
+                if (disposing)
+                {
+                    WebDriver.Quit();
+                }
+
+                disposedValue = true;
+            }
+        }
+
+        // TODO: override a finalizer only if Dispose(bool disposing) above has code to free unmanaged resources.
+        // ~BrowserBot() {
+        //   // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
+        //   Dispose(false);
+        // }
+
+        // This code added to correctly implement the disposable pattern.
+        public void Dispose()
+        {
+            // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
+            Dispose(true);
+            // TODO: uncomment the following line if the finalizer is overridden above.
+            // GC.SuppressFinalize(this);
+        }
+        #endregion
     }
 }
diff --git a/BankingBot/Contracts/IBrowserBot.cs b/BankingBot/Contracts/IBrowserBot.cs
index 6274869..d1ffe59 100644
--- a/BankingBot/Contracts/IBrowserBot.cs
+++ b/BankingBot/Contracts/IBrowserBot.cs
@@ -1,8 +1,9 @@
 using OpenQA.Selenium;
+using System;
 
 namespace BankingBot.Contracts
 {
-    public interface IBrowserBot
+    public interface IBrowserBot : IDisposable
     {
         IWebDriver WebDriver { get; }
     }