Skip to content

Commit 80ab5a4

Browse files
committed
Fix flaky CompletesAttributeValue test
1 parent b972fb2 commit 80ab5a4

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

test/PowerShellEditorServices.Test.Shared/Completion/CompleteAttributeValue.cs

-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ internal static class CompleteAttributeValue
2525
FilterText = "ValueFromPipeline",
2626
InsertText = "ValueFromPipeline",
2727
Label = "ValueFromPipeline",
28-
SortText = "0001ValueFromPipeline",
2928
TextEdit = new TextEdit
3029
{
3130
NewText = "ValueFromPipeline",
@@ -44,7 +43,6 @@ internal static class CompleteAttributeValue
4443
FilterText = "ValueFromPipelineByPropertyName",
4544
InsertText = "ValueFromPipelineByPropertyName",
4645
Label = "ValueFromPipelineByPropertyName",
47-
SortText = "0002ValueFromPipelineByPropertyName",
4846
TextEdit = new TextEdit
4947
{
5048
NewText = "ValueFromPipelineByPropertyName",
@@ -63,7 +61,6 @@ internal static class CompleteAttributeValue
6361
FilterText = "ValueFromRemainingArguments",
6462
InsertText = "ValueFromRemainingArguments",
6563
Label = "ValueFromRemainingArguments",
66-
SortText = "0003ValueFromRemainingArguments",
6764
TextEdit = new TextEdit
6865
{
6966
NewText = "ValueFromRemainingArguments",

test/PowerShellEditorServices.Test/Language/CompletionHandlerTests.cs

+7-5
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,13 @@ public async Task CompletesVariableInFile()
111111
public async Task CompletesAttributeValue()
112112
{
113113
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteAttributeValue.SourceDetails).ConfigureAwait(true);
114-
Assert.Equal(3, results.Count());
115-
Assert.Collection(results.OrderBy(c => c.SortText),
116-
actual => Assert.Equal(actual with { Data = null }, CompleteAttributeValue.ExpectedCompletion1),
117-
actual => Assert.Equal(actual with { Data = null }, CompleteAttributeValue.ExpectedCompletion2),
118-
actual => Assert.Equal(actual with { Data = null }, CompleteAttributeValue.ExpectedCompletion3));
114+
// NOTE: Since the completions come through un-ordered from PowerShell, their SortText
115+
// (which has an index prepended from the original order) will mis-match our assumed
116+
// order; hence we ignore it.
117+
Assert.Collection(results.OrderBy(c => c.Label),
118+
actual => Assert.Equal(actual with { Data = null, SortText = null }, CompleteAttributeValue.ExpectedCompletion1),
119+
actual => Assert.Equal(actual with { Data = null, SortText = null }, CompleteAttributeValue.ExpectedCompletion2),
120+
actual => Assert.Equal(actual with { Data = null, SortText = null }, CompleteAttributeValue.ExpectedCompletion3));
119121
}
120122

121123
[Fact]

0 commit comments

Comments
 (0)