More tests, remove dead code

Author: Hosch250

RetailCoder.VBE/Refactorings/ReorderParameters/ReorderParametersRefactoring.cs

@@ -122,14 +122,6 @@ private void RewriteCall(VBAParser.ArgsCallContext paramList, CodeModule module)
 
                 if (parameterStringIndex <= -1) { continue; }
 
-                if (_model.Parameters.ElementAt(parameterIndex).Index >= paramNames.Count)
-                {
-                    newContent = newContent.Insert(parameterStringIndex, " , ");
-                    i--;
-                    parameterIndex++;
-                    continue;
-                }
-
                 var oldParameterString = paramNames.ElementAt(i);
                 var newParameterString = paramNames.ElementAt(_model.Parameters.ElementAt(parameterIndex).Index);
                 var beginningSub = newContent.Substring(0, parameterStringIndex);

RubberduckTests/Refactoring/RemoveParametersTests.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Windows.Forms;
 using Microsoft.Vbe.Interop;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -1057,7 +1059,7 @@ Private Sub IClass1_DoSomething(ByVal a As Integer )
         }
 
         [TestMethod]
-        public void ReorderParametersRefactoring_ParamsSwapped_RejectPrompt()
+        public void RemoveParametersRefactoring_LastParamRemoved_RejectPrompt()
         {
             //Input
             const string inputCode1 =
@@ -1093,6 +1095,42 @@ Private Sub IClass1_DoSomething(ByVal a As Integer, ByVal b As String)
             Assert.AreEqual(null, model.TargetDeclaration);
         }
 
+        [TestMethod]
+        public void RemoveParams_RefactorDeclaration_FailsInvalidTarget()
+        {
+            //Input
+            const string inputCode =
+@"Private Sub Foo(ByVal arg1 As Integer, ByVal arg2 As String)
+End Sub";
+            var selection = new Selection(1, 23, 1, 27); //startLine, startCol, endLine, endCol
+
+            //Arrange
+            var project = SetupMockProject(inputCode);
+            var parseResult = new RubberduckParser().Parse(project.Object);
+
+            var qualifiedSelection = GetQualifiedSelection(selection);
+
+            //set up model
+            var model = new RemoveParametersModel(parseResult, qualifiedSelection, null);
+
+            var factory = SetupFactory(model);
+
+            //act
+            var refactoring = new RemoveParametersRefactoring(factory.Object);
+
+            //assert
+            try
+            {
+                refactoring.Refactor(
+                    model.Declarations.Items.FirstOrDefault(
+                        i => i.DeclarationType == Rubberduck.Parsing.Symbols.DeclarationType.Class));
+            }
+            catch (ArgumentException e)
+            {
+                Assert.AreEqual("Invalid declaration type", e.Message);
+            }
+        }
+
         #region setup
         private static Mock<IRefactoringPresenterFactory<IRemoveParametersPresenter>> SetupFactory(RemoveParametersModel model)
         {

RubberduckTests/Refactoring/ReorderParametersTests.cs

@@ -740,6 +740,89 @@ Public Sub Goo(ByVal arg As Date, _
                ByVal arg6 As Integer)
               
  Foo arg, ""test"", test1x, test2x, test3x, test4x, test5x, test6x
+End Sub
+";
+
+            //Arrange
+            var project = SetupMockProject(inputCode);
+            var module = project.Object.VBComponents.Item(0).CodeModule;
+            var parseResult = new RubberduckParser().Parse(project.Object);
+
+            var qualifiedSelection = GetQualifiedSelection(selection);
+
+            //Specify Params to reorder
+            var model = new ReorderParametersModel(parseResult, qualifiedSelection, null);
+            var reorderedParams = new List<Parameter>()
+            {
+                model.Parameters[1],
+                model.Parameters[0]
+            };
+
+            model.Parameters = reorderedParams;
+
+            //SetupFactory
+            var factory = SetupFactory(model);
+
+            var messageBox = new Mock<IMessageBox>();
+            messageBox.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), MessageBoxButtons.OK, MessageBoxIcon.Warning)).Returns(DialogResult.OK);
+
+            //Act
+            var refactoring = new ReorderParametersRefactoring(factory.Object, messageBox.Object);
+            refactoring.Refactor(qualifiedSelection);
+
+            //Assert
+            Assert.AreEqual(expectedCode, module.Lines());
+        }
+
+        [TestMethod]
+        public void ReorderParametersRefactoring_ClientReferencesAreUpdated_ParamArray_CallOnMultiplelines()
+        {
+            //Input
+            const string inputCode =
+@"Sub Foo(ByVal arg1 As String, ByVal arg2 As Date, ParamArray arg3())
+End Sub
+
+Public Sub Goo(ByVal arg As Date, _
+               ByVal arg1 As Integer, _
+               ByVal arg2 As Integer, _
+               ByVal arg3 As Integer, _
+               ByVal arg4 As Integer, _
+               ByVal arg5 As Integer, _
+               ByVal arg6 As Integer)
+              
+    Foo ""test"", _
+        arg, _
+        test1x, _
+        test2x, _
+        test3x, _
+        test4x, _
+        test5x, _
+        test6x
+End Sub
+";
+            var selection = new Selection(1, 23, 1, 27); //startLine, startCol, endLine, endCol
+
+            //Expectation
+            const string expectedCode =
+@"Sub Foo(ByVal arg2 As Date, ByVal arg1 As String, ParamArray arg3())
+End Sub
+
+Public Sub Goo(ByVal arg As Date, _
+               ByVal arg1 As Integer, _
+               ByVal arg2 As Integer, _
+               ByVal arg3 As Integer, _
+               ByVal arg4 As Integer, _
+               ByVal arg5 As Integer, _
+               ByVal arg6 As Integer)
+              
+ Foo arg, ""test"", test1x, test2x, test3x, test4x, test5x, test6x
+
+
+
+
+
+
+
 End Sub
 ";