Merge pull request #5123 from bclothier/FixTodoExplorer

Clean up the ToDoExplorerViewModel class and add arrange to the tests.

Author: retailcoder

Rubberduck.Core/UI/ToDoItems/ToDoExplorerViewModel.cs

@@ -42,15 +42,16 @@ public ToDoExplorerViewModel(
             RubberduckParserState state,
             IConfigurationService<Configuration> configService, 
             ISettingsFormFactory settingsFormFactory, 
-            ISelectionService selectionService, 
-            IUiDispatcher uiDispatcher)
+            IUiDispatcher uiDispatcher,
+            INavigateCommand navigateCommand)
         {
             _state = state;
             _configService = configService;
             _settingsFormFactory = settingsFormFactory;
             _uiDispatcher = uiDispatcher;
             _state.StateChanged += HandleStateChanged;
 
+            NavigateCommand = navigateCommand;
             RefreshCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(),
                 _ =>
                 {
@@ -191,9 +192,9 @@ private void HandleStateChanged(object sender, EventArgs e)
             });
         }
 
-        public INavigateCommand NavigateCommand { get; set; }
+        public INavigateCommand NavigateCommand { get; }
 
-        public CommandBase RefreshCommand { get; set; }
+        public CommandBase RefreshCommand { get; }
 
         public CommandBase RemoveCommand { get; }
 

RubberduckTests/TodoExplorer/TodoExplorerTests.cs

@@ -29,8 +29,6 @@ public void PicksUpComments()
 ' Bug this is a bug comment
 ";
 
-            var selectionService = new Mock<ISelectionService>().Object;
-
             var builder = new MockVbeBuilder();
             var project = builder.ProjectBuilder("TestProject1", ProjectProtection.Unprotected)
                 .AddComponent("Module1", ComponentType.StandardModule, inputCode)
@@ -41,7 +39,7 @@ public void PicksUpComments()
             using (var state = parser.State)
             {
                 var cs = GetConfigService(new[] { "TODO", "NOTE", "BUG" });
-                var vm = new ToDoExplorerViewModel(state, cs, null, selectionService, GetMockedUiDispatcher());
+                var vm = ArrangeViewModel(state, cs);
 
                 parser.Parse(new CancellationTokenSource());
                 if (state.Status >= ParserState.Error)
@@ -66,8 +64,6 @@ public void PicksUpComments_StrangeCasing()
 ' bUg this is a bug comment
 ";
 
-            var selectionService = new Mock<ISelectionService>().Object;
-
             var builder = new MockVbeBuilder();
             var project = builder.ProjectBuilder("TestProject1", ProjectProtection.Unprotected)
                 .AddComponent("Module1", ComponentType.StandardModule, inputCode)
@@ -78,7 +74,7 @@ public void PicksUpComments_StrangeCasing()
             using (var state = parser.State)
             {
                 var cs = GetConfigService(new[] { "TODO", "NOTE", "BUG" });
-                var vm = new ToDoExplorerViewModel(state, cs, null, selectionService, GetMockedUiDispatcher());
+                var vm = ArrangeViewModel(state, cs);
 
                 parser.Parse(new CancellationTokenSource());
                 if (state.Status >= ParserState.Error)
@@ -103,8 +99,6 @@ public void PicksUpComments_SpecialCharacters()
 ' bug: this should not be seen due to the colon
 ";
 
-            var selectionService = new Mock<ISelectionService>().Object;
-
             var builder = new MockVbeBuilder();
             var project = builder.ProjectBuilder("TestProject1", ProjectProtection.Unprotected)
                 .AddComponent("Module1", ComponentType.StandardModule, inputCode)
@@ -115,7 +109,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, null, selectionService, GetMockedUiDispatcher());
+                var vm = ArrangeViewModel(state, cs);
 
                 parser.Parse(new CancellationTokenSource());
                 if (state.Status >= ParserState.Error)
@@ -139,8 +133,6 @@ public void AvoidsFalsePositiveComments()
 ' Denoted 
 ";
 
-            var selectionService = new Mock<ISelectionService>().Object;
-
             var builder = new MockVbeBuilder();
             var project = builder.ProjectBuilder("TestProject1", ProjectProtection.Unprotected)
                 .AddComponent("Module1", ComponentType.StandardModule, inputCode)
@@ -151,7 +143,7 @@ public void AvoidsFalsePositiveComments()
             using (var state = parser.State)
             {
                 var cs = GetConfigService(new[] { "TODO", "NOTE", "BUG" });
-                var vm = new ToDoExplorerViewModel(state, cs, null, selectionService, GetMockedUiDispatcher());
+                var vm = ArrangeViewModel(state, cs);
 
                 parser.Parse(new CancellationTokenSource());
                 if (state.Status >= ParserState.Error)
@@ -175,8 +167,6 @@ public void RemoveRemovesComment()
             const string expected =
                 @"Dim d As Variant  ";
 
-            var selectionService = new Mock<ISelectionService>().Object;
-
             var builder = new MockVbeBuilder();
             var project = builder.ProjectBuilder("TestProject1", ProjectProtection.Unprotected)
                 .AddComponent("Module1", ComponentType.StandardModule, inputCode)
@@ -189,11 +179,8 @@ public void RemoveRemovesComment()
             using (var state = parser.State)
             {
                 var cs = GetConfigService(new[] { "TODO", "NOTE", "BUG" });
-                var vm = new ToDoExplorerViewModel(state, cs, null, selectionService, GetMockedUiDispatcher())
-                {
-                    RefreshCommand = new ReparseCommand(vbe.Object, new Mock<IConfigurationService<GeneralSettings>>().Object, state, null, null, null, vbeEvents.Object)
-                };
-
+                var vm = ArrangeViewModel(state, cs);
+                
                 parser.Parse(new CancellationTokenSource());
                 if (state.Status >= ParserState.Error)
                 {
@@ -233,5 +220,10 @@ private IUiDispatcher GetMockedUiDispatcher()
             dispatcher.Setup(m => m.Invoke(It.IsAny<Action>())).Callback((Action argument) => argument.Invoke());
             return dispatcher.Object;
         }
+
+        private ToDoExplorerViewModel ArrangeViewModel(RubberduckParserState state, IConfigurationService<Configuration> configService)
+        {
+            return new ToDoExplorerViewModel(state, configService, null, GetMockedUiDispatcher(), null);
+        }
     }
 }