Clean up MockedCodeExplorer ctors.

Author: comintern

RubberduckTests/CodeExplorer/CodeExplorerTests.cs

@@ -18,9 +18,7 @@
 using RubberduckTests.Mocks;
 using Rubberduck.Parsing.UIContext;
 using Rubberduck.SettingsProvider;
-using Rubberduck.VBEditor.ComManagement;
 using Rubberduck.Interaction;
-using Rubberduck.Parsing.VBA.DeclarationCaching;
 using Rubberduck.UI.UnitTesting.Commands;
 using Rubberduck.UnitTesting;
 
@@ -1294,9 +1292,6 @@ private MockedCodeExplorer()
 
             public MockedCodeExplorer(string code) : this(ProjectType.HostProject, ComponentType.StandardModule, code) { }
 
-            //public MockedCodeExplorer(ProjectType projectType, ComponentType componentType = ComponentType.StandardModule, string code = "")
-            //    : this(projectType, new[] { componentType }, new[] { code }) { }
-
             public MockedCodeExplorer(ProjectType projectType, ComponentType componentType = ComponentType.StandardModule, string code = "") : this()
             {
                 var builder = new MockVbeBuilder();
@@ -1308,22 +1303,7 @@ public MockedCodeExplorer(ProjectType projectType, ComponentType componentType =
                 VbProject = project.Build();
                 Vbe = builder.AddProject(VbProject).Build();
 
-                var projectRepository = new ProjectsRepository(Vbe.Object);
-
-                State = new RubberduckParserState(Vbe.Object, projectRepository, new DeclarationFinderFactory(), MockVbeEvents.CreateMockVbeEvents(Vbe).Object);
-
-                var removeCommand = new RemoveCommand(SaveDialog.Object, MessageBox.Object, State.ProjectsProvider);
-
-                ViewModel = new CodeExplorerViewModel(new FolderHelper(State, Vbe.Object), State, removeCommand,
-                    _generalSettingsProvider.Object, _windowSettingsProvider.Object, _uiDispatcher.Object, Vbe.Object, null);
-
-                var parser = MockParser.Create(Vbe.Object, State, projectRepository);
-                parser.Parse(new CancellationTokenSource());
-
-                if (parser.State.Status >= ParserState.Error)
-                {
-                    Assert.Inconclusive("Parser Error");
-                }
+                SetupViewModelAndParse();
             }
 
             public MockedCodeExplorer(ProjectType projectType,
@@ -1338,10 +1318,6 @@ public MockedCodeExplorer(ProjectType projectType,
                 var builder = new MockVbeBuilder();
                 var project = builder.ProjectBuilder("TestProject1", ProjectProtection.Unprotected, projectType);
 
-                VbComponents = project.MockVBComponents;               
-                VbProject = project.Build();
-                Vbe = builder.AddProject(VbProject).Build();
-
                 for (var index = 0; index < componentTypes.Count; index++)
                 {
                     var item = componentTypes[index];
@@ -1355,32 +1331,37 @@ public MockedCodeExplorer(ProjectType projectType,
                     }
                 }
 
+                VbComponents = project.MockVBComponents;
                 VbComponent = project.MockComponents.First();
+                VbProject = project.Build();
+                Vbe = builder.AddProject(VbProject).Build();
 
-                var projectRepository = new ProjectsRepository(Vbe.Object);
+                SetupViewModelAndParse();
 
-                State = new RubberduckParserState(Vbe.Object, projectRepository, new DeclarationFinderFactory(), MockVbeEvents.CreateMockVbeEvents(Vbe).Object);
+                VbProject.SetupGet(m => m.VBComponents.Count).Returns(componentTypes.Count);
+            }
+
+            private void SetupViewModelAndParse()
+            {
+                var parser = MockParser.Create(Vbe.Object, null, MockVbeEvents.CreateMockVbeEvents(Vbe));
+                State = parser.State;
 
                 var removeCommand = new RemoveCommand(SaveDialog.Object, MessageBox.Object, State.ProjectsProvider);
 
                 ViewModel = new CodeExplorerViewModel(new FolderHelper(State, Vbe.Object), State, removeCommand,
                     _generalSettingsProvider.Object,
                     _windowSettingsProvider.Object, _uiDispatcher.Object, Vbe.Object, null);
 
-
-                var parser = MockParser.Create(Vbe.Object, State, projectRepository);
                 parser.Parse(new CancellationTokenSource());
                 if (parser.State.Status >= ParserState.Error)
                 {
                     Assert.Inconclusive("Parser Error");
                 }
-
-                VbProject.SetupGet(m => m.VBComponents.Count).Returns(componentTypes.Count);
             }
 
-            public RubberduckParserState State { get; }
+            public RubberduckParserState State { get; set; }
             public Mock<IVBE> Vbe { get; }
-            public CodeExplorerViewModel ViewModel { get; }
+            public CodeExplorerViewModel ViewModel { get; set; }
             public Mock<IVBProject> VbProject { get; }
             public Mock<IVBComponents> VbComponents { get; }
             public Mock<IVBComponent> VbComponent { get; }

RubberduckTests/Mocks/MockParser.cs

@@ -21,6 +21,7 @@
 using Rubberduck.Parsing.VBA.Parsing.ParsingExceptions;
 using Rubberduck.Parsing.VBA.ReferenceManagement;
 using Rubberduck.VBEditor.ComManagement;
+using Rubberduck.VBEditor.Events;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.VBEditor.SourceCodeHandling;
 
@@ -43,18 +44,18 @@ public static RubberduckParserState ParseString(string inputCode, out QualifiedM
             return parser.State;
         }
 
-        public static (SynchronousParseCoordinator parser, IRewritingManager rewritingManager) CreateWithRewriteManager(IVBE vbe, string serializedComProjectsPath = null)
+        public static (SynchronousParseCoordinator parser, IRewritingManager rewritingManager) CreateWithRewriteManager(IVBE vbe, string serializedComProjectsPath = null, Mock<IVBEEvents> vbeEvents = null)
         {
-            var vbeEvents = MockVbeEvents.CreateMockVbeEvents(new Mock<IVBE>());
+            //var vbeEvents = MockVbeEvents.CreateMockVbeEvents(new Mock<IVBE>());
             var declarationFinderFactory = new DeclarationFinderFactory();
             var projectRepository = new ProjectsRepository(vbe);
-            var state = new RubberduckParserState(vbe, projectRepository, declarationFinderFactory, vbeEvents.Object);
+            var state = new RubberduckParserState(vbe, projectRepository, declarationFinderFactory, vbeEvents?.Object ?? MockVbeEvents.CreateMockVbeEvents(new Mock<IVBE>()).Object);
             return CreateWithRewriteManager(vbe, state, projectRepository, serializedComProjectsPath);
         }
 
-        public static SynchronousParseCoordinator Create(IVBE vbe, string serializedDeclarationsPath = null)
+        public static SynchronousParseCoordinator Create(IVBE vbe, string serializedDeclarationsPath = null, Mock<IVBEEvents> vbeEvents = null)
         {
-            return CreateWithRewriteManager(vbe, serializedDeclarationsPath).parser;
+            return CreateWithRewriteManager(vbe, serializedDeclarationsPath, vbeEvents).parser;
         }
 
         public static (SynchronousParseCoordinator parser, IRewritingManager rewritingManager) CreateWithRewriteManager(IVBE vbe, RubberduckParserState state, IProjectsRepository projectRepository, string serializedComProjectsPath = null)