Rename tests (one fails because of buggy code)

rubberduck-vba · Jul 11, 2015 · b297f89 · b297f89
1 parent a1235b7
commit b297f89
Show file tree

Hide file tree

Showing 9 changed files with 302 additions and 34 deletions.
diff --git a/RetailCoder.VBE/Inspections/DefaultProjectNameInspectionResult.cs b/RetailCoder.VBE/Inspections/DefaultProjectNameInspectionResult.cs
@@ -33,7 +33,7 @@ private void RenameProject()
 
             using (var view = new RenameDialog())
             {
-                var factory = new RenamePresenterFactory(vbe, view, _parseResult);
+                var factory = new RenamePresenterFactory(vbe, view, _parseResult, new RubberduckMessageBox());
                 var refactoring = new RenameRefactoring(factory);
                 refactoring.Refactor(Target);
             }

diff --git a/RetailCoder.VBE/Refactorings/Rename/RenameModel.cs b/RetailCoder.VBE/Refactorings/Rename/RenameModel.cs
@@ -31,12 +31,15 @@ public Declaration Target
 
         public string NewName { get; set; }
 
-        public RenameModel(VBE vbe, VBProjectParseResult parseResult, QualifiedSelection selection)
+        private readonly IMessageBox _messageBox;
+
+        public RenameModel(VBE vbe, VBProjectParseResult parseResult, QualifiedSelection selection, IMessageBox messageBox)
         {
             _vbe = vbe;
             _parseResult = parseResult;
             _declarations = parseResult.Declarations;
             _selection = selection;
+            _messageBox = messageBox;
 
             AcquireTarget(out _target, Selection);
         }
@@ -63,7 +66,7 @@ public void PromptIfTargetImplementsInterface(ref Declaration target)
             var interfaceMember = _declarations.FindInterfaceMember(interfaceImplementation);
             var message = string.Format(RubberduckUI.RenamePresenter_TargetIsInterfaceMemberImplementation, target.IdentifierName, interfaceMember.ComponentName, interfaceMember.IdentifierName);
 
-            var confirm = MessageBox.Show(message, RubberduckUI.RenameDialog_TitleText, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
+            var confirm = _messageBox.Show(message, RubberduckUI.RenameDialog_TitleText, MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
             if (confirm == DialogResult.No)
             {
                 target = null;

diff --git a/RetailCoder.VBE/Refactorings/Rename/RenamePresenterFactory.cs b/RetailCoder.VBE/Refactorings/Rename/RenamePresenterFactory.cs
@@ -1,5 +1,6 @@
 using Microsoft.Vbe.Interop;
 using Rubberduck.Parsing;
+using Rubberduck.UI;
 using Rubberduck.VBEditor.Extensions;
 
 namespace Rubberduck.Refactorings.Rename
@@ -9,17 +10,19 @@ public class RenamePresenterFactory : IRefactoringPresenterFactory<RenamePresent
         private readonly VBE _vbe;
         private readonly IRenameView _view;
         private readonly VBProjectParseResult _parseResult;
+        private readonly IMessageBox _messageBox;
 
-        public RenamePresenterFactory(VBE vbe, IRenameView view, VBProjectParseResult parseResult)
+        public RenamePresenterFactory(VBE vbe, IRenameView view, VBProjectParseResult parseResult, IMessageBox messageBox)
         {
             _vbe = vbe;
             _view = view;
             _parseResult = parseResult;
+            _messageBox = messageBox;
         }
 
         public RenamePresenter Create()
         {
-            return new RenamePresenter(_view, new RenameModel(_vbe, _parseResult, _vbe.ActiveCodePane.GetSelection()));
+            return new RenamePresenter(_view, new RenameModel(_vbe, _parseResult, _vbe.ActiveCodePane.GetSelection(), _messageBox));
         }
     }
 }
diff --git a/RetailCoder.VBE/UI/FormContextMenu.cs b/RetailCoder.VBE/UI/FormContextMenu.cs
@@ -56,7 +56,7 @@ private void Rename()
 
                 using (var view = new RenameDialog())
                 {
-                    var factory = new RenamePresenterFactory(_vbe, view, result);
+                    var factory = new RenamePresenterFactory(_vbe, view, result, new RubberduckMessageBox());
                     var refactoring = new RenameRefactoring(factory);
                     refactoring.Refactor(controlToRename);
                 }

diff --git a/RetailCoder.VBE/UI/ProjectExplorerContextMenu.cs b/RetailCoder.VBE/UI/ProjectExplorerContextMenu.cs
@@ -147,7 +147,7 @@ private void Rename_Click(CommandBarButton Ctrl, ref bool CancelDefault)
 
             using (var view = new RenameDialog())
             {
-                var factory = new RenamePresenterFactory(_vbe, view, results);
+                var factory = new RenamePresenterFactory(_vbe, view, results, new RubberduckMessageBox());
                 var refactoring = new RenameRefactoring(factory);
                 refactoring.Refactor(declaration);
             }

diff --git a/RetailCoder.VBE/UI/RefactorMenu.cs b/RetailCoder.VBE/UI/RefactorMenu.cs
@@ -434,7 +434,7 @@ public void Rename()
 
             using (var view = new RenameDialog())
             {
-                var factory = new RenamePresenterFactory(IDE, view, result);
+                var factory = new RenamePresenterFactory(IDE, view, result, new RubberduckMessageBox());
                 var refactoring = new RenameRefactoring(factory);
                 refactoring.Refactor();
             }
@@ -447,7 +447,7 @@ public void Rename(Declaration target)
 
             using (var view = new RenameDialog())
             {
-                var factory = new RenamePresenterFactory(IDE, view, result);
+                var factory = new RenamePresenterFactory(IDE, view, result, new RubberduckMessageBox());
                 var refactoring = new RenameRefactoring(factory);
                 refactoring.Refactor(target);
             }

diff --git a/RubberduckTests/Refactoring/RemoveParametersTests.cs b/RubberduckTests/Refactoring/RemoveParametersTests.cs
@@ -1307,7 +1307,7 @@ public void RemoveParametersRefactoring_LastInterfaceParamsRemoved_AcceptPrompt(
         }
 
         [TestMethod]
-        public void RemoveParametersRefactoring_LastParamRemoved_RejectPrompt()
+        public void RemoveParametersRefactoring_LastInterfaceParamRemoved_RejectPrompt()
         {
             //Input
             const string inputCode1 =