MSTEST0030: add codefix

Author: Evangelink

src/Analyzers/MSTest.Analyzers.CodeFixes/PublicTypeShouldBeTestClassFixer.cs src/Analyzers/MSTest.Analyzers.CodeFixes/AddTestClassFixer.cs

@@ -18,12 +18,14 @@
 
 namespace MSTest.Analyzers;
 
-[ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(PublicTypeShouldBeTestClassFixer))]
+[ExportCodeFixProvider(LanguageNames.CSharp, Name = nameof(AddTestClassFixer))]
 [Shared]
-public sealed class PublicTypeShouldBeTestClassFixer : CodeFixProvider
+public sealed class AddTestClassFixer : CodeFixProvider
 {
     public sealed override ImmutableArray<string> FixableDiagnosticIds { get; }
-        = ImmutableArray.Create(DiagnosticIds.PublicTypeShouldBeTestClassRuleId);
+        = ImmutableArray.Create(
+            DiagnosticIds.PublicTypeShouldBeTestClassRuleId,
+            DiagnosticIds.TypeContainingTestMethodShouldBeATestClassRuleId);
 
     public override FixAllProvider GetFixAllProvider()
         // See https://github.com/dotnet/roslyn/blob/main/docs/analyzers/FixAllProvider.md for more information on Fix All Providers
@@ -49,7 +51,7 @@ public override async Task RegisterCodeFixesAsync(CodeFixContext context)
             CodeAction.Create(
                 title: CodeFixResources.PublicTypeShouldBeTestClassFix,
                 createChangedDocument: c => AddTestClassAttributeAsync(context.Document, declaration, c),
-                equivalenceKey: nameof(PublicTypeShouldBeTestClassFixer)),
+                equivalenceKey: nameof(AddTestClassFixer)),
             diagnostic);
     }
 

test/UnitTests/MSTest.Analyzers.UnitTests/PublicTypeShouldBeTestClassAnalyzerTests.cs

@@ -3,7 +3,7 @@
 
 using VerifyCS = MSTest.Analyzers.Test.CSharpCodeFixVerifier<
     MSTest.Analyzers.PublicTypeShouldBeTestClassAnalyzer,
-    MSTest.Analyzers.PublicTypeShouldBeTestClassFixer>;
+    MSTest.Analyzers.AddTestClassFixer>;
 
 namespace MSTest.Analyzers.UnitTests;
 

test/UnitTests/MSTest.Analyzers.UnitTests/TypeContainingTestMethodShouldBeATestClassAnalyzer.cs

@@ -3,7 +3,7 @@
 
 using VerifyCS = MSTest.Analyzers.Test.CSharpCodeFixVerifier<
     MSTest.Analyzers.TypeContainingTestMethodShouldBeATestClassAnalyzer,
-    Microsoft.CodeAnalysis.Testing.EmptyCodeFixProvider>;
+    MSTest.Analyzers.AddTestClassFixer>;
 
 namespace MSTest.Analyzers.Test;
 
@@ -42,7 +42,18 @@ public void TestMethod1() {}
             }
             """;
 
-        await VerifyCS.VerifyAnalyzerAsync(code);
+        string fixedCode = """
+            using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+            [TestClass]
+            public class MyTestClass
+            {
+                [TestMethod]
+                public void TestMethod1() {}
+            }
+            """;
+
+        await VerifyCS.VerifyCodeFixAsync(code, fixedCode);
     }
 
     [TestMethod]
@@ -71,7 +82,31 @@ public void TestMethod2()
             }
             """;
 
-        await VerifyCS.VerifyAnalyzerAsync(code);
+        string fixedCode = """
+            using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+            [TestClass]
+            public class MyTestClass : WithTestMethods_WithoutTestClass
+            {
+
+            }
+
+            [TestClass]
+            public class WithTestMethods_WithoutTestClass
+            {
+                [TestMethod]
+                public void TestMethod1()
+                {
+                }
+
+                [TestMethod]
+                public void TestMethod2()
+                {
+                }
+            }
+            """;
+
+        await VerifyCS.VerifyCodeFixAsync(code, fixedCode);
     }
 
     [TestMethod]
@@ -100,7 +135,31 @@ public void TestMethod2()
             }
             """;
 
-        await VerifyCS.VerifyAnalyzerAsync(code);
+        string fixedCode = """
+            using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+            [TestClass]
+            public class Base
+            {
+
+            }
+
+            [TestClass]
+            public class MyTestClass : Base
+            {
+                [TestMethod]
+                public void TestMethod1()
+                {
+                }
+
+                [TestMethod]
+                public void TestMethod2()
+                {
+                }
+            }
+            """;
+
+        await VerifyCS.VerifyCodeFixAsync(code, fixedCode);
     }
 
     [TestMethod]
@@ -149,7 +208,24 @@ public void MyTestMethod()
             }
             """;
 
-        await VerifyCS.VerifyAnalyzerAsync(code);
+        string fixedCode = """
+            using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+            public class DerivedTestMethod : TestMethodAttribute
+            {
+            }
+
+            [TestClass]
+            public class MyTestClass
+            {
+                [DerivedTestMethod]
+                public void MyTestMethod()
+                {
+                }
+            }
+            """;
+
+        await VerifyCS.VerifyCodeFixAsync(code, fixedCode);
     }
 
     [TestMethod]
@@ -192,6 +268,26 @@ public void TestMethod1()
             }
             """;
 
-        await VerifyCS.VerifyAnalyzerAsync(code);
+        string fixedCode = """
+            using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+            [TestClass]
+            public class TestClass
+            {
+                [TestInitialize]
+                public void Initialize()
+                {
+
+                }
+
+                [TestMethod]
+                public void TestMethod1()
+                {
+
+                }
+            }
+            """;
+
+        await VerifyCS.VerifyCodeFixAsync(code, fixedCode);
     }
 }