Merge pull request #2 from rubberduck-vba/next

Pull from main repo

Author: Hosch250

RubberduckTests/Mocks/MockFactory.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
+using System.Windows.Forms.VisualStyles;
 using Microsoft.Vbe.Interop;
 using Moq;
 
@@ -81,14 +83,16 @@ internal static Mock<VBE> CreateVbeMock(Windows windows, VBProjects projects)
         /// <returns></returns>
         internal static Mock<CodeModule> CreateCodeModuleMock(string code)
         {
-            var lineCount = code.Split(new [] { Environment.NewLine }, StringSplitOptions.None).Length;
+            var lines = code.Split(new [] { Environment.NewLine }, StringSplitOptions.None);
 
             var codeModule = new Mock<CodeModule>();
-            codeModule.SetupGet(c => c.CountOfLines).Returns(lineCount);
+            codeModule.SetupGet(c => c.CountOfLines).Returns(lines.Length);
 
             // ReSharper disable once UseIndexedProperty
             // No R#, the indexed property breaks the expression. I tried that first.
-            codeModule.SetupGet(c => c.get_Lines(1, lineCount)).Returns(code);
+            codeModule.Setup(m => m.get_Lines(It.IsAny<int>(), It.IsAny<int>()))
+                .Returns((int start, int count) => String.Join(Environment.NewLine, lines.Skip(start - 1).Take(count)));
+            
             return codeModule;
         }
 

RubberduckTests/Refactoring/RemoveParametersTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Microsoft.Vbe.Interop;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
@@ -27,7 +28,7 @@ private void CleanUp()
         }
 
         [TestMethod]
-        public void RemoveParamatersRefactoring_RemoveOnlyParam()
+        public void RemoveParamatersRefactoring_RemoveBothParams()
         {
             //Input
             const string inputCode =
@@ -62,7 +63,7 @@ public void RemoveParamatersRefactoring_RemoveOnlyParam()
         }
 
         [TestMethod]
-        public void RemoveParamatersRefactoring_RemoveBothParams()
+        public void RemoveParamatersRefactoring_RemoveOnlyParam()
         {
             //Input
             const string inputCode =
@@ -166,6 +167,51 @@ public void RemoveParamatersRefactoring_RemoveSecondParam()
             Assert.AreEqual(expectedCode, _module.Object.Lines());
         }
 
+        [TestMethod]
+        public void RemoveParamatersRefactoring_ClientReferencesAreUpdated()
+        {
+            //Input
+            const string inputCode =
+@"Private Sub Foo(ByVal arg1 As Integer, ByVal arg2 As String)
+End Sub
+
+Private Sub Bar()
+    Foo 10, ""Hello""
+End Sub
+";
+            var selection = new Selection(1, 23, 1, 27); //startLine, startCol, endLine, endCol
+
+            //Expectation
+            const string expectedCode =
+@"Private Sub Foo(ByVal arg1 As Integer )
+End Sub
+
+Private Sub Bar()
+ Foo 10 
+End Sub
+"; //note: The IDE strips out the extra whitespace, you can't see it but there's a space after "Foo 10 "
+
+            //Arrange
+            SetupProject(inputCode);
+            var parseResult = new RubberduckParser().Parse(_project.Object);
+
+            var qualifiedSelection = GetQualifiedSelection(selection);
+
+            //Specify Param(s) to remove
+            var model = new RemoveParametersModel(parseResult, qualifiedSelection);
+            model.Parameters[1].IsRemoved = true;
+
+            //SetupFactory
+            var factory = SetupFactory(model);
+
+            //Act
+            var refactoring = new RemoveParametersRefactoring(factory.Object);
+            refactoring.Refactor(qualifiedSelection);
+
+            //Assert
+            Assert.AreEqual(expectedCode, _module.Object.Lines());
+        }
+
         #region setup
         private QualifiedSelection GetQualifiedSelection(Selection selection)
         {
@@ -201,6 +247,7 @@ private void SetupProject(string inputCode)
 
             _module = Mocks.MockFactory.CreateCodeModuleMock(inputCode);
             _module.SetupGet(m => m.CodePane).Returns(codePane.Object);
+           
             _module.Setup(m => m.ReplaceLine(It.IsAny<int>(), It.IsAny<string>()))
                 .Callback<int, string>((i, s) => ReplaceModuleLine(_module, i, s));
 
@@ -217,14 +264,15 @@ private void SetupProject(string inputCode)
 
         private static void ReplaceModuleLine(Mock<CodeModule> module, int lineNumber, string newLine)
         {
-            var lines = module.Object.Lines().Split(new[] {Environment.NewLine}, StringSplitOptions.None);
+            var lines = module.Object.Lines().Split(new[] { Environment.NewLine }, StringSplitOptions.None);
 
             lines[lineNumber - 1] = newLine;
 
             var newCode = String.Join(Environment.NewLine, lines);
 
             module.SetupGet(c => c.get_Lines(1, lines.Length)).Returns(newCode);
         }
+
         #endregion
     }
 }