Skip to content

Commit b362c5e

Browse files
Merge pull request #1655 from PowerShell/andschwa/language-tests
Split and clean up `LanguageServiceTests.cs`
2 parents 798fc8d + e72a796 commit b362c5e

17 files changed

+626
-707
lines changed

test/PowerShellEditorServices.Test.Shared/Definition/FindsDotSourcedFile.cs

+10-11
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55

66
namespace Microsoft.PowerShell.EditorServices.Test.Shared.Definition
77
{
8-
public class FindsDotSourcedFile
8+
public static class FindsDotSourcedFileData
99
{
10-
public static readonly ScriptRegion SourceDetails =
11-
new ScriptRegion(
12-
file: TestUtilities.NormalizePath("References/DotSources.ps1"),
13-
text: string.Empty,
14-
startLineNumber: 1,
15-
startColumnNumber: 3,
16-
startOffset: 0,
17-
endLineNumber: 0,
18-
endColumnNumber: 0,
19-
endOffset: 0);
10+
public static readonly ScriptRegion SourceDetails = new(
11+
file: TestUtilities.NormalizePath("References/DotSources.ps1"),
12+
text: string.Empty,
13+
startLineNumber: 1,
14+
startColumnNumber: 3,
15+
startOffset: 0,
16+
endLineNumber: 0,
17+
endColumnNumber: 0,
18+
endOffset: 0);
2019
}
2120
}

test/PowerShellEditorServices.Test.Shared/Definition/FindsFunctionDefinition.cs

+10-11
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55

66
namespace Microsoft.PowerShell.EditorServices.Test.Shared.Definition
77
{
8-
public class FindsFunctionDefinition
8+
public static class FindsFunctionDefinitionData
99
{
10-
public static readonly ScriptRegion SourceDetails =
11-
new ScriptRegion(
12-
file: TestUtilities.NormalizePath("References/SimpleFile.ps1"),
13-
text: string.Empty,
14-
startLineNumber: 3,
15-
startColumnNumber: 12,
16-
startOffset: 0,
17-
endLineNumber: 0,
18-
endColumnNumber: 0,
19-
endOffset: 0);
10+
public static readonly ScriptRegion SourceDetails = new(
11+
file: TestUtilities.NormalizePath("References/SimpleFile.ps1"),
12+
text: string.Empty,
13+
startLineNumber: 3,
14+
startColumnNumber: 12,
15+
startOffset: 0,
16+
endLineNumber: 0,
17+
endColumnNumber: 0,
18+
endOffset: 0);
2019
}
2120
}

test/PowerShellEditorServices.Test.Shared/Definition/FindsFunctionDefinitionInDotSourceReference.cs

+10-11
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55

66
namespace Microsoft.PowerShell.EditorServices.Test.Shared.Definition
77
{
8-
public class FindsFunctionDefinitionInDotSourceReference
8+
public static class FindsFunctionDefinitionInDotSourceReferenceData
99
{
10-
public static readonly ScriptRegion SourceDetails =
11-
new ScriptRegion(
12-
file: TestUtilities.NormalizePath("References/FileWithReferences.ps1"),
13-
text: string.Empty,
14-
startLineNumber: 3,
15-
startColumnNumber: 6,
16-
startOffset: 0,
17-
endLineNumber: 0,
18-
endColumnNumber: 0,
19-
endOffset: 0);
10+
public static readonly ScriptRegion SourceDetails = new(
11+
file: TestUtilities.NormalizePath("References/FileWithReferences.ps1"),
12+
text: string.Empty,
13+
startLineNumber: 3,
14+
startColumnNumber: 6,
15+
startOffset: 0,
16+
endLineNumber: 0,
17+
endColumnNumber: 0,
18+
endOffset: 0);
2019
}
2120
}

test/PowerShellEditorServices.Test.Shared/Definition/FindsFunctionDefinitionInWorkspace.cs

+10-11
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55

66
namespace Microsoft.PowerShell.EditorServices.Test.Shared.Definition
77
{
8-
public class FindsFunctionDefinitionInWorkspace
8+
public static class FindsFunctionDefinitionInWorkspaceData
99
{
10-
public static readonly ScriptRegion SourceDetails =
11-
new ScriptRegion(
12-
file: TestUtilities.NormalizePath("References/ReferenceFileD.ps1"),
13-
text: string.Empty,
14-
startLineNumber: 1,
15-
startColumnNumber: 2,
16-
startOffset: 0,
17-
endLineNumber: 0,
18-
endColumnNumber: 0,
19-
endOffset: 0);
10+
public static readonly ScriptRegion SourceDetails = new(
11+
file: TestUtilities.NormalizePath("References/ReferenceFileD.ps1"),
12+
text: string.Empty,
13+
startLineNumber: 1,
14+
startColumnNumber: 2,
15+
startOffset: 0,
16+
endLineNumber: 0,
17+
endColumnNumber: 0,
18+
endOffset: 0);
2019
}
2120
}

test/PowerShellEditorServices.Test.Shared/Definition/FindsVariableDefinition.cs

+10-11
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55

66
namespace Microsoft.PowerShell.EditorServices.Test.Shared.Definition
77
{
8-
public class FindsVariableDefinition
8+
public static class FindsVariableDefinitionData
99
{
10-
public static readonly ScriptRegion SourceDetails =
11-
new ScriptRegion(
12-
file: TestUtilities.NormalizePath("References/SimpleFile.ps1"),
13-
text: string.Empty,
14-
startLineNumber: 8,
15-
startColumnNumber: 3,
16-
startOffset: 0,
17-
endLineNumber: 0,
18-
endColumnNumber: 0,
19-
endOffset: 0);
10+
public static readonly ScriptRegion SourceDetails = new(
11+
file: TestUtilities.NormalizePath("References/SimpleFile.ps1"),
12+
text: string.Empty,
13+
startLineNumber: 8,
14+
startColumnNumber: 3,
15+
startOffset: 0,
16+
endLineNumber: 0,
17+
endColumnNumber: 0,
18+
endOffset: 0);
2019
}
2120
}

test/PowerShellEditorServices.Test.Shared/Occurrences/FindOccurrencesOnParameter.cs

+10-11
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55

66
namespace Microsoft.PowerShell.EditorServices.Test.Shared.Occurrences
77
{
8-
public class FindOccurrencesOnParameter
8+
public static class FindOccurrencesOnParameterData
99
{
10-
public static readonly ScriptRegion SourceDetails =
11-
new ScriptRegion(
12-
file: TestUtilities.NormalizePath("References/SimpleFile.ps1"),
13-
text: string.Empty,
14-
startLineNumber: 1,
15-
startColumnNumber: 31,
16-
startOffset: 0,
17-
endLineNumber: 0,
18-
endColumnNumber: 0,
19-
endOffset: 0);
10+
public static readonly ScriptRegion SourceDetails = new(
11+
file: TestUtilities.NormalizePath("References/SimpleFile.ps1"),
12+
text: string.Empty,
13+
startLineNumber: 1,
14+
startColumnNumber: 31,
15+
startOffset: 0,
16+
endLineNumber: 0,
17+
endColumnNumber: 0,
18+
endOffset: 0);
2019
}
2120
}

test/PowerShellEditorServices.Test.Shared/Occurrences/FindsOccurrencesOnFunction.cs

+10-11
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55

66
namespace Microsoft.PowerShell.EditorServices.Test.Shared.Occurrences
77
{
8-
public class FindsOccurrencesOnFunction
8+
public static class FindsOccurrencesOnFunctionData
99
{
10-
public static readonly ScriptRegion SourceDetails =
11-
new ScriptRegion(
12-
file: TestUtilities.NormalizePath("References/SimpleFile.ps1"),
13-
text: string.Empty,
14-
startLineNumber: 1,
15-
startColumnNumber: 17,
16-
startOffset: 0,
17-
endLineNumber: 0,
18-
endColumnNumber: 0,
19-
endOffset: 0);
10+
public static readonly ScriptRegion SourceDetails = new(
11+
file: TestUtilities.NormalizePath("References/SimpleFile.ps1"),
12+
text: string.Empty,
13+
startLineNumber: 1,
14+
startColumnNumber: 17,
15+
startOffset: 0,
16+
endLineNumber: 0,
17+
endColumnNumber: 0,
18+
endOffset: 0);
2019
}
2120
}

test/PowerShellEditorServices.Test.Shared/ParameterHints/FindsParameterSetsOnCommand.cs

+10-11
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55

66
namespace Microsoft.PowerShell.EditorServices.Test.Shared.ParameterHint
77
{
8-
public class FindsParameterSetsOnCommand
8+
public static class FindsParameterSetsOnCommandData
99
{
10-
public static readonly ScriptRegion SourceDetails =
11-
new ScriptRegion(
12-
file: TestUtilities.NormalizePath("ParameterHints/ParamHints.ps1"),
13-
text: string.Empty,
14-
startLineNumber: 1,
15-
startColumnNumber: 14,
16-
startOffset: 0,
17-
endLineNumber: 0,
18-
endColumnNumber: 0,
19-
endOffset: 0);
10+
public static readonly ScriptRegion SourceDetails = new(
11+
file: TestUtilities.NormalizePath("ParameterHints/ParamHints.ps1"),
12+
text: string.Empty,
13+
startLineNumber: 1,
14+
startColumnNumber: 14,
15+
startOffset: 0,
16+
endLineNumber: 0,
17+
endColumnNumber: 0,
18+
endOffset: 0);
2019
}
2120
}

test/PowerShellEditorServices.Test.Shared/ParameterHints/FindsParameterSetsOnCommandWithSpaces.cs

+10-11
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@
55

66
namespace Microsoft.PowerShell.EditorServices.Test.Shared.ParameterHint
77
{
8-
public class FindsParameterSetsOnCommandWithSpaces
8+
public static class FindsParameterSetsOnCommandWithSpacesData
99
{
10-
public static readonly ScriptRegion SourceDetails =
11-
new ScriptRegion(
12-
file: TestUtilities.NormalizePath("ParameterHints/ParamHints.ps1"),
13-
text: string.Empty,
14-
startLineNumber: 9,
15-
startColumnNumber: 31,
16-
startOffset: 0,
17-
endLineNumber: 0,
18-
endColumnNumber: 0,
19-
endOffset: 0);
10+
public static readonly ScriptRegion SourceDetails = new(
11+
file: TestUtilities.NormalizePath("ParameterHints/ParamHints.ps1"),
12+
text: string.Empty,
13+
startLineNumber: 9,
14+
startColumnNumber: 31,
15+
startOffset: 0,
16+
endLineNumber: 0,
17+
endColumnNumber: 0,
18+
endOffset: 0);
2019
}
2120
}

test/PowerShellEditorServices.Test.Shared/References/FindsReferencesOnBuiltInCommandWithAlias.cs

+20-23
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,28 @@
55

66
namespace Microsoft.PowerShell.EditorServices.Test.Shared.References
77
{
8-
public class FindsReferencesOnBuiltInCommandWithAlias
8+
public static class FindsReferencesOnBuiltInCommandWithAliasData
99
{
10-
public static readonly ScriptRegion SourceDetails =
11-
new ScriptRegion(
12-
file: TestUtilities.NormalizePath("References/SimpleFile.ps1"),
13-
text: string.Empty,
14-
startLineNumber: 14,
15-
startColumnNumber: 3,
16-
startOffset: 0,
17-
endLineNumber: 0,
18-
endColumnNumber: 0,
19-
endOffset: 0);
10+
public static readonly ScriptRegion SourceDetails = new(
11+
file: TestUtilities.NormalizePath("References/SimpleFile.ps1"),
12+
text: string.Empty,
13+
startLineNumber: 14,
14+
startColumnNumber: 3,
15+
startOffset: 0,
16+
endLineNumber: 0,
17+
endColumnNumber: 0,
18+
endOffset: 0);
2019
}
21-
public class FindsReferencesOnBuiltInAlias
20+
public static class FindsReferencesOnBuiltInAliasData
2221
{
23-
public static readonly ScriptRegion SourceDetails =
24-
new ScriptRegion(
25-
file: TestUtilities.NormalizePath("References/SimpleFile.ps1"),
26-
text: string.Empty,
27-
startLineNumber: 15,
28-
startColumnNumber: 2,
29-
startOffset: 0,
30-
endLineNumber: 0,
31-
endColumnNumber: 0,
32-
endOffset: 0);
22+
public static readonly ScriptRegion SourceDetails = new(
23+
file: TestUtilities.NormalizePath("References/SimpleFile.ps1"),
24+
text: string.Empty,
25+
startLineNumber: 15,
26+
startColumnNumber: 2,
27+
startOffset: 0,
28+
endLineNumber: 0,
29+
endColumnNumber: 0,
30+
endOffset: 0);
3331
}
3432
}
35-

test/PowerShellEditorServices.Test.Shared/References/FindsReferencesOnFunction.cs

+10-12
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,16 @@
55

66
namespace Microsoft.PowerShell.EditorServices.Test.Shared.References
77
{
8-
public class FindsReferencesOnFunction
8+
public static class FindsReferencesOnFunctionData
99
{
10-
public static readonly ScriptRegion SourceDetails =
11-
new ScriptRegion(
12-
file: TestUtilities.NormalizePath("References/SimpleFile.ps1"),
13-
text: string.Empty,
14-
startLineNumber: 3,
15-
startColumnNumber: 8,
16-
startOffset: 0,
17-
endLineNumber: 0,
18-
endColumnNumber: 0,
19-
endOffset: 0);
10+
public static readonly ScriptRegion SourceDetails = new(
11+
file: TestUtilities.NormalizePath("References/SimpleFile.ps1"),
12+
text: string.Empty,
13+
startLineNumber: 3,
14+
startColumnNumber: 8,
15+
startOffset: 0,
16+
endLineNumber: 0,
17+
endColumnNumber: 0,
18+
endOffset: 0);
2019
}
2120
}
22-

test/PowerShellEditorServices.Test.Shared/References/FindsReferencesOnFunctionMultiFileDotSource.cs

+21-23
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,29 @@
55

66
namespace Microsoft.PowerShell.EditorServices.Test.Shared.References
77
{
8-
public class FindsReferencesOnFunctionMultiFileDotSourceFileB
8+
public static class FindsReferencesOnFunctionMultiFileDotSourceFileB
99
{
10-
public static readonly ScriptRegion SourceDetails =
11-
new ScriptRegion(
12-
file: TestUtilities.NormalizePath("References/ReferenceFileB.ps1"),
13-
text: string.Empty,
14-
startLineNumber: 5,
15-
startColumnNumber: 8,
16-
startOffset: 0,
17-
endLineNumber: 0,
18-
endColumnNumber: 0,
19-
endOffset: 0);
10+
public static readonly ScriptRegion SourceDetails = new(
11+
file: TestUtilities.NormalizePath("References/ReferenceFileB.ps1"),
12+
text: string.Empty,
13+
startLineNumber: 5,
14+
startColumnNumber: 8,
15+
startOffset: 0,
16+
endLineNumber: 0,
17+
endColumnNumber: 0,
18+
endOffset: 0);
2019
}
21-
public class FindsReferencesOnFunctionMultiFileDotSourceFileC
20+
21+
public static class FindsReferencesOnFunctionMultiFileDotSourceFileC
2222
{
23-
public static readonly ScriptRegion SourceDetails =
24-
new ScriptRegion(
25-
file: TestUtilities.NormalizePath("References/ReferenceFileC.ps1"),
26-
text: string.Empty,
27-
startLineNumber: 4,
28-
startColumnNumber: 10,
29-
startOffset: 0,
30-
endLineNumber: 0,
31-
endColumnNumber: 0,
32-
endOffset: 0);
23+
public static readonly ScriptRegion SourceDetails = new(
24+
file: TestUtilities.NormalizePath("References/ReferenceFileC.ps1"),
25+
text: string.Empty,
26+
startLineNumber: 4,
27+
startColumnNumber: 10,
28+
startOffset: 0,
29+
endLineNumber: 0,
30+
endColumnNumber: 0,
31+
endOffset: 0);
3332
}
3433
}
35-

0 commit comments

Comments
 (0)