Inject dependencies

Author: IvenBach

Rubberduck.Core/UI/UnitTesting/TestExplorerControl.xaml

@@ -438,15 +438,13 @@
                                 </MenuItem.Icon>
                             </MenuItem>
                             <MenuItem Command="{Binding IgnoreTestCommand}"
-                                      CommandParameter="{Binding RewritingManager}"
                                       Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_TestToggle_Ignore}"
                                       Visibility="{Binding DisplayIgnoreTestLabel, Converter={StaticResource BoolToVisibility}}">
                                 <MenuItem.Icon>
                                     <Image Source="{StaticResource IgnoreTestImage}" />
                                 </MenuItem.Icon>
                             </MenuItem>
                             <MenuItem Command="{Binding UnignoreTestCommand}"
-                                      CommandParameter="{Binding RewritingManager}"
                                       Header="{Resx ResxName=Rubberduck.Resources.UnitTesting.TestExplorer, Key=TestExplorer_TestToggle_Unignore}"
                                       Visibility="{Binding DisplayUnignoreTestLabel, Converter={StaticResource BoolToVisibility}}">
                                 <MenuItem.Icon>

Rubberduck.Core/UI/UnitTesting/TestExplorerViewModel.cs

@@ -55,7 +55,8 @@ public TestExplorerViewModel(ISelectionService selectionService,
             // ReSharper disable once UnusedParameter.Local - left in place because it will likely be needed for app wide font settings, etc.
             IConfigurationService<Configuration> configService,
             ISettingsFormFactory settingsFormFactory,
-            IRewritingManager rewritingManager)
+            IRewritingManager rewritingManager,
+            IAnnotationUpdater annotationUpdater)
         {
             _clipboard = clipboard;
             _settingsFormFactory = settingsFormFactory;
@@ -74,6 +75,7 @@ public TestExplorerViewModel(ISelectionService selectionService,
             UnignoreTestCommand = new DelegateCommand(LogManager.GetCurrentClassLogger(), ExecuteUnignoreTestCommand);
 
             RewritingManager = rewritingManager;
+            AnnotationUpdater = annotationUpdater;
 
             Model = model;
             Model.TestCompleted += HandleTestCompletion;
@@ -233,6 +235,7 @@ private void HandleTestCompletion(object sender, TestCompletedEventArgs e)
         }
 
         public IRewritingManager RewritingManager { get; }
+        public IAnnotationUpdater AnnotationUpdater { get; }
 
         private TestMethod _mousedOverTestMethod => ((TestMethodViewModel)SelectedItem).Method;
         public bool DisplayUnignoreTestLabel => SelectedItem != null && _mousedOverTestMethod.IsIgnored;
@@ -371,8 +374,7 @@ private void ExecuteIgnoreTestCommand(object parameter)
         {
             var rewriteSession = RewritingManager.CheckOutCodePaneSession();
 
-            var annotationUpdater = new AnnotationUpdater();
-            annotationUpdater.AddAnnotation(rewriteSession, _mousedOverTestMethod.Declaration, Parsing.Annotations.AnnotationType.IgnoreTest);
+            AnnotationUpdater.AddAnnotation(rewriteSession, _mousedOverTestMethod.Declaration, Parsing.Annotations.AnnotationType.IgnoreTest);
 
             rewriteSession.TryRewrite();
         }
@@ -383,13 +385,10 @@ private void ExecuteUnignoreTestCommand(object parameter)
             var ignoreTestAnnotations = _mousedOverTestMethod.Declaration.Annotations
                 .Where(iannotations => iannotations.AnnotationType == Parsing.Annotations.AnnotationType.IgnoreTest);
 
-            var annotationUpdater = new AnnotationUpdater();
-
             foreach (var ignoreTestAnnotation in ignoreTestAnnotations)
             {
-                annotationUpdater.RemoveAnnotation(rewriteSession, ignoreTestAnnotation);
+                AnnotationUpdater.RemoveAnnotation(rewriteSession, ignoreTestAnnotation);
             }
-            
 
             rewriteSession.TryRewrite();
         }

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(null, Model, ClipboardWriter.Object, null, null, null);
+            ViewModel = new TestExplorerViewModel(null, Model, ClipboardWriter.Object, null, null, null, null);
         }
 
         public RubberduckParserState State { get; set; }