dotnet · josefpihrt · Oct 18, 2023 · Oct 1, 2023 · Oct 1, 2023 · Oct 1, 2023
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -20,6 +20,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Bump Roslyn to 4.7.0 ([#1218](https://github.com/dotnet/roslynator/pull/1218)).
   - Applies to CLI and testing library. 
 - Bump Microsoft.Build.Locator to 1.6.1 ([#1194](https://github.com/josefpihrt/roslynator/pull/1194))
+- Improve testing framework ([#1214](https://github.com/dotnet/roslynator/pull/1214))
+  - Add methods to `DiagnosticVerifier`, `RefactoringVerifier` and `CompilerDiagnosticFixVerifier`.
+  - Add property `DiagnosticVerifier.Descriptor` (BREAKING CHANGE).
+  - Add property `CompilerDiagnosticFixVerifier.DiagnosticId` (BREAKING CHANGE).
+  - Make property `DiagnosticTestData.Descriptor` obsolete.
+  - Make property `CompilerDiagnosticFixTestData.DiagnosticId` obsolete.
 
 ### Fixed
 

diff --git a/src/Tests/Analyzers.Tests/RCS1046AsynchronousMethodNameShouldEndWithAsyncTests.cs b/src/Tests/Analyzers.Tests/RCS1046AsynchronousMethodNameShouldEndWithAsyncTests.cs
@@ -8,7 +8,7 @@
 
 namespace Roslynator.CSharp.Analysis.Tests;
 
-public class RCS1046AsynchronousMethodNameShouldEndWithAsyncTests : AbstractCSharpDiagnosticVerifier<AsyncSuffixAnalyzer, DummyCodeFixProvider>
+public class RCS1046AsynchronousMethodNameShouldEndWithAsyncTests : AbstractCSharpDiagnosticVerifier<AsyncSuffixAnalyzer, EmptyCodeFixProvider>
 {
     public override DiagnosticDescriptor Descriptor { get; } = DiagnosticRules.AsynchronousMethodNameShouldEndWithAsync;
 

diff --git a/src/Tests/Analyzers.Tests/RCS1047NonAsynchronousMethodNameShouldNotEndWithAsyncTests.cs b/src/Tests/Analyzers.Tests/RCS1047NonAsynchronousMethodNameShouldNotEndWithAsyncTests.cs
@@ -8,7 +8,7 @@
 
 namespace Roslynator.CSharp.Analysis.Tests;
 
-public class RCS1047NonAsynchronousMethodNameShouldNotEndWithAsyncTests : AbstractCSharpDiagnosticVerifier<AsyncSuffixAnalyzer, DummyCodeFixProvider>
+public class RCS1047NonAsynchronousMethodNameShouldNotEndWithAsyncTests : AbstractCSharpDiagnosticVerifier<AsyncSuffixAnalyzer, EmptyCodeFixProvider>
 {
     public override DiagnosticDescriptor Descriptor { get; } = DiagnosticRules.NonAsynchronousMethodNameShouldNotEndWithAsync;
 

diff --git a/src/Tests/Analyzers.Tests/RCS1061MergeIfWithNestedIfTests.cs b/src/Tests/Analyzers.Tests/RCS1061MergeIfWithNestedIfTests.cs
@@ -8,7 +8,7 @@
 
 namespace Roslynator.CSharp.Analysis.Tests;
 
-public class RCS061MergeIfWithNestedIfTests : AbstractCSharpDiagnosticVerifier<MergeIfWithNestedIfAnalyzer, IfStatementCodeFixProvider>
+public class RCS1061MergeIfWithNestedIfTests : AbstractCSharpDiagnosticVerifier<MergeIfWithNestedIfAnalyzer, IfStatementCodeFixProvider>
 {
     public override DiagnosticDescriptor Descriptor => DiagnosticRules.MergeIfWithNestedIf;
 

diff --git a/src/Tests/Analyzers.Tests/RCS1207ConvertMethodGroupToAnonymousFunctionTests.cs b/src/Tests/Analyzers.Tests/RCS1207ConvertMethodGroupToAnonymousFunctionTests.cs
@@ -596,6 +596,6 @@ void M2(Func<object> p)
         M2(M);
     }
 }
-", options: Options.AddConfigOption(ConfigOptionKeys.UseAnonymousFunctionOrMethodGroup, ConfigOptionValues.UseAnonymousFunctionOrMethodGroup_MethodGroup));
+", options: Options.SetConfigOption(ConfigOptionKeys.UseAnonymousFunctionOrMethodGroup, ConfigOptionValues.UseAnonymousFunctionOrMethodGroup_MethodGroup));
     }
 }
diff --git a/src/Tests/Analyzers.Tests/ROS002AnalyzerOptionIsObsoleteTests.cs b/src/Tests/Analyzers.Tests/ROS002AnalyzerOptionIsObsoleteTests.cs
@@ -8,7 +8,7 @@
 
 namespace Roslynator.CSharp.Analysis.Tests;
 
-public class ROS0002AnalyzerOptionIsObsoleteTests : AbstractCSharpDiagnosticVerifier<AnalyzerOptionIsObsoleteAnalyzer, DummyCodeFixProvider>
+public class ROS0002AnalyzerOptionIsObsoleteTests : AbstractCSharpDiagnosticVerifier<AnalyzerOptionIsObsoleteAnalyzer, EmptyCodeFixProvider>
 {
     public override DiagnosticDescriptor Descriptor { get; } = CommonDiagnosticRules.AnalyzerOptionIsObsolete;
 

diff --git a/src/Tests/Analyzers.Tests/UnitTests/PatternMatchingVariableDeclarationHelperTests.cs b/src/Tests/Analyzers.Tests/UnitTests/PatternMatchingVariableDeclarationHelperTests.cs
@@ -7,7 +7,7 @@
 using Roslynator.CSharp.Analysis;
 using Xunit;
 
-namespace Roslynator.Analyzers.Tests.UnitTests;
+namespace Roslynator.CSharp.Analysis.Tests;
 
 public class PatternMatchingVariableDeclarationHelperTests
 {

diff --git a/src/Tests/Analyzers.Tests/_RCSTests.cs b/src/Tests/Analyzers.Tests/_RCSTests.cs
diff --git a/src/Tests/CodeAnalysis.Analyzers.Tests/_RCSTests.cs b/src/Tests/CodeAnalysis.Analyzers.Tests/_RCSTests.cs
diff --git a/src/Tests/CodeFixes.Tests/_CSTests.cs b/src/Tests/CodeFixes.Tests/_CSTests.cs
diff --git a/src/Tests/Formatting.Analyzers.Tests/RCS0053FixFormattingOfListTests.cs b/src/Tests/Formatting.Analyzers.Tests/RCS0053FixFormattingOfListTests.cs
@@ -621,7 +621,7 @@ void M(object x, string y)
 				.ToString());
 	}
 }
-", options: Options.AddConfigOption("indent_style", "tab"));
+", options: Options.SetConfigOption("indent_style", "tab"));
     }
 
     [Fact, Trait(Traits.Analyzer, DiagnosticIdentifiers.FixFormattingOfList)]
-Original file line number
+Diff line change
@@ Expand Up / @@ -596,6 +596,6 @@ void M2(Func<object> p) @@
             M2(M);
         }
     }
-    ", options: Options.AddConfigOption(ConfigOptionKeys.UseAnonymousFunctionOrMethodGroup, ConfigOptionValues.UseAnonymousFunctionOrMethodGroup_MethodGroup));
+    ", options: Options.SetConfigOption(ConfigOptionKeys.UseAnonymousFunctionOrMethodGroup, ConfigOptionValues.UseAnonymousFunctionOrMethodGroup_MethodGroup));
         }
     }