Merge pull request #73316 from CyrusNajmabadi/testConsistency

dotnet · May 3, 2024 · 9d2df1a · 9d2df1a
2 parents d39c195 + d9ea1fb
commit 9d2df1a
Show file tree

Hide file tree

Showing 97 changed files with 881 additions and 1,760 deletions.
diff --git a/...p/Tests/RemoveUnnecessaryNullableDirective/CSharpRemoveRedundantNullableDirectiveTests.cs b/...p/Tests/RemoveUnnecessaryNullableDirective/CSharpRemoveRedundantNullableDirectiveTests.cs
@@ -122,8 +122,7 @@ class Program
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestRedundantRestoreDiffersFromPriorContext(NullableContextOptions compilationContext)
         {
             var enable = compilationContext != NullableContextOptions.Enable;
@@ -146,8 +145,7 @@ class Program
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestRedundantRestoreMatchesCompilation(NullableContextOptions compilationContext)
         {
             await VerifyCodeFixAsync(

diff --git a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs
@@ -2180,8 +2180,7 @@ class MyClass
                 """);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task MultipleFields_AllUnused_FixOne(
             [CombinatorialValues("[|_goo|]", "[|_goo|] = 0")] string firstField,
             [CombinatorialValues("[|_bar|]", "[|_bar|] = 2")] string secondField,

diff --git a/...nalyzers/CSharp/Tests/RemoveUnusedParametersAndValues/RemoveUnusedValueAssignmentTests.cs b/...nalyzers/CSharp/Tests/RemoveUnusedParametersAndValues/RemoveUnusedValueAssignmentTests.cs
@@ -496,8 +496,7 @@ int M(int {|IDE0060:p|})
             }.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Initialization_NonConstantValue_LocalReference(
             [CombinatorialValues(UnusedValuePreference.DiscardVariable, UnusedValuePreference.UnusedLocalVariable)] object option,
             [CombinatorialValues(CodeFixTestBehaviors.None, CodeFixTestBehaviors.FixOne)] CodeFixTestBehaviors testBehaviors)
@@ -557,8 +556,7 @@ int M()
             }.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task Assignment_NonConstantValue_LocalReference(
             [CombinatorialValues(UnusedValuePreference.DiscardVariable, UnusedValuePreference.UnusedLocalVariable)] object option,
             [CombinatorialValues(CodeFixTestBehaviors.None, CodeFixTestBehaviors.FixOne)] CodeFixTestBehaviors testBehaviors)
@@ -1115,8 +1113,7 @@ public static explicit operator C(int {|IDE0060:i|})
             }.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task NestedAssignment_ConstantValue(
             [CombinatorialValues(UnusedValuePreference.DiscardVariable, UnusedValuePreference.UnusedLocalVariable)] object option,
             [CombinatorialValues(CodeFixTestBehaviors.None, CodeFixTestBehaviors.FixOne | CodeFixTestBehaviors.SkipFixAllCheck)] CodeFixTestBehaviors testBehaviors)
@@ -1195,8 +1192,7 @@ int M(int {|IDE0060:x|}, int {|IDE0060:y|})
             await test.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task NestedAssignment_NonConstantValue(
             [CombinatorialValues(UnusedValuePreference.DiscardVariable, UnusedValuePreference.UnusedLocalVariable)] object option,
             [CombinatorialValues(CodeFixTestBehaviors.None, CodeFixTestBehaviors.FixOne | CodeFixTestBehaviors.SkipFixAllCheck)] CodeFixTestBehaviors testBehaviors)
@@ -1329,8 +1325,7 @@ int M()
             }.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task IncrementOrDecrementOperator_ValueUsed_SameStatement(
             [CombinatorialValues("++", "--")] string @operator,
             bool applyAsPrefix,
@@ -1384,8 +1379,7 @@ void M(int x)
             await test.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task IncrementOrDecrementOperator_ValueUsed_LaterStatement(
             [CombinatorialValues("++", "--")] string @operator,
             bool applyAsPrefix,
@@ -1415,8 +1409,7 @@ int M(int x)
             }.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task IncrementOrDecrementOperator_ValueUnused(
             [CombinatorialValues("++", "--")] string @operator,
             bool applyAsPrefix,
@@ -1454,8 +1447,7 @@ void M(int {|IDE0060:x|})
             }.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task CompoundAssignmentOperator_ValueUsed_SameStatement(
             [CombinatorialValues("1" /*Constant*/, "M2()" /*Non-constant*/)] string rightHandSide,
             [CombinatorialValues(UnusedValuePreference.DiscardVariable, UnusedValuePreference.UnusedLocalVariable)] object option)
@@ -1511,8 +1503,7 @@ void M(int x)
             await test.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task CompoundAssignmentOperator_ValueUsed_LaterStatement(
             [CombinatorialValues("1" /*Constant*/, "M2()" /*Non-constant*/)] string rightHandSide,
             [CombinatorialValues(UnusedValuePreference.DiscardVariable, UnusedValuePreference.UnusedLocalVariable)] object option)
@@ -1542,8 +1533,7 @@ int M(int x)
             }.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task CompoundLogicalOrOperator_ValueUsed_LaterStatement(
             [CombinatorialValues("true" /*Constant*/, "M2()" /*Non-constant*/)] string rightHandSide,
             [CombinatorialValues(UnusedValuePreference.DiscardVariable, UnusedValuePreference.UnusedLocalVariable)] object option)
@@ -1573,8 +1563,7 @@ bool M(bool x)
             }.RunAsync();
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task CompoundLogicalOrOperator_ValueUsed_LaterStatement_02(
             [CombinatorialValues("true" /*Constant*/, "M2()" /*Non-constant*/)] string rightHandSide,
             [CombinatorialValues(UnusedValuePreference.DiscardVariable, UnusedValuePreference.UnusedLocalVariable)] object option)
@@ -2781,8 +2770,7 @@ void M(object p)
                 """, options: PreferDiscard, parseOptions: new CSharpParseOptions(LanguageVersion.CSharp9));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task DeclarationPatternInSwitchCase_WithOnlyWriteReference_PreferUnusedLocal(
             [CombinatorialValues(LanguageVersion.CSharp8, LanguageVersion.CSharp9)] LanguageVersion languageVersion)
         {
@@ -2803,8 +2791,7 @@ void M(object p)
                 """, new TestParameters(options: PreferUnusedLocal, parseOptions: new CSharpParseOptions(languageVersion)));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task DeclarationPatternInSwitchCase_WithOnlyWriteReference_TypePattern(
             [CombinatorialValues(CodeFixTestBehaviors.None, CodeFixTestBehaviors.FixOne)] CodeFixTestBehaviors testBehaviors)
         {

diff --git a/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests.cs b/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests.cs
@@ -6374,8 +6374,7 @@ static void Main(string[] args)
         /// Note that this test verifies the current end of line sequence in using directives is preserved regardless of
         /// whether this matches the end_of_line value in .editorconfig or not.
         /// </summary>
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/62976")]
         public async Task TestAddUsingPreservesNewlines1(TestHost testHost, [CombinatorialValues("\n", "\r\n")] string sourceNewLine, [CombinatorialValues("\n", "\r\n")] string configuredNewLine)
         {
@@ -6418,8 +6417,7 @@ class Class
         /// Note that this test verifies the current end of line sequence in using directives is preserved regardless of
         /// whether this matches the end_of_line value in .editorconfig or not.
         /// </summary>
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/62976")]
         public async Task TestAddUsingPreservesNewlines2(TestHost testHost, [CombinatorialValues("\n", "\r\n")] string sourceNewLine, [CombinatorialValues("\n", "\r\n")] string configuredNewLine)
         {
@@ -6473,8 +6471,7 @@ class Class
                 parameters: new TestParameters(options: Option(FormattingOptions2.NewLine, configuredNewLine), testHost: testHost));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/62976")]
         public async Task TestAddUsingPreservesNewlines3(TestHost testHost, [CombinatorialValues("\n", "\r\n")] string sourceNewLine, [CombinatorialValues("\n", "\r\n")] string configuredNewLine)
         {
@@ -6528,8 +6525,7 @@ class Class
                 parameters: new TestParameters(options: Option(FormattingOptions2.NewLine, configuredNewLine), testHost: testHost));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/24642")]
         public async Task TestAddUsingWithMalformedGeneric(TestHost testHost)
         {
@@ -6552,8 +6548,7 @@ class Class
                 parameters: new TestParameters(testHost: testHost));
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestOutsideOfMethodWithMalformedGenericParameters(TestHost testHost)
         {
             await TestInRegularAndScript1Async(

diff --git a/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests_ExtensionMethods.cs b/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests_ExtensionMethods.cs
@@ -1107,8 +1107,7 @@ public static void Deconstruct(this Program p, out int x, out int y) { }
 parseOptions: null);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/16547")]
         public async Task TestAddUsingForAddExtensionMethodWithSameNameAsProperty(TestHost testHost)
         {
@@ -1171,8 +1170,7 @@ public static Foo Self(this Foo foo)
 }", testHost);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/39155")]
         public async Task TestExtensionGetAwaiterOverload(TestHost testHost)
         {
@@ -1262,8 +1260,7 @@ public void GetResult()
 ", testHost);
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         [WorkItem("https://github.com/dotnet/roslyn/issues/39155")]
         public async Task TestExtensionSelectOverload(TestHost testHost)
         {

diff --git a/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests_Razor.cs b/src/EditorFeatures/CSharpTest/CodeActions/AddUsing/AddUsingTests_Razor.cs
@@ -14,8 +14,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.AddUsing
     [Trait(Traits.Feature, Traits.Features.CodeActionsAddImport)]
     public partial class AddUsingTests_Razor : AbstractAddUsingTests
     {
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestAddIntoHiddenRegionWithModernSpanMapper(TestHost host)
         {
             await TestAsync(

diff --git a/...rFeatures/CSharpTest/Completion/ArgumentProviders/ContextVariableArgumentProviderTests.cs b/...rFeatures/CSharpTest/Completion/ArgumentProviders/ContextVariableArgumentProviderTests.cs
@@ -41,8 +41,7 @@ void Target({type} arg)
             await VerifyDefaultValueAsync(markup, expectedDefaultValue: null, previousDefaultValue: "prior");
         }
 
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TestOutVariable(
             [CombinatorialValues("string", "bool", "int?")] string type,
             [CombinatorialValues("out", "ref", "in")] string modifier)

diff --git a/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTrackingServiceTests.cs b/src/EditorFeatures/CSharpTest/EditAndContinue/ActiveStatementTrackingServiceTests.cs
@@ -22,8 +22,7 @@ namespace Microsoft.CodeAnalysis.CSharp.EditAndContinue.UnitTests
     [UseExportProvider]
     public class ActiveStatementTrackingServiceTests
     {
-        [Theory]
-        [CombinatorialData]
+        [Theory, CombinatorialData]
         public async Task TrackingService_GetLatestSpansAsync(bool scheduleInitialTrackingBeforeOpenDoc)
         {
             var source1 = "class C { void F() => G(1); void G(int a) => System.Console.WriteLine(1); }";