Redo tests to be data-driven

Author: JustinGrote

test/PowerShellEditorServices.Test.Shared/Refactoring/Functions/RefactorFunctionTestCases.cs

@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+namespace PowerShellEditorServices.Test.Shared.Refactoring;
+
+public class RefactorFunctionTestCases
+{
+    public static RenameTestTarget[] TestCases =
+    [
+        new("FunctionsSingle.ps1",                     Line: 1,  Column:  5 ),
+        new("FunctionMultipleOccurrences.ps1",         Line: 1,  Column:  5 ),
+        new("FunctionInnerIsNested.ps1",               Line: 5,  Column:  5, "bar"),
+        new("FunctionOuterHasNestedFunction.ps1",      Line: 10, Column:  1 ),
+        new("FunctionWithInnerFunction.ps1",           Line: 5,  Column:  5, "RenamedInnerFunction"),
+        new("FunctionWithInternalCalls.ps1",           Line: 1,  Column:  5 ),
+        new("FunctionCmdlet.ps1",                      Line: 10, Column:  1 ),
+        new("FunctionSameName.ps1",                    Line: 14, Column:  3, "RenamedSameNameFunction"),
+        new("FunctionScriptblock.ps1",                 Line: 5,  Column:  5 ),
+        new("FunctionLoop.ps1",                        Line: 5,  Column:  5 ),
+        new("FunctionForeach.ps1",                     Line: 5,  Column: 11 ),
+        new("FunctionForeachObject.ps1",               Line: 5,  Column: 11 ),
+        new("FunctionCallWIthinStringExpression.ps1",  Line: 10, Column:  1 ),
+        new("FunctionNestedRedefinition.ps1",          Line: 15, Column: 13 )
+    ];
+}

test/PowerShellEditorServices.Test.Shared/Refactoring/Functions/RefactorsFunctionData.cs

@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+#nullable enable
+
+namespace PowerShellEditorServices.Test.Shared.Refactoring;
+
+/// <summary>
+/// Describes a test case for renaming a file
+/// </summary>
+/// <param name="FileName">The test case file name e.g. testScript.ps1</param>
+/// <param name="Line">The line where the cursor should be positioned for the rename</param>
+/// <param name="Column">The column/character indent where ther cursor should be positioned for the rename</param>
+/// <param name="NewName">What the target symbol represented by the line and column should be renamed to. Defaults to "Renamed" if not specified</param>
+public record RenameTestTarget(string FileName = "UNKNOWN", int Line = -1, int Column = -1, string NewName = "Renamed")
+{
+    public override string ToString() => $"{FileName.Substring(0, FileName.Length - 4)}";
+}

test/PowerShellEditorServices.Test.Shared/Refactoring/RenameTestTarget.cs

@@ -1,59 +1,57 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-using Microsoft.PowerShell.EditorServices.Handlers;
 
-namespace PowerShellEditorServices.Test.Shared.Refactoring.Utilities
+namespace PowerShellEditorServices.Test.Shared.Refactoring
 {
     internal static class RenameUtilitiesData
     {
-
-        public static readonly RenameSymbolParams GetVariableExpressionAst = new()
+        public static readonly RenameTestTarget GetVariableExpressionAst = new()
         {
             Column = 11,
             Line = 15,
-            RenameTo = "Renamed",
+            NewName = "Renamed",
             FileName = "TestDetection.ps1"
         };
-        public static readonly RenameSymbolParams GetVariableExpressionStartAst = new()
+        public static readonly RenameTestTarget GetVariableExpressionStartAst = new()
         {
             Column = 1,
             Line = 15,
-            RenameTo = "Renamed",
+            NewName = "Renamed",
             FileName = "TestDetection.ps1"
         };
-        public static readonly RenameSymbolParams GetVariableWithinParameterAst = new()
+        public static readonly RenameTestTarget GetVariableWithinParameterAst = new()
         {
             Column = 21,
             Line = 3,
-            RenameTo = "Renamed",
+            NewName = "Renamed",
             FileName = "TestDetection.ps1"
         };
-        public static readonly RenameSymbolParams GetHashTableKey = new()
+        public static readonly RenameTestTarget GetHashTableKey = new()
         {
             Column = 9,
             Line = 16,
-            RenameTo = "Renamed",
+            NewName = "Renamed",
             FileName = "TestDetection.ps1"
         };
-        public static readonly RenameSymbolParams GetVariableWithinCommandAst = new()
+        public static readonly RenameTestTarget GetVariableWithinCommandAst = new()
         {
             Column = 29,
             Line = 6,
-            RenameTo = "Renamed",
+            NewName = "Renamed",
             FileName = "TestDetection.ps1"
         };
-        public static readonly RenameSymbolParams GetCommandParameterAst = new()
+        public static readonly RenameTestTarget GetCommandParameterAst = new()
         {
             Column = 12,
             Line = 21,
-            RenameTo = "Renamed",
+            NewName = "Renamed",
             FileName = "TestDetection.ps1"
         };
-        public static readonly RenameSymbolParams GetFunctionDefinitionAst = new()
+        public static readonly RenameTestTarget GetFunctionDefinitionAst = new()
         {
             Column = 12,
             Line = 1,
-            RenameTo = "Renamed",
+            NewName = "Renamed",
             FileName = "TestDetection.ps1"
         };
     }

test/PowerShellEditorServices.Test.Shared/Refactoring/Utilities/RefactorUtilitiesData.cs

@@ -0,0 +1,34 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+namespace PowerShellEditorServices.Test.Shared.Refactoring;
+public class RefactorVariableTestCases
+{
+    public static RenameTestTarget[] TestCases =
+    [
+        new ("SimpleVariableAssignment.ps1",                   Line: 1,  Column: 1  ),
+        new ("VariableRedefinition.ps1",                       Line: 1,  Column: 1  ),
+        new ("VariableNestedScopeFunction.ps1",                Line: 1,  Column: 1  ),
+        new ("VariableInLoop.ps1",                             Line: 1,  Column: 1  ),
+        new ("VariableInPipeline.ps1",                         Line: 23, Column: 2  ),
+        new ("VariableInScriptblockScoped.ps1",                Line: 36, Column: 3  ),
+        new ("VariablewWithinHastableExpression.ps1",          Line: 46, Column: 3  ),
+        new ("VariableNestedFunctionScriptblock.ps1",          Line: 20, Column: 4  ),
+        new ("VariableWithinCommandAstScriptBlock.ps1",        Line: 75, Column: 3  ),
+        new ("VariableWithinForeachObject.ps1",                Line: 1,  Column: 2  ),
+        new ("VariableusedInWhileLoop.ps1",                    Line: 5,  Column: 2  ),
+        new ("VariableInParam.ps1",                            Line: 16, Column: 24 ),
+        new ("VariableCommandParameter.ps1",                   Line: 9,  Column: 10 ),
+        new ("VariableCommandParameter.ps1",                   Line: 17, Column: 3  ),
+        new ("VariableScriptWithParamBlock.ps1",               Line: 30, Column: 1  ),
+        new ("VariableNonParam.ps1",                           Line: 1,  Column: 7  ),
+        new ("VariableParameterCommandWithSameName.ps1",       Line: 13, Column: 9  ),
+        new ("VariableCommandParameterSplatted.ps1",           Line: 10, Column: 21 ),
+        new ("VariableCommandParameterSplatted.ps1",           Line: 5,  Column: 16 ),
+        new ("VariableInForeachDuplicateAssignment.ps1",       Line: 18, Column: 6  ),
+        new ("VariableInForloopDuplicateAssignment.ps1",       Line: 14, Column: 9  ),
+        new ("VariableNestedScopeFunctionRefactorInner.ps1",   Line: 5,  Column: 3  ),
+        new ("VariableSimpleFunctionParameter.ps1",            Line: 9,  Column: 6  ),
+        new ("VariableDotNotationFromInnerFunction.ps1",       Line: 26, Column: 11 ),
+        new ("VariableDotNotationFromInnerFunction.ps1",       Line: 1,  Column: 1  )
+    ];
+}