Rename test

Author: Hosch250

RetailCoder.VBE/UI/CodeExplorer/Commands/CodeExplorer_RenameCommand.cs

@@ -5,7 +5,6 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.Rename;
 using Rubberduck.UI.Command;
-using Rubberduck.UI.Refactorings;
 using Rubberduck.VBEditor.VBEInterfaces.RubberduckCodePane;
 
 namespace Rubberduck.UI.CodeExplorer.Commands
@@ -15,9 +14,9 @@ public class CodeExplorer_RenameCommand : CommandBase, IDisposable
         private readonly VBE _vbe;
         private readonly RubberduckParserState _state;
         private readonly ICodePaneWrapperFactory _wrapperFactory;
-        private readonly RenameDialog _view;
+        private readonly IRenameView _view;
 
-        public CodeExplorer_RenameCommand(VBE vbe, RubberduckParserState state, ICodePaneWrapperFactory wrapperFactory, RenameDialog view)
+        public CodeExplorer_RenameCommand(VBE vbe, RubberduckParserState state, ICodePaneWrapperFactory wrapperFactory, IRenameView view)
         {
             _vbe = vbe;
             _state = state;
@@ -61,7 +60,7 @@ private Declaration GetSelectedDeclaration(CodeExplorerItemViewModel node)
 
         public void Dispose()
         {
-            if (_view != null && !_view.IsDisposed)
+            if (_view != null)
             {
                 _view.Dispose();
             }

RubberduckTests/CodeExplorer/CodeExplorerTests.cs

@@ -7,13 +7,16 @@
 using Moq;
 using Rubberduck.Navigation.CodeExplorer;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Refactorings.Rename;
 using Rubberduck.Settings;
 using Rubberduck.SmartIndenter;
 using Rubberduck.UI;
 using Rubberduck.UI.CodeExplorer.Commands;
+using Rubberduck.UI.Refactorings;
 using Rubberduck.UnitTesting;
 using Rubberduck.VBEditor.VBEHost;
 using Rubberduck.VBEditor.Extensions;
+using Rubberduck.VBEditor.VBEInterfaces.RubberduckCodePane;
 using RubberduckTests.Mocks;
 
 namespace RubberduckTests.CodeExplorer
@@ -182,6 +185,59 @@ Dim d As Boolean
             Assert.AreEqual(expectedCode, module.Lines());
         }
 
+        [TestMethod]
+        public void RenameProcedure()
+        {
+            var inputCode =
+@"Sub Foo()
+End Sub
+
+Sub Bar()
+    Foo
+End Sub";
+
+            var expectedCode =
+@"Sub Fizz()
+End Sub
+
+Sub Bar()
+    Fizz
+End Sub";
+
+            var builder = new MockVbeBuilder();
+            VBComponent component;
+            var vbe = builder.BuildFromSingleStandardModule(inputCode, out component);
+            var mockHost = new Mock<IHostApplication>();
+            mockHost.SetupAllProperties();
+            var project = vbe.Object.VBProjects.Item(0);
+            var module = project.VBComponents.Item(0).CodeModule;
+
+            var configLoader = new Mock<ConfigurationLoader>(null, null);
+            configLoader.Setup(c => c.LoadConfiguration()).Returns(GetDefaultUnitTestConfig());
+
+            var view = new Mock<IRenameView>();
+            view.Setup(r => r.ShowDialog()).Returns(DialogResult.OK);
+            view.Setup(r => r.Target);
+            view.SetupGet(r => r.NewName).Returns("Fizz");
+
+            var state = new RubberduckParserState();
+            var commands = new List<ICommand>
+            {
+                new CodeExplorer_RenameCommand(vbe.Object, state, new CodePaneWrapperFactory(), view.Object)
+            };
+
+            var vm = new CodeExplorerViewModel(state, commands);
+
+            var parser = MockParser.Create(vbe.Object, state);
+            parser.Parse();
+            if (parser.State.Status == ParserState.Error) { Assert.Inconclusive("Parser Error"); }
+
+            vm.SelectedItem = vm.Projects.First().Items.First().Items.First().Items.First();
+            vm.RenameCommand.Execute(vm.SelectedItem);
+
+            Assert.AreEqual(expectedCode, module.Lines());
+        }
+
         #region
         private Configuration GetDefaultUnitTestConfig()
         {