fix merge faceplants.

Author: comintern

Rubberduck.Core/UI/Settings/SettingsForm.cs

@@ -53,7 +53,7 @@ public SettingsForm(IGeneralConfigService configService,
                 },
                 new SettingsView
                 {
-                    Control = new UnitTestSettings(viewModelFactory.Create<Rubberduck.Settings.UnitTestSettings>(config)),
+                    Control = new UnitTestSettings(viewModelFactory.Create<Rubberduck.UnitTesting.Settings.UnitTestSettings>(config)),
                     View = SettingsViews.UnitTestSettings
                 },
                 new SettingsView

Rubberduck.Core/UI/Settings/UnitTestSettingsViewModel.cs

@@ -7,9 +7,9 @@
 
 namespace Rubberduck.UI.Settings
 {
-    public sealed class UnitTestSettingsViewModel : SettingsViewModelBase<Rubberduck.Settings.UnitTestSettings>, ISettingsViewModel<Rubberduck.Settings.UnitTestSettings>
+    public sealed class UnitTestSettingsViewModel : SettingsViewModelBase<Rubberduck.UnitTesting.Settings.UnitTestSettings>, ISettingsViewModel<Rubberduck.UnitTesting.Settings.UnitTestSettings>
     {
-        public UnitTestSettingsViewModel(Configuration config, IFilePersistanceService<Rubberduck.Settings.UnitTestSettings> service) 
+        public UnitTestSettingsViewModel(Configuration config, IFilePersistanceService<Rubberduck.UnitTesting.Settings.UnitTestSettings> service) 
             : base(service)
         {
             BindingMode = config.UserSettings.UnitTestSettings.BindingMode;
@@ -18,7 +18,7 @@ public UnitTestSettingsViewModel(Configuration config, IFilePersistanceService<R
             MethodInit = config.UserSettings.UnitTestSettings.MethodInit;
             DefaultTestStubInNewModule = config.UserSettings.UnitTestSettings.DefaultTestStubInNewModule;
             ExportButtonCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(),
-                _ => ExportSettings(new Rubberduck.Settings.UnitTestSettings(BindingMode, AssertMode, ModuleInit,
+                _ => ExportSettings(new Rubberduck.UnitTesting.Settings.UnitTestSettings(BindingMode, AssertMode, ModuleInit,
                     MethodInit, DefaultTestStubInNewModule)));
             ImportButtonCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), _ => ImportSettings());
         }
@@ -114,44 +114,13 @@ public void SetToDefaults(Configuration config)
 
         protected override string DialogLoadTitle => SettingsUI.DialogCaption_LoadUnitTestSettings;
         protected override string DialogSaveTitle => SettingsUI.DialogCaption_SaveUnitTestSettings;
-        protected override void TransferSettingsToView(Rubberduck.Settings.UnitTestSettings toLoad)
+        protected override void TransferSettingsToView(Rubberduck.UnitTesting.Settings.UnitTestSettings toLoad)
         {
             BindingMode = toLoad.BindingMode;
             AssertMode = toLoad.AssertMode;
             ModuleInit = toLoad.ModuleInit;
             MethodInit = toLoad.MethodInit;
             DefaultTestStubInNewModule = toLoad.DefaultTestStubInNewModule;
         }
-
-        private void ImportSettings()
-        {
-            using (var dialog = new OpenFileDialog
-            {
-                Filter = SettingsUI.DialogMask_XmlFilesOnly,
-                Title = SettingsUI.DialogCaption_LoadUnitTestSettings
-            })
-            {
-                dialog.ShowDialog();
-                if (string.IsNullOrEmpty(dialog.FileName)) return;
-                var service = new XmlPersistanceService<Rubberduck.UnitTesting.Settings.UnitTestSettings> { FilePath = dialog.FileName };
-                var loaded = service.Load(new Rubberduck.UnitTesting.Settings.UnitTestSettings());
-                TransferSettingsToView(loaded);
-            }
-        }
-
-        private void ExportSettings()
-        {
-            using (var dialog = new SaveFileDialog
-            {
-                Filter = SettingsUI.DialogMask_XmlFilesOnly,
-                Title = SettingsUI.DialogCaption_SaveUnitTestSettings
-            })
-            {
-                dialog.ShowDialog();
-                if (string.IsNullOrEmpty(dialog.FileName)) return;
-                var service = new XmlPersistanceService<Rubberduck.UnitTesting.Settings.UnitTestSettings> { FilePath = dialog.FileName };
-                service.Save(new Rubberduck.UnitTesting.Settings.UnitTestSettings(BindingMode, AssertMode, ModuleInit, MethodInit, DefaultTestStubInNewModule));
-            }
-        }
     }
 }

Rubberduck.Core/UI/UnitTesting/TestExplorerViewModel.cs

@@ -15,6 +15,7 @@
 using Rubberduck.UI.UnitTesting.ViewModels;
 using Rubberduck.UnitTesting;
 using Rubberduck.VBEditor.ComManagement;
+using Rubberduck.VBEditor.Utility;
 using DataFormats = System.Windows.DataFormats;
 
 namespace Rubberduck.UI.UnitTesting
@@ -32,7 +33,7 @@ internal sealed class TestExplorerViewModel : ViewModelBase, INavigateSelection,
         private readonly IClipboardWriter _clipboard;
         private readonly ISettingsFormFactory _settingsFormFactory;
 
-        public TestExplorerViewModel(IProjectsProvider projectsProvider,
+        public TestExplorerViewModel(ISelectionService selectionService,
             TestExplorerModel model,
             IClipboardWriter clipboard,
             // ReSharper disable once UnusedParameter.Local - left in place because it will likely be needed for app wide font settings, etc.
@@ -42,7 +43,7 @@ public TestExplorerViewModel(IProjectsProvider projectsProvider,
             _clipboard = clipboard;
             _settingsFormFactory = settingsFormFactory;
 
-            NavigateCommand = new NavigateCommand(projectsProvider);  
+            NavigateCommand = new NavigateCommand(selectionService);  
             RunSingleTestCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteSingleTestCommand, CanExecuteSingleTest);
             RunSelectedTestsCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteSelectedTestsCommand, CanExecuteSelectedTestsCommand);
             RunSelectedGroupCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteRunSelectedGroupCommand, CanExecuteSelectedGroupCommand);

RubberduckTests/UnitTesting/MockedTestExplorer.cs

@@ -14,7 +14,7 @@ public MockedTestExplorer(MockedTestExplorerModel model)
             Vbe = model.Engine.Vbe.Object;
             State = model.Engine.ParserState;
             Model = model.Model;
-            ViewModel = new TestExplorerViewModel(State.ProjectsProvider, Model, ClipboardWriter.Object, null, null);
+            ViewModel = new TestExplorerViewModel(null, Model, ClipboardWriter.Object, null, null);
         }
 
         public RubberduckParserState State { get; set; }