From 604006fd5a143d7b8ac8d25bf01ba36834aa977c Mon Sep 17 00:00:00 2001 From: Gen Lu Date: Thu, 10 Sep 2020 14:24:27 -0700 Subject: [PATCH] Simplify test parameter --- ...sionMethodImportCompletionProviderTests.cs | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/ExtensionMethodImportCompletionProviderTests.cs b/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/ExtensionMethodImportCompletionProviderTests.cs index e4e085abbef..8e37badef51 100644 --- a/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/ExtensionMethodImportCompletionProviderTests.cs +++ b/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/ExtensionMethodImportCompletionProviderTests.cs @@ -13,6 +13,7 @@ using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Test.Utilities; using Roslyn.Test.Utilities; +using Roslyn.Utilities; using Xunit; namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Completion.CompletionProviders @@ -1771,11 +1772,11 @@ public static void Bar(this Goo goo, int x) inlineDescription: "Foo"); } - [InlineData(ReferenceType.Project, true)] - [InlineData(ReferenceType.Metadata, false)] + [InlineData(ReferenceType.Project)] + [InlineData(ReferenceType.Metadata)] [Theory, Trait(Traits.Feature, Traits.Features.Completion)] [WorkItem(47551, "https://github.com/dotnet/roslyn/issues/47551")] - public async Task TestBrowsableNever(ReferenceType refType, bool shouldContainItem) + public async Task TestBrowsableNever(ReferenceType refType) { var srcDoc = @" class Program @@ -1802,11 +1803,11 @@ public static void Bar(this Goo goo, int x) } }"; - var markup = refType switch + var (markup, shouldContainItem) = refType switch { - ReferenceType.Project => CreateMarkupForProjectWithProjectReference(srcDoc, refDoc, LanguageNames.CSharp, LanguageNames.CSharp), - ReferenceType.Metadata => CreateMarkupForProjectWithMetadataReference(srcDoc, refDoc, LanguageNames.CSharp, LanguageNames.CSharp), - _ => null, + ReferenceType.Project => (CreateMarkupForProjectWithProjectReference(srcDoc, refDoc, LanguageNames.CSharp, LanguageNames.CSharp), true), + ReferenceType.Metadata => (CreateMarkupForProjectWithMetadataReference(srcDoc, refDoc, LanguageNames.CSharp, LanguageNames.CSharp), false), + _ => throw ExceptionUtilities.Unreachable, }; if (shouldContainItem) @@ -1826,13 +1827,13 @@ public static void Bar(this Goo goo, int x) } } - [InlineData(ReferenceType.Project, true, true)] - [InlineData(ReferenceType.Project, false, true)] - [InlineData(ReferenceType.Metadata, true, false)] - [InlineData(ReferenceType.Metadata, false, true)] + [InlineData(ReferenceType.Project, true)] + [InlineData(ReferenceType.Project, false)] + [InlineData(ReferenceType.Metadata, true)] + [InlineData(ReferenceType.Metadata, false)] [Theory, Trait(Traits.Feature, Traits.Features.Completion)] [WorkItem(47551, "https://github.com/dotnet/roslyn/issues/47551")] - public async Task TestBrowsableAdvanced(ReferenceType refType, bool hideAdvanced, bool shouldContainItem) + public async Task TestBrowsableAdvanced(ReferenceType refType, bool hideAdvanced) { HideAdvancedMembers = hideAdvanced; @@ -1861,11 +1862,12 @@ public static void Bar(this Goo goo, int x) } }"; - var markup = refType switch + var (markup, shouldContainItem) = (refType, hideAdvanced) switch { - ReferenceType.Project => CreateMarkupForProjectWithProjectReference(srcDoc, refDoc, LanguageNames.CSharp, LanguageNames.CSharp), - ReferenceType.Metadata => CreateMarkupForProjectWithMetadataReference(srcDoc, refDoc, LanguageNames.CSharp, LanguageNames.CSharp), - _ => null, + (ReferenceType.Project, _) => (CreateMarkupForProjectWithProjectReference(srcDoc, refDoc, LanguageNames.CSharp, LanguageNames.CSharp), true), + (ReferenceType.Metadata, true) => (CreateMarkupForProjectWithMetadataReference(srcDoc, refDoc, LanguageNames.CSharp, LanguageNames.CSharp), false), + (ReferenceType.Metadata, false) => (CreateMarkupForProjectWithMetadataReference(srcDoc, refDoc, LanguageNames.CSharp, LanguageNames.CSharp), true), + _ => throw ExceptionUtilities.Unreachable, }; if (shouldContainItem) -- GitLab