fixed RenameProject test

rubberduck-vba · Feb 14, 2016 · 34afc01 · 34afc01
1 parent b7ef95e
commit 34afc01
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 26 deletions.
diff --git a/RubberduckTests/Mocks/MockProjectBuilder.cs b/RubberduckTests/Mocks/MockProjectBuilder.cs
@@ -27,8 +27,6 @@ public MockProjectBuilder(string name, vbext_ProjectProtection protection, Func<
             _getVbe = getVbe;
             _mockVbeBuilder = mockVbeBuilder;
 
-
-
             _project = CreateProjectMock(name, protection);
 
             _vbComponents = CreateComponentsMock();

diff --git a/RubberduckTests/Mocks/MockVbeBuilder.cs b/RubberduckTests/Mocks/MockVbeBuilder.cs
@@ -89,7 +89,7 @@ private Mock<VBE> CreateVbeMock()
         {
             var vbe = new Mock<VBE>();
             var windows = new MockWindowsCollection {VBE = vbe.Object};
-            vbe.Setup(m => m.Windows).Returns(windows);
+            vbe.Setup(m => m.Windows).Returns(() => windows);
             vbe.SetupProperty(m => m.ActiveCodePane);
             vbe.SetupProperty(m => m.ActiveVBProject);
 
@@ -99,7 +99,7 @@ private Mock<VBE> CreateVbeMock()
             var mainWindow = new Mock<Window>();
             mainWindow.Setup(m => m.HWnd).Returns(0);
 
-            vbe.SetupGet(m => m.MainWindow).Returns(mainWindow.Object);
+            vbe.SetupGet(m => m.MainWindow).Returns(() => mainWindow.Object);
 
             _vbProjects = CreateProjectsMock();
             vbe.SetupGet(m => m.VBProjects).Returns(() => _vbProjects.Object);
@@ -114,11 +114,11 @@ private Mock<VBProjects> CreateProjectsMock()
         {
             var result = new Mock<VBProjects>();
 
-            result.Setup(m => m.GetEnumerator()).Returns(_projects.GetEnumerator());
-            result.As<IEnumerable>().Setup(m => m.GetEnumerator()).Returns(_projects.GetEnumerator());
+            result.Setup(m => m.GetEnumerator()).Returns(() => _projects.GetEnumerator());
+            result.As<IEnumerable>().Setup(m => m.GetEnumerator()).Returns(() => _projects.GetEnumerator());
 
             result.Setup(m => m.Item(It.IsAny<int>())).Returns<int>(value => _projects.ElementAt(value));
-            result.SetupGet(m => m.Count).Returns(_projects.Count);
+            result.SetupGet(m => m.Count).Returns(() => _projects.Count);
 
 
             return result;
@@ -128,11 +128,11 @@ private Mock<CodePanes> CreateCodePanesMock()
         {
             var result = new Mock<CodePanes>();
 
-            result.Setup(m => m.GetEnumerator()).Returns(_codePanes.GetEnumerator());
-            result.As<IEnumerable>().Setup(m => m.GetEnumerator()).Returns(_codePanes.GetEnumerator());
+            result.Setup(m => m.GetEnumerator()).Returns(() => _codePanes.GetEnumerator());
+            result.As<IEnumerable>().Setup(m => m.GetEnumerator()).Returns(() => _codePanes.GetEnumerator());
 
             result.Setup(m => m.Item(It.IsAny<int>())).Returns<int>(value => _codePanes.ElementAt(value));
-            result.SetupGet(m => m.Count).Returns(_codePanes.Count);
+            result.SetupGet(m => m.Count).Returns(() => _codePanes.Count);
 
             return result;
         }

diff --git a/RubberduckTests/Refactoring/RenameTests.cs b/RubberduckTests/Refactoring/RenameTests.cs
@@ -1100,31 +1100,25 @@ public void Factory_SelectionIsNotNull_PassInTarget_Reject()
         [TestMethod]
         public void RenameRefactoring_RenameProject()
         {
-            const string newName = "RenameProject";
-
-            //Input
-            const string inputCode =
-@"Private Sub Foo(ByVal a As Integer, ByVal b As String)
-End Sub";
-
-            var selection = new Selection(1, 1, 1, 1);
+            const string oldName = "TestProject1";
+            const string newName = "Renamed";
 
             //Arrange
             var builder = new MockVbeBuilder();
-            VBComponent component;
-            var vbe = builder.BuildFromSingleStandardModule(inputCode, out component);
-            var project = vbe.Object.VBProjects.Item(0);
+            var vbe = builder.ProjectBuilder(oldName, vbext_ProjectProtection.vbext_pp_none)
+                             .AddComponent("Module1", vbext_ComponentType.vbext_ct_StdModule, string.Empty)
+                             .MockVbeBuilder()
+                             .Build();
+
             var codePaneFactory = new CodePaneWrapperFactory();
             var mockHost = new Mock<IHostApplication>();
             mockHost.SetupAllProperties();
-            var parser = new RubberduckParser(vbe.Object, new RubberduckParserState());
 
+            var parser = new RubberduckParser(vbe.Object, new RubberduckParserState());
             parser.Parse();
             if (parser.State.Status == ParserState.Error) { Assert.Inconclusive("Parser Error"); }
 
-            var qualifiedSelection = new QualifiedSelection(new QualifiedModuleName(component), selection);
-
-            var model = new RenameModel(vbe.Object, parser.State, qualifiedSelection, null) { NewName = newName };
+            var model = new RenameModel(vbe.Object, parser.State, default(QualifiedSelection), null) { NewName = newName };
             model.Target = model.Declarations.First(i => i.DeclarationType == DeclarationType.Project && !i.IsBuiltIn);
 
             //SetupFactory
@@ -1135,7 +1129,7 @@ public void RenameRefactoring_RenameProject()
             refactoring.Refactor(model.Target);
 
             //Assert
-            Assert.AreSame(newName, project.Name);
+            Assert.AreEqual(newName, vbe.Object.VBProjects.Item(0).Name);
         }
 
         [TestMethod]