From 4941c8a410ac831ea90a13729f0f9b006280d3eb Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Wed, 11 Nov 2015 00:28:58 -0800 Subject: [PATCH] Make more tests async. --- .../AbstractChangeSignatureTests.cs | 2 +- .../AbstractCodeActionOrUserDiagnosticTest.cs | 14 +++++++------- .../Test/Diagnostics/AbstractUserDiagnosticTest.cs | 4 ++-- .../CSharpSuppressionCodeFixProvider.cs | 4 ++-- ...eFixProvider.GlobalSuppressMessageCodeAction.cs | 2 +- ...ovider.GlobalSuppressMessageFixAllCodeAction.cs | 2 +- .../AbstractSuppressionCodeFixProvider.cs | 2 +- .../VisualBasicSuppressionCodeFixProvider.vb | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/EditorFeatures/Test/ChangeSignature/AbstractChangeSignatureTests.cs b/src/EditorFeatures/Test/ChangeSignature/AbstractChangeSignatureTests.cs index 8f86d8d0703..99cea9319ed 100644 --- a/src/EditorFeatures/Test/ChangeSignature/AbstractChangeSignatureTests.cs +++ b/src/EditorFeatures/Test/ChangeSignature/AbstractChangeSignatureTests.cs @@ -40,7 +40,7 @@ protected override ParseOptions GetScriptOptions() optionsService.UpdatedSignature = updatedSignature; var codeIssueOrRefactoring = GetCodeRefactoring(workspace); - TestActions(workspace, expectedCode, index, codeIssueOrRefactoring.Actions.ToList(), + await TestActionsAsync(workspace, expectedCode, index, codeIssueOrRefactoring.Actions.ToList(), conflictSpans: null, renameSpans: null, warningSpans: null, compareTokens: true); } } diff --git a/src/EditorFeatures/Test/CodeActions/AbstractCodeActionOrUserDiagnosticTest.cs b/src/EditorFeatures/Test/CodeActions/AbstractCodeActionOrUserDiagnosticTest.cs index 6d46fb0df4f..e85f2d5a040 100644 --- a/src/EditorFeatures/Test/CodeActions/AbstractCodeActionOrUserDiagnosticTest.cs +++ b/src/EditorFeatures/Test/CodeActions/AbstractCodeActionOrUserDiagnosticTest.cs @@ -193,7 +193,7 @@ protected async Task> GetCodeActionsAsync(TestWorkspace worksp ApplyOptionsToWorkspace(workspace, options); var actions = await GetCodeActionsAsync(workspace, fixAllActionEquivalenceKey); - TestActions( + await TestActionsAsync( workspace, expected, index, actions, conflictSpans, renameSpans, warningSpans, @@ -201,14 +201,14 @@ protected async Task> GetCodeActionsAsync(TestWorkspace worksp } } - protected Tuple TestActions( + protected Task> TestActionsAsync( TestWorkspace workspace, string expected, int index, IList actions, IList conflictSpans, IList renameSpans, IList warningSpans, bool compareTokens) { var operations = VerifyInputsAndGetOperations(index, actions); - return TestOperations(workspace, expected, operations.ToList(), conflictSpans, renameSpans, warningSpans, compareTokens, expectedChangedDocumentId: null); + return TestOperationsAsync(workspace, expected, operations.ToList(), conflictSpans, renameSpans, warningSpans, compareTokens, expectedChangedDocumentId: null); } private static bool IsWorkspaceElement(string text) @@ -216,7 +216,7 @@ private static bool IsWorkspaceElement(string text) return text.TrimStart('\r', '\n', ' ').StartsWith("", StringComparison.Ordinal); } - protected Tuple TestOperations( + protected async Task> TestOperationsAsync( TestWorkspace workspace, string expectedText, IList operations, @@ -232,7 +232,7 @@ private static bool IsWorkspaceElement(string text) if (IsWorkspaceElement(expectedText)) { - VerifyAgainstWorkspaceDefinition(expectedText, newSolution); + await VerifyAgainstWorkspaceDefinitionAsync(expectedText, newSolution); return Tuple.Create(oldSolution, newSolution); } @@ -277,9 +277,9 @@ private static Document GetDocumentToVerify(DocumentId expectedChangedDocumentId return document; } - private static void VerifyAgainstWorkspaceDefinition(string expectedText, Solution newSolution) + private static async Task VerifyAgainstWorkspaceDefinitionAsync(string expectedText, Solution newSolution) { - using (var expectedWorkspace = TestWorkspaceFactory.CreateWorkspace(expectedText)) + using (var expectedWorkspace = await TestWorkspaceFactory.CreateWorkspaceAsync(expectedText)) { var expectedSolution = expectedWorkspace.CurrentSolution; Assert.Equal(expectedSolution.Projects.Count(), newSolution.Projects.Count()); diff --git a/src/EditorFeatures/Test/Diagnostics/AbstractUserDiagnosticTest.cs b/src/EditorFeatures/Test/Diagnostics/AbstractUserDiagnosticTest.cs index 3ef5912623c..63968f14d1b 100644 --- a/src/EditorFeatures/Test/Diagnostics/AbstractUserDiagnosticTest.cs +++ b/src/EditorFeatures/Test/Diagnostics/AbstractUserDiagnosticTest.cs @@ -401,7 +401,7 @@ protected async Task TestEquivalenceKeyAsync(string initialMarkup, string equiva if (!isNewFile) { - oldSolutionAndNewSolution = TestOperations( + oldSolutionAndNewSolution = await TestOperationsAsync( testState.Workspace, expected, operations, conflictSpans: null, renameSpans: null, warningSpans: null, compareTokens: false, expectedChangedDocumentId: testState.ExistingDocument.Id); @@ -422,7 +422,7 @@ protected async Task TestEquivalenceKeyAsync(string initialMarkup, string equiva if (checkIfUsingsIncluded) { Assert.NotNull(expectedTextWithUsings); - TestOperations(testState.Workspace, expectedTextWithUsings, operations, + await TestOperationsAsync(testState.Workspace, expectedTextWithUsings, operations, conflictSpans: null, renameSpans: null, warningSpans: null, compareTokens: false, expectedChangedDocumentId: testState.InvocationDocument.Id); } diff --git a/src/Features/CSharp/Portable/CodeFixes/Suppression/CSharpSuppressionCodeFixProvider.cs b/src/Features/CSharp/Portable/CodeFixes/Suppression/CSharpSuppressionCodeFixProvider.cs index ceffcb8a83d..9d3a854301b 100644 --- a/src/Features/CSharp/Portable/CodeFixes/Suppression/CSharpSuppressionCodeFixProvider.cs +++ b/src/Features/CSharp/Portable/CodeFixes/Suppression/CSharpSuppressionCodeFixProvider.cs @@ -95,7 +95,7 @@ protected override bool IsEndOfFileToken(SyntaxToken token) return token.Kind() == SyntaxKind.EndOfFileToken; } - protected override SyntaxNode AddGlobalSuppressMessageAttribute(SyntaxNode newRoot, ISymbol targetSymbol, Diagnostic diagnostic, Workspace workspace, CancellationToken cancellationToken) + protected override async Task AddGlobalSuppressMessageAttributeAsync(SyntaxNode newRoot, ISymbol targetSymbol, Diagnostic diagnostic, Workspace workspace, CancellationToken cancellationToken) { var compilationRoot = (CompilationUnitSyntax)newRoot; var isFirst = !compilationRoot.AttributeLists.Any(); @@ -103,7 +103,7 @@ protected override SyntaxNode AddGlobalSuppressMessageAttribute(SyntaxNode newRo SyntaxFactory.TriviaList(SyntaxFactory.Comment(GlobalSuppressionsFileHeaderComment)) : default(SyntaxTriviaList); var attributeList = CreateAttributeList(targetSymbol, diagnostic, leadingTrivia: leadingTriviaForAttributeList, needsLeadingEndOfLine: !isFirst); - attributeList = (AttributeListSyntax)Formatter.Format(attributeList, workspace, cancellationToken: cancellationToken); + attributeList = (AttributeListSyntax)await Formatter.FormatAsync(attributeList, workspace, cancellationToken: cancellationToken).ConfigureAwait(false); return compilationRoot.AddAttributeLists(attributeList); } diff --git a/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.GlobalSuppressMessageCodeAction.cs b/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.GlobalSuppressMessageCodeAction.cs index b7e2d5da839..c5e4143ac9f 100644 --- a/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.GlobalSuppressMessageCodeAction.cs +++ b/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.GlobalSuppressMessageCodeAction.cs @@ -26,7 +26,7 @@ protected override async Task GetChangedSuppressionDocumentAsync(Cance var workspace = suppressionsDoc.Project.Solution.Workspace; var suppressionsRoot = await suppressionsDoc.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false); var semanticModel = await suppressionsDoc.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false); - suppressionsRoot = Fixer.AddGlobalSuppressMessageAttribute(suppressionsRoot, _targetSymbol, _diagnostic, workspace, cancellationToken); + suppressionsRoot = await Fixer.AddGlobalSuppressMessageAttributeAsync(suppressionsRoot, _targetSymbol, _diagnostic, workspace, cancellationToken).ConfigureAwait(false); return suppressionsDoc.WithSyntaxRoot(suppressionsRoot); } diff --git a/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.GlobalSuppressMessageFixAllCodeAction.cs b/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.GlobalSuppressMessageFixAllCodeAction.cs index c6680b568f7..5eb6e257a0a 100644 --- a/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.GlobalSuppressMessageFixAllCodeAction.cs +++ b/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.GlobalSuppressMessageFixAllCodeAction.cs @@ -106,7 +106,7 @@ protected override async Task GetChangedSuppressionDocumentAsync(Cance foreach (var diagnostic in diagnostics) { Contract.ThrowIfFalse(!diagnostic.IsSuppressed); - suppressionsRoot = Fixer.AddGlobalSuppressMessageAttribute(suppressionsRoot, targetSymbol, diagnostic, workspace, cancellationToken); + suppressionsRoot = await Fixer.AddGlobalSuppressMessageAttributeAsync(suppressionsRoot, targetSymbol, diagnostic, workspace, cancellationToken).ConfigureAwait(false); } } diff --git a/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.cs b/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.cs index 092258de8ba..c8e3e0ad625 100644 --- a/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.cs +++ b/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.cs @@ -42,7 +42,7 @@ public bool CanBeSuppressedOrUnsuppressed(Diagnostic diagnostic) protected abstract Task CreatePragmaDisableDirectiveTriviaAsync(Diagnostic diagnostic, Func> formatNode, bool needsLeadingEndOfLine, bool needsTrailingEndOfLine); protected abstract Task CreatePragmaRestoreDirectiveTriviaAsync(Diagnostic diagnostic, Func> formatNode, bool needsLeadingEndOfLine, bool needsTrailingEndOfLine); - protected abstract SyntaxNode AddGlobalSuppressMessageAttribute(SyntaxNode newRoot, ISymbol targetSymbol, Diagnostic diagnostic, Workspace workspace, CancellationToken cancellationToken); + protected abstract Task AddGlobalSuppressMessageAttributeAsync(SyntaxNode newRoot, ISymbol targetSymbol, Diagnostic diagnostic, Workspace workspace, CancellationToken cancellationToken); protected abstract string DefaultFileExtension { get; } protected abstract string SingleLineCommentStart { get; } diff --git a/src/Features/VisualBasic/Portable/CodeFixes/Suppression/VisualBasicSuppressionCodeFixProvider.vb b/src/Features/VisualBasic/Portable/CodeFixes/Suppression/VisualBasicSuppressionCodeFixProvider.vb index af184d669fd..5eca42f978e 100644 --- a/src/Features/VisualBasic/Portable/CodeFixes/Suppression/VisualBasicSuppressionCodeFixProvider.vb +++ b/src/Features/VisualBasic/Portable/CodeFixes/Suppression/VisualBasicSuppressionCodeFixProvider.vb @@ -119,7 +119,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeFixes.Suppression Return token.Kind = SyntaxKind.EndOfFileToken End Function - Protected Overrides Function AddGlobalSuppressMessageAttribute(newRoot As SyntaxNode, targetSymbol As ISymbol, diagnostic As Diagnostic, workspace As Workspace, cancellationToken As CancellationToken) As SyntaxNode + Protected Overrides Async Function AddGlobalSuppressMessageAttributeAsync(newRoot As SyntaxNode, targetSymbol As ISymbol, diagnostic As Diagnostic, workspace As Workspace, cancellationToken As CancellationToken) As Task(Of SyntaxNode) Dim compilationRoot = DirectCast(newRoot, CompilationUnitSyntax) Dim isFirst = Not compilationRoot.Attributes.Any() Dim attributeList = CreateAttributeList(targetSymbol, diagnostic) @@ -130,7 +130,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeFixes.Suppression attributeStatement = attributeStatement.WithLeadingTrivia(attributeStatement.GetLeadingTrivia.Add(SyntaxFactory.ElasticCarriageReturnLineFeed)) End If - attributeStatement = CType(Formatter.Format(attributeStatement, workspace, cancellationToken:=cancellationToken), AttributesStatementSyntax) + attributeStatement = CType(Await Formatter.FormatAsync(attributeStatement, workspace, cancellationToken:=cancellationToken).ConfigureAwait(False), AttributesStatementSyntax) Dim leadingTrivia = If(isFirst AndAlso Not compilationRoot.HasLeadingTrivia, SyntaxFactory.TriviaList(SyntaxFactory.CommentTrivia(GlobalSuppressionsFileHeaderComment)), -- GitLab