Merge pull request #4763 from MDoerner/FixMockSetup

Fix mock setup and rename test setup

Author: retailcoder

RubberduckTests/Mocks/MockProjectBuilder.cs

@@ -321,12 +321,6 @@ private Mock<ICodeModule> CreateCodeModuleMock(string name, string content, Sele
             result.Setup(m => m.AddFromFile(It.IsAny<string>()));
 
             codePane.SetupGet(m => m.CodeModule).Returns(() => result.Object);
-            codePane.SetupSet(p => p.Selection)
-                .Callback(setValue =>
-                {
-                    codePane.Setup(p => p.GetQualifiedSelection()).Returns(new QualifiedSelection(new QualifiedModuleName(component.Object), setValue));
-                    codePane.SetupGet(p => p.Selection).Returns(setValue);
-                });
             return result;
         }
 

RubberduckTests/Mocks/MockVbeBuilder.cs

@@ -82,9 +82,6 @@ public MockVbeBuilder AddProject(Mock<IVBProject> project)
             foreach (var component in _projects.SelectMany(vbProject => vbProject.VBComponents))
             {
                 _codePanes.Add(component.CodeModule.CodePane);
-                {
-                    _vbe.Setup(v => v.ActiveCodePane).Returns(component.CodeModule.CodePane);
-                }
             }
 
             _vbe.SetupGet(vbe => vbe.ActiveVBProject).Returns(project.Object);

RubberduckTests/Refactoring/Rename/RenameTestExecution.cs

@@ -77,7 +77,7 @@ private static void InitializeTestDataObject(RenameTestsDataObject tdo
             tdo.MsgBox.Setup(m => m.ConfirmYesNo(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<bool>())).Returns(tdo.MsgBoxReturn == ConfirmationOutcome.Yes);
 
             var activeIndex = renameTMDs.FindIndex(tmd => tmd.Input_WithFauxCursor != string.Empty);
-            tdo.VBE = tdo.VBE ?? BuildProject(tdo.ProjectName, tdo.ModuleTestSetupDefs, activeIndex);
+            tdo.VBE = tdo.VBE ?? BuildProject(tdo.ProjectName, tdo.ModuleTestSetupDefs, activeIndex, tdo.UseLibraries);
             tdo.AdditionalSetup?.Invoke(tdo);
             (tdo.ParserState, tdo.RewritingManager) = MockParser.CreateAndParseWithRewritingManager(tdo.VBE);
 

RubberduckTests/Refactoring/Rename/RenameTests.cs

@@ -2,20 +2,13 @@
 using NUnit.Framework;
 using Moq;
 using Rubberduck.Parsing.Symbols;
-using Rubberduck.Refactorings;
 using Rubberduck.Refactorings.Rename;
 using Rubberduck.VBEditor;
 using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using RubberduckTests.Mocks;
-using System.Collections.Generic;
-using Rubberduck.Parsing.VBA;
 using Rubberduck.UI.Refactorings.Rename;
 using Rubberduck.Interaction;
-using Rubberduck.Common;
-using Rubberduck.UI.Refactorings;
-using RubberduckTests.Refactoring.MockIoC;
-using Rubberduck.Parsing.Rewriter;
 
 using static RubberduckTests.Refactoring.Rename.RenameTestExecution;