Skip to content

Commit f617fb4

Browse files
committed
Revert "Skip tests broken by OmniSharp update"
This reverts commit e1817de.
1 parent ee53878 commit f617fb4

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

test/PowerShellEditorServices.Test/Language/CompletionHandlerTests.cs

+5-12
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,17 @@ private Task<CompletionResults> GetCompletionResultsAsync(ScriptRegion scriptReg
5353
CancellationToken.None);
5454
}
5555

56-
[SkippableFact]
56+
[Fact]
5757
public async Task CompletesCommandInFile()
5858
{
59-
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
6059
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteCommandInFile.SourceDetails).ConfigureAwait(true);
6160
CompletionItem actual = Assert.Single(results);
6261
Assert.Equal(CompleteCommandInFile.ExpectedCompletion, actual);
6362
}
6463

65-
[SkippableFact]
64+
[Fact]
6665
public async Task CompletesCommandFromModule()
6766
{
68-
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
6967
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteCommandFromModule.SourceDetails).ConfigureAwait(true);
7068
CompletionItem actual = Assert.Single(results);
7169
// NOTE: The tooltip varies across PowerShell and OS versions, so we ignore it.
@@ -76,7 +74,6 @@ public async Task CompletesCommandFromModule()
7674
[SkippableFact]
7775
public async Task CompletesTypeName()
7876
{
79-
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
8077
Skip.If(VersionUtils.PSEdition == "Desktop", "Windows PowerShell has trouble with this test right now.");
8178
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteTypeName.SourceDetails).ConfigureAwait(true);
8279
CompletionItem actual = Assert.Single(results);
@@ -98,26 +95,23 @@ public async Task CompletesTypeName()
9895
[SkippableFact]
9996
public async Task CompletesNamespace()
10097
{
101-
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
10298
Skip.If(VersionUtils.PSEdition == "Desktop", "Windows PowerShell has trouble with this test right now.");
10399
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteNamespace.SourceDetails).ConfigureAwait(true);
104100
CompletionItem actual = Assert.Single(results);
105101
Assert.Equal(CompleteNamespace.ExpectedCompletion, actual);
106102
}
107103

108-
[SkippableFact]
104+
[Fact]
109105
public async Task CompletesVariableInFile()
110106
{
111-
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
112107
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteVariableInFile.SourceDetails).ConfigureAwait(true);
113108
CompletionItem actual = Assert.Single(results);
114109
Assert.Equal(CompleteVariableInFile.ExpectedCompletion, actual);
115110
}
116111

117-
[SkippableFact]
112+
[Fact]
118113
public async Task CompletesAttributeValue()
119114
{
120-
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
121115
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteAttributeValue.SourceDetails).ConfigureAwait(true);
122116
// NOTE: Since the completions come through un-ordered from PowerShell, their SortText
123117
// (which has an index prepended from the original order) will mis-match our assumed
@@ -128,10 +122,9 @@ public async Task CompletesAttributeValue()
128122
actual => Assert.Equal(actual with { Data = null, SortText = null }, CompleteAttributeValue.ExpectedCompletion3));
129123
}
130124

131-
[SkippableFact]
125+
[Fact]
132126
public async Task CompletesFilePath()
133127
{
134-
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
135128
(_, IEnumerable<CompletionItem> results) = await GetCompletionResultsAsync(CompleteFilePath.SourceDetails).ConfigureAwait(true);
136129
Assert.NotEmpty(results);
137130
CompletionItem actual = results.First();

test/PowerShellEditorServices.Test/Services/Symbols/PSScriptAnalyzerTests.cs

+2-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using Microsoft.PowerShell.EditorServices.Services;
99
using Microsoft.PowerShell.EditorServices.Services.TextDocument;
1010
using Microsoft.PowerShell.EditorServices.Test;
11-
using Microsoft.PowerShell.EditorServices.Utility;
1211
using Xunit;
1312

1413
namespace PowerShellEditorServices.Test.Services.Symbols
@@ -66,10 +65,9 @@ public async Task CanLoadPSScriptAnalyzerAsync()
6665
});
6766
}
6867

69-
[SkippableFact]
68+
[Fact]
7069
public async Task DoesNotDuplicateScriptMarkersAsync()
7170
{
72-
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
7371
ScriptFile scriptFile = workspaceService.GetFileBuffer("untitled:Untitled-1", script);
7472
ScriptFile[] scriptFiles = { scriptFile };
7573

@@ -85,10 +83,9 @@ await analysisService
8583
Assert.Single(scriptFile.DiagnosticMarkers);
8684
}
8785

88-
[SkippableFact]
86+
[Fact]
8987
public async Task DoesNotClearParseErrorsAsync()
9088
{
91-
Skip.If(VersionUtils.PSEdition == "Core", "OmniSharp records are broken!");
9289
// Causing a missing closing } parser error
9390
ScriptFile scriptFile = workspaceService.GetFileBuffer("untitled:Untitled-2", script.TrimEnd('}'));
9491
ScriptFile[] scriptFiles = { scriptFile };

0 commit comments

Comments
 (0)