Set up dependency injection

bclothier · bclothier · commit 62832ae8621c · 2018-03-03T04:51:17.000-06:00
Create new automagic factory for SettingsForm
Update unit tests
diff --git a/RetailCoder.VBE/UI/Command/SettingsCommand.cs b/RetailCoder.VBE/UI/Command/SettingsCommand.cs
@@ -12,19 +12,19 @@ namespace Rubberduck.UI.Command
     [ComVisible(false)]
     public class SettingsCommand : CommandBase
     {
-        private readonly IGeneralConfigService _service;
-        private readonly IOperatingSystem _operatingSystem;
-        public SettingsCommand(IGeneralConfigService service, IOperatingSystem operatingSystem) : base(LogManager.GetCurrentClassLogger())
+        private readonly ISettingsFormFactory _settingsFormFactory;
+
+        public SettingsCommand(ISettingsFormFactory settingsFormFactory) : base(LogManager.GetCurrentClassLogger())
         {
-            _service = service;
-            _operatingSystem = operatingSystem;
+            _settingsFormFactory = settingsFormFactory;
         }
 
         protected override void OnExecute(object parameter)
         {
-            using (var window = new SettingsForm(_service, _operatingSystem))
+            using (var window = _settingsFormFactory.Create())
             {
                 window.ShowDialog();
+                _settingsFormFactory.Release(window);
             }
         }
     }
diff --git a/RetailCoder.VBE/UI/Inspections/InspectionResultsViewModel.cs b/RetailCoder.VBE/UI/Inspections/InspectionResultsViewModel.cs
@@ -40,21 +40,21 @@ public sealed class InspectionResultsViewModel : ViewModelBase, INavigateSelecti
         private readonly IQuickFixProvider _quickFixProvider;
         private readonly IClipboardWriter _clipboard;
         private readonly IGeneralConfigService _configService;
-        private readonly IOperatingSystem _operatingSystem;
+        private readonly ISettingsFormFactory _settingsFormFactory;
 
         private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
         public InspectionResultsViewModel(RubberduckParserState state, IInspector inspector, IQuickFixProvider quickFixProvider,
             INavigateCommand navigateCommand, ReparseCommand reparseCommand,
-            IClipboardWriter clipboard, IGeneralConfigService configService, IOperatingSystem operatingSystem)
+            IClipboardWriter clipboard, IGeneralConfigService configService, ISettingsFormFactory settingsFormFactory)
         {
             _state = state;
             _inspector = inspector;
             _quickFixProvider = quickFixProvider;
             NavigateCommand = navigateCommand;
             _clipboard = clipboard;
             _configService = configService;
-            _operatingSystem = operatingSystem;
+            _settingsFormFactory = settingsFormFactory;
             RefreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(),
                 o =>
                 {
@@ -238,9 +238,10 @@ public bool GroupByLocation
 
         private void OpenSettings(object param)
         {
-            using (var window = new SettingsForm(_configService, _operatingSystem, SettingsViews.InspectionSettings))
+            using (var window = _settingsFormFactory.Create())
             {
                 window.ShowDialog();
+                _settingsFormFactory.Release(window);
             }
         }
 
diff --git a/RetailCoder.VBE/UI/Settings/SettingsForm.cs b/RetailCoder.VBE/UI/Settings/SettingsForm.cs
@@ -1,25 +1,32 @@
 ﻿using System.Windows.Forms;
 using Rubberduck.Settings;
 using Rubberduck.Common;
+using Rubberduck.VBERuntime;
 
 namespace Rubberduck.UI.Settings
 {
+    public interface ISettingsFormFactory
+    {
+        SettingsForm Create();
+        void Release(SettingsForm form);
+    }
+
     public partial class SettingsForm : Form
     {
         public SettingsForm()
         {
             InitializeComponent();
         }
 
-        public SettingsForm(IGeneralConfigService configService, IOperatingSystem operatingSystem, SettingsViews activeView = SettingsViews.GeneralSettings) : this()
+        public SettingsForm(IGeneralConfigService configService, IOperatingSystem operatingSystem, IMessageBox messageBox, IVBESettings vbeSettings, SettingsViews activeView = SettingsViews.GeneralSettings) : this()
         {
             var config = configService.LoadConfiguration();
 
             ViewModel = new SettingsControlViewModel(configService,
                 config,
                 new SettingsView
                 {
-                    Control = new GeneralSettings(new GeneralSettingsViewModel(config, operatingSystem)),
+                    Control = new GeneralSettings(new GeneralSettingsViewModel(config, operatingSystem, messageBox, vbeSettings)),
                     View = SettingsViews.GeneralSettings
                 },
                 new SettingsView
diff --git a/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerViewModel.cs b/RetailCoder.VBE/UI/ToDoItems/ToDoExplorerViewModel.cs
@@ -21,13 +21,13 @@ public sealed class ToDoExplorerViewModel : ViewModelBase, INavigateSelection, I
     {
         private readonly RubberduckParserState _state;
         private readonly IGeneralConfigService _configService;
-        private readonly IOperatingSystem _operatingSystem;
+        private readonly ISettingsFormFactory _settingsFormFactory;
 
-        public ToDoExplorerViewModel(RubberduckParserState state, IGeneralConfigService configService, IOperatingSystem operatingSystem)
+        public ToDoExplorerViewModel(RubberduckParserState state, IGeneralConfigService configService, ISettingsFormFactory settingsFormFactory)
         {
             _state = state;
             _configService = configService;
-            _operatingSystem = operatingSystem;
+            _settingsFormFactory = settingsFormFactory;
             _state.StateChanged += HandleStateChanged;
 
             SetMarkerGroupingCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param =>
@@ -222,9 +222,10 @@ public CommandBase OpenTodoSettings
                 }
                 return _openTodoSettings = new DelegateCommand(LogManager.GetCurrentClassLogger(), _ =>
                 {
-                    using (var window = new SettingsForm(_configService, _operatingSystem, SettingsViews.TodoSettings))
+                    using (var window = _settingsFormFactory.Create())
                     {
                         window.ShowDialog();
+                        _settingsFormFactory.Release(window);
                     }
                 });
             }
diff --git a/RetailCoder.VBE/UI/UnitTesting/TestExplorerViewModel.cs b/RetailCoder.VBE/UI/UnitTesting/TestExplorerViewModel.cs
@@ -21,25 +21,25 @@ public class TestExplorerViewModel : ViewModelBase, INavigateSelection, IDisposa
         private readonly RubberduckParserState _state;
         private readonly ITestEngine _testEngine;
         private readonly IClipboardWriter _clipboard;
-        private readonly IGeneralConfigService _configService;
-        private readonly IOperatingSystem _operatingSystem;
+        private readonly ISettingsFormFactory _settingsFormFactory;
+        //private readonly IGeneralConfigService _configService;
+        //private readonly IOperatingSystem _operatingSystem;
 
         public TestExplorerViewModel(IVBE vbe,
              RubberduckParserState state,
              ITestEngine testEngine,
              TestExplorerModel model,
              IClipboardWriter clipboard,
              IGeneralConfigService configService,
-             IOperatingSystem operatingSystem)
+             ISettingsFormFactory settingsFormFactory)
         {
             _vbe = vbe;
             _state = state;
             _testEngine = testEngine;
             _testEngine.TestCompleted += TestEngineTestCompleted;
             Model = model;
             _clipboard = clipboard;
-            _configService = configService;
-            _operatingSystem = operatingSystem;
+            _settingsFormFactory = settingsFormFactory;
 
             _navigateCommand = new NavigateCommand(_state.ProjectsProvider);
 
@@ -196,9 +196,10 @@ public bool GroupByLocation
 
         private void OpenSettings(object param)
         {
-            using (var window = new SettingsForm(_configService, _operatingSystem, SettingsViews.UnitTestSettings))
+            using (var window = _settingsFormFactory.Create())
             {
                 window.ShowDialog();
+                _settingsFormFactory.Release(window);
             }
         }
 
diff --git a/RubberduckTests/Settings/GeneralSettingsTests.cs b/RubberduckTests/Settings/GeneralSettingsTests.cs
@@ -7,6 +7,7 @@
 using Rubberduck.Common;
 using Moq;
 using Rubberduck.UI;
+using Rubberduck.VBERuntime;
 
 namespace RubberduckTests.Settings
 {
@@ -18,6 +19,16 @@ private Mock<IOperatingSystem> GetOperatingSystemMock()
             return new Mock<IOperatingSystem>();
         }
 
+        private Mock<IMessageBox> GetMessageBoxMock()
+        {
+            return new Mock<IMessageBox>();
+        }
+
+        private Mock<IVBESettings> GetVBESettingsMock()
+        {
+            return new Mock<IVBESettings>();
+        }
+
         private Configuration GetDefaultConfig()
         {
             var generalSettings = new GeneralSettings
@@ -70,7 +81,7 @@ private Configuration GetNondefaultConfig()
         public void SaveConfigWorks()
         {
             var customConfig = GetNondefaultConfig();
-            var viewModel = new GeneralSettingsViewModel(customConfig, GetOperatingSystemMock().Object);
+            var viewModel = new GeneralSettingsViewModel(customConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);
 
             var config = GetDefaultConfig();
             viewModel.UpdateConfig(config);
@@ -88,7 +99,7 @@ public void SaveConfigWorks()
         [Test]
         public void SetDefaultsWorks()
         {
-            var viewModel = new GeneralSettingsViewModel(GetNondefaultConfig(), GetOperatingSystemMock().Object);
+            var viewModel = new GeneralSettingsViewModel(GetNondefaultConfig(), GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);
 
             var defaultConfig = GetDefaultConfig();
             viewModel.SetToDefaults(defaultConfig);
@@ -107,7 +118,7 @@ public void SetDefaultsWorks()
         public void LanguageIsSetInCtor()
         {
             var defaultConfig = GetDefaultConfig();
-            var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object);
+            var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);
 
             Assert.AreEqual(defaultConfig.UserSettings.GeneralSettings.Language, viewModel.SelectedLanguage);
         }
@@ -117,7 +128,7 @@ public void LanguageIsSetInCtor()
         public void HotkeysAreSetInCtor()
         {
             var defaultConfig = GetDefaultConfig();
-            var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object);
+            var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);
 
             Assert.IsTrue(defaultConfig.UserSettings.HotkeySettings.Settings.SequenceEqual(viewModel.Hotkeys));
         }
@@ -127,7 +138,7 @@ public void HotkeysAreSetInCtor()
         public void AutoSaveEnabledIsSetInCtor()
         {
             var defaultConfig = GetDefaultConfig();
-            var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object);
+            var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);
 
             Assert.AreEqual(defaultConfig.UserSettings.GeneralSettings.IsAutoSaveEnabled, viewModel.AutoSaveEnabled);
         }
@@ -137,7 +148,7 @@ public void AutoSaveEnabledIsSetInCtor()
         public void AutoSavePeriodIsSetInCtor()
         {
             var defaultConfig = GetDefaultConfig();
-            var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object);
+            var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);
 
             Assert.AreEqual(defaultConfig.UserSettings.GeneralSettings.AutoSavePeriod, viewModel.AutoSavePeriod);
         }
diff --git a/RubberduckTests/TodoExplorer/TodoExplorerTests.cs b/RubberduckTests/TodoExplorer/TodoExplorerTests.cs
@@ -34,7 +34,7 @@ public void PicksUpComments()
             using (var state = parser.State)
             {
                 var cs = GetConfigService(new[] { "TODO", "NOTE", "BUG" });
-                var vm = new ToDoExplorerViewModel(state, cs, GetOperatingSystemMock().Object);
+                var vm = new ToDoExplorerViewModel(state, cs, null);
 
                 parser.Parse(new CancellationTokenSource());
                 if (state.Status >= ParserState.Error)
@@ -69,7 +69,7 @@ public void PicksUpComments_StrangeCasing()
             using (var state = parser.State)
             {
                 var cs = GetConfigService(new[] { "TODO", "NOTE", "BUG" });
-                var vm = new ToDoExplorerViewModel(state, cs, GetOperatingSystemMock().Object);
+                var vm = new ToDoExplorerViewModel(state, cs, null);
 
                 parser.Parse(new CancellationTokenSource());
                 if (state.Status >= ParserState.Error)
@@ -104,7 +104,7 @@ public void PicksUpComments_SpecialCharacters()
             using (var state = parser.State)
             {
                 var cs = GetConfigService(new[] { "TO-DO", "N@TE", "BUG " });
-                var vm = new ToDoExplorerViewModel(state, cs, GetOperatingSystemMock().Object);
+                var vm = new ToDoExplorerViewModel(state, cs, null);
 
                 parser.Parse(new CancellationTokenSource());
                 if (state.Status >= ParserState.Error)
@@ -138,7 +138,7 @@ public void AvoidsFalsePositiveComments()
             using (var state = parser.State)
             {
                 var cs = GetConfigService(new[] { "TODO", "NOTE", "BUG" });
-                var vm = new ToDoExplorerViewModel(state, cs, GetOperatingSystemMock().Object);
+                var vm = new ToDoExplorerViewModel(state, cs, null);
 
                 parser.Parse(new CancellationTokenSource());
                 if (state.Status >= ParserState.Error)
@@ -172,7 +172,7 @@ public void RemoveRemovesComment()
             using (var state = parser.State)
             {
                 var cs = GetConfigService(new[] { "TODO", "NOTE", "BUG" });
-                var vm = new ToDoExplorerViewModel(state, cs, GetOperatingSystemMock().Object);
+                var vm = new ToDoExplorerViewModel(state, cs, null);
 
                 parser.Parse(new CancellationTokenSource());
                 if (state.Status >= ParserState.Error)

Original file line number	Diff line number	Diff line change
`@@ -12,19 +12,19 @@ namespace Rubberduck.UI.Command`
`12`	`12`	`[ComVisible(false)]`
`13`	`13`	`public class SettingsCommand : CommandBase`
`14`	`14`	`{`
`15`		`- private readonly IGeneralConfigService _service;`
`16`		`- private readonly IOperatingSystem _operatingSystem;`
`17`		`- public SettingsCommand(IGeneralConfigService service, IOperatingSystem operatingSystem) : base(LogManager.GetCurrentClassLogger())`
	`15`	`+ private readonly ISettingsFormFactory _settingsFormFactory;`
	`16`	`+`
	`17`	`+ public SettingsCommand(ISettingsFormFactory settingsFormFactory) : base(LogManager.GetCurrentClassLogger())`
`18`	`18`	`{`
`19`		`- _service = service;`
`20`		`- _operatingSystem = operatingSystem;`
	`19`	`+ _settingsFormFactory = settingsFormFactory;`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`protected override void OnExecute(object parameter)`
`24`	`23`	`{`
`25`		`- using (var window = new SettingsForm(_service, _operatingSystem))`
	`24`	`+ using (var window = _settingsFormFactory.Create())`
`26`	`25`	`{`
`27`	`26`	`window.ShowDialog();`
	`27`	`+ _settingsFormFactory.Release(window);`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,21 +40,21 @@ public sealed class InspectionResultsViewModel : ViewModelBase, INavigateSelecti`
`40`	`40`	`private readonly IQuickFixProvider _quickFixProvider;`
`41`	`41`	`private readonly IClipboardWriter _clipboard;`
`42`	`42`	`private readonly IGeneralConfigService _configService;`
`43`		`- private readonly IOperatingSystem _operatingSystem;`
	`43`	`+ private readonly ISettingsFormFactory _settingsFormFactory;`
`44`	`44`
`45`	`45`	`private static readonly Logger Logger = LogManager.GetCurrentClassLogger();`
`46`	`46`
`47`	`47`	`public InspectionResultsViewModel(RubberduckParserState state, IInspector inspector, IQuickFixProvider quickFixProvider,`
`48`	`48`	`INavigateCommand navigateCommand, ReparseCommand reparseCommand,`
`49`		`- IClipboardWriter clipboard, IGeneralConfigService configService, IOperatingSystem operatingSystem)`
	`49`	`+ IClipboardWriter clipboard, IGeneralConfigService configService, ISettingsFormFactory settingsFormFactory)`
`50`	`50`	`{`
`51`	`51`	`_state = state;`
`52`	`52`	`_inspector = inspector;`
`53`	`53`	`_quickFixProvider = quickFixProvider;`
`54`	`54`	`NavigateCommand = navigateCommand;`
`55`	`55`	`_clipboard = clipboard;`
`56`	`56`	`_configService = configService;`
`57`		`- _operatingSystem = operatingSystem;`
	`57`	`+ _settingsFormFactory = settingsFormFactory;`
`58`	`58`	`RefreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(),`
`59`	`59`	`o =>`
`60`	`60`	`{`
`@@ -238,9 +238,10 @@ public bool GroupByLocation`
`238`	`238`
`239`	`239`	`private void OpenSettings(object param)`
`240`	`240`	`{`
`241`		`- using (var window = new SettingsForm(_configService, _operatingSystem, SettingsViews.InspectionSettings))`
	`241`	`+ using (var window = _settingsFormFactory.Create())`
`242`	`242`	`{`
`243`	`243`	`window.ShowDialog();`
	`244`	`+ _settingsFormFactory.Release(window);`
`244`	`245`	`}`
`245`	`246`	`}`
`246`	`247`
Original file line number	Diff line number	Diff line change
`@@ -1,25 +1,32 @@`
`1`	`1`	`using System.Windows.Forms;`
`2`	`2`	`using Rubberduck.Settings;`
`3`	`3`	`using Rubberduck.Common;`
	`4`	`+using Rubberduck.VBERuntime;`
`4`	`5`
`5`	`6`	`namespace Rubberduck.UI.Settings`
`6`	`7`	`{`
	`8`	`+ public interface ISettingsFormFactory`
	`9`	`+ {`
	`10`	`+ SettingsForm Create();`
	`11`	`+ void Release(SettingsForm form);`
	`12`	`+ }`
	`13`	`+`
`7`	`14`	`public partial class SettingsForm : Form`
`8`	`15`	`{`
`9`	`16`	`public SettingsForm()`
`10`	`17`	`{`
`11`	`18`	`InitializeComponent();`
`12`	`19`	`}`
`13`	`20`
`14`		`- public SettingsForm(IGeneralConfigService configService, IOperatingSystem operatingSystem, SettingsViews activeView = SettingsViews.GeneralSettings) : this()`
	`21`	`+ public SettingsForm(IGeneralConfigService configService, IOperatingSystem operatingSystem, IMessageBox messageBox, IVBESettings vbeSettings, SettingsViews activeView = SettingsViews.GeneralSettings) : this()`
`15`	`22`	`{`
`16`	`23`	`var config = configService.LoadConfiguration();`
`17`	`24`
`18`	`25`	`ViewModel = new SettingsControlViewModel(configService,`
`19`	`26`	`config,`
`20`	`27`	`new SettingsView`
`21`	`28`	`{`
`22`		`- Control = new GeneralSettings(new GeneralSettingsViewModel(config, operatingSystem)),`
	`29`	`+ Control = new GeneralSettings(new GeneralSettingsViewModel(config, operatingSystem, messageBox, vbeSettings)),`
`23`	`30`	`View = SettingsViews.GeneralSettings`
`24`	`31`	`},`
`25`	`32`	`new SettingsView`
Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,13 @@ public sealed class ToDoExplorerViewModel : ViewModelBase, INavigateSelection, I`
`21`	`21`	`{`
`22`	`22`	`private readonly RubberduckParserState _state;`
`23`	`23`	`private readonly IGeneralConfigService _configService;`
`24`		`- private readonly IOperatingSystem _operatingSystem;`
	`24`	`+ private readonly ISettingsFormFactory _settingsFormFactory;`
`25`	`25`
`26`		`- public ToDoExplorerViewModel(RubberduckParserState state, IGeneralConfigService configService, IOperatingSystem operatingSystem)`
	`26`	`+ public ToDoExplorerViewModel(RubberduckParserState state, IGeneralConfigService configService, ISettingsFormFactory settingsFormFactory)`
`27`	`27`	`{`
`28`	`28`	`_state = state;`
`29`	`29`	`_configService = configService;`
`30`		`- _operatingSystem = operatingSystem;`
	`30`	`+ _settingsFormFactory = settingsFormFactory;`
`31`	`31`	`_state.StateChanged += HandleStateChanged;`
`32`	`32`
`33`	`33`	`SetMarkerGroupingCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), param =>`
`@@ -222,9 +222,10 @@ public CommandBase OpenTodoSettings`
`222`	`222`	`}`
`223`	`223`	`return _openTodoSettings = new DelegateCommand(LogManager.GetCurrentClassLogger(), _ =>`
`224`	`224`	`{`
`225`		`- using (var window = new SettingsForm(_configService, _operatingSystem, SettingsViews.TodoSettings))`
	`225`	`+ using (var window = _settingsFormFactory.Create())`
`226`	`226`	`{`
`227`	`227`	`window.ShowDialog();`
	`228`	`+ _settingsFormFactory.Release(window);`
`228`	`229`	`}`
`229`	`230`	`});`
`230`	`231`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using Rubberduck.Common;`
`8`	`8`	`using Moq;`
`9`	`9`	`using Rubberduck.UI;`
	`10`	`+using Rubberduck.VBERuntime;`
`10`	`11`
`11`	`12`	`namespace RubberduckTests.Settings`
`12`	`13`	`{`
`@@ -18,6 +19,16 @@ private Mock<IOperatingSystem> GetOperatingSystemMock()`
`18`	`19`	`return new Mock<IOperatingSystem>();`
`19`	`20`	`}`
`20`	`21`
	`22`	`+ private Mock<IMessageBox> GetMessageBoxMock()`
	`23`	`+ {`
	`24`	`+ return new Mock<IMessageBox>();`
	`25`	`+ }`
	`26`	`+`
	`27`	`+ private Mock<IVBESettings> GetVBESettingsMock()`
	`28`	`+ {`
	`29`	`+ return new Mock<IVBESettings>();`
	`30`	`+ }`
	`31`	`+`
`21`	`32`	`private Configuration GetDefaultConfig()`
`22`	`33`	`{`
`23`	`34`	`var generalSettings = new GeneralSettings`
`@@ -70,7 +81,7 @@ private Configuration GetNondefaultConfig()`
`70`	`81`	`public void SaveConfigWorks()`
`71`	`82`	`{`
`72`	`83`	`var customConfig = GetNondefaultConfig();`
`73`		`- var viewModel = new GeneralSettingsViewModel(customConfig, GetOperatingSystemMock().Object);`
	`84`	`+ var viewModel = new GeneralSettingsViewModel(customConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);`
`74`	`85`
`75`	`86`	`var config = GetDefaultConfig();`
`76`	`87`	`viewModel.UpdateConfig(config);`
`@@ -88,7 +99,7 @@ public void SaveConfigWorks()`
`88`	`99`	`[Test]`
`89`	`100`	`public void SetDefaultsWorks()`
`90`	`101`	`{`
`91`		`- var viewModel = new GeneralSettingsViewModel(GetNondefaultConfig(), GetOperatingSystemMock().Object);`
	`102`	`+ var viewModel = new GeneralSettingsViewModel(GetNondefaultConfig(), GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);`
`92`	`103`
`93`	`104`	`var defaultConfig = GetDefaultConfig();`
`94`	`105`	`viewModel.SetToDefaults(defaultConfig);`
`@@ -107,7 +118,7 @@ public void SetDefaultsWorks()`
`107`	`118`	`public void LanguageIsSetInCtor()`
`108`	`119`	`{`
`109`	`120`	`var defaultConfig = GetDefaultConfig();`
`110`		`- var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object);`
	`121`	`+ var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);`
`111`	`122`
`112`	`123`	`Assert.AreEqual(defaultConfig.UserSettings.GeneralSettings.Language, viewModel.SelectedLanguage);`
`113`	`124`	`}`
`@@ -117,7 +128,7 @@ public void LanguageIsSetInCtor()`
`117`	`128`	`public void HotkeysAreSetInCtor()`
`118`	`129`	`{`
`119`	`130`	`var defaultConfig = GetDefaultConfig();`
`120`		`- var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object);`
	`131`	`+ var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);`
`121`	`132`
`122`	`133`	`Assert.IsTrue(defaultConfig.UserSettings.HotkeySettings.Settings.SequenceEqual(viewModel.Hotkeys));`
`123`	`134`	`}`
`@@ -127,7 +138,7 @@ public void HotkeysAreSetInCtor()`
`127`	`138`	`public void AutoSaveEnabledIsSetInCtor()`
`128`	`139`	`{`
`129`	`140`	`var defaultConfig = GetDefaultConfig();`
`130`		`- var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object);`
	`141`	`+ var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);`
`131`	`142`
`132`	`143`	`Assert.AreEqual(defaultConfig.UserSettings.GeneralSettings.IsAutoSaveEnabled, viewModel.AutoSaveEnabled);`
`133`	`144`	`}`
`@@ -137,7 +148,7 @@ public void AutoSaveEnabledIsSetInCtor()`
`137`	`148`	`public void AutoSavePeriodIsSetInCtor()`
`138`	`149`	`{`
`139`	`150`	`var defaultConfig = GetDefaultConfig();`
`140`		`- var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object);`
	`151`	`+ var viewModel = new GeneralSettingsViewModel(defaultConfig, GetOperatingSystemMock().Object, GetMessageBoxMock().Object, GetVBESettingsMock().Object);`
`141`	`152`
`142`	`153`	`Assert.AreEqual(defaultConfig.UserSettings.GeneralSettings.AutoSavePeriod, viewModel.AutoSavePeriod);`
`143`	`154`	`}`