ClassCleanup are not executed if testclass is ignored (#3142)

Author: Evangelink

src/Adapter/MSTest.TestAdapter/Execution/TestClassInfo.cs

@@ -476,22 +476,24 @@ internal void ExecuteClassCleanup()
         lock (_testClassExecuteSyncObject)
         {
             if (IsClassCleanupExecuted
+                // If there is a ClassInitialize method and it has not been executed, then we should not execute ClassCleanup
                 || (!IsClassInitializeExecuted && ClassInitializeMethod is not null))
             {
                 return;
             }
 
             try
             {
-                classCleanupMethod = ClassCleanupMethod;
-                ClassCleanupException = classCleanupMethod is not null
-                    ? InvokeCleanupMethod(classCleanupMethod, BaseClassCleanupMethodsStack.Count)
-                    : null;
-                var baseClassCleanupQueue = new Queue<MethodInfo>(BaseClassCleanupMethodsStack);
-                while (baseClassCleanupQueue.Count > 0 && ClassCleanupException is null)
+                IEnumerable<MethodInfo> cleanupMethods = (ClassCleanupMethod is null ? Array.Empty<MethodInfo>() : [ClassCleanupMethod]).Union(BaseClassCleanupMethodsStack);
+                var classCleanupQueue = new Queue<MethodInfo>(cleanupMethods);
+
+                while (classCleanupQueue.Count > 0 && ClassCleanupException is null)
                 {
-                    classCleanupMethod = baseClassCleanupQueue.Dequeue();
-                    ClassCleanupException = InvokeCleanupMethod(classCleanupMethod, baseClassCleanupQueue.Count);
+                    classCleanupMethod = classCleanupQueue.Dequeue();
+                    if (!ReflectHelper.Instance.IsNonDerivedAttributeDefined<IgnoreAttribute>(classCleanupMethod.DeclaringType!, false))
+                    {
+                        ClassCleanupException = InvokeCleanupMethod(classCleanupMethod, classCleanupQueue.Count);
+                    }
                 }
 
                 IsClassCleanupExecuted = ClassCleanupException is null;

test/IntegrationTests/MSTest.Acceptance.IntegrationTests/IgnoreTests.cs

@@ -0,0 +1,126 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Testing.Platform.Acceptance.IntegrationTests;
+using Microsoft.Testing.Platform.Acceptance.IntegrationTests.Helpers;
+
+namespace MSTest.Acceptance.IntegrationTests;
+
+[TestGroup]
+public sealed class IgnoreTests : AcceptanceTestBase
+{
+    private readonly TestAssetFixture _testAssetFixture;
+
+    public IgnoreTests(ITestExecutionContext testExecutionContext, TestAssetFixture testAssetFixture)
+        : base(testExecutionContext)
+    {
+        _testAssetFixture = testAssetFixture;
+    }
+
+    public async Task ClassCleanup_Inheritance_WhenClassIsSkipped()
+    {
+        var testHost = TestHost.LocateFrom(_testAssetFixture.ProjectPath, TestAssetFixture.ProjectName, TargetFrameworks.NetCurrent.Arguments);
+        TestHostResult testHostResult = await testHost.ExecuteAsync("--settings my.runsettings");
+
+        // Assert
+        testHostResult.AssertExitCodeIs(0);
+        testHostResult.AssertOutputContains("Passed! - Failed: 0, Passed: 1, Skipped: 1, Total: 2");
+
+        testHostResult.AssertOutputContains("SubClass.Method");
+        testHostResult.AssertOutputContains("SubClass.ClassCleanup");
+    }
+
+    [TestFixture(TestFixtureSharingStrategy.PerTestGroup)]
+    public sealed class TestAssetFixture(AcceptanceFixture acceptanceFixture) : TestAssetFixtureBase(acceptanceFixture.NuGetGlobalPackagesFolder)
+    {
+        public const string ProjectName = "TestIgnore";
+
+        public string ProjectPath => GetAssetPath(ProjectName);
+
+        public override IEnumerable<(string ID, string Name, string Code)> GetAssetsToGenerate()
+        {
+            yield return (ProjectName, ProjectName,
+                SourceCode
+                .PatchTargetFrameworks(TargetFrameworks.NetCurrent)
+                .PatchCodeWithReplace("$MSTestVersion$", MSTestVersion));
+        }
+
+        private const string SourceCode = """
+#file TestIgnore.csproj
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <EnableMSTestRunner>true</EnableMSTestRunner>
+    <TargetFrameworks>$TargetFrameworks$</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestAdapter" Version="$MSTestVersion$" />
+    <PackageReference Include="MSTest.TestFramework" Version="$MSTestVersion$" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="*.runsettings">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>
+
+#file my.runsettings
+<RunSettings>
+  <MSTest>
+    <CaptureTraceOutput>false</CaptureTraceOutput>
+  </MSTest>
+</RunSettings>
+
+#file UnitTest1.cs
+using System;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+[Ignore]
+[TestClass]
+public class UnitTest1
+{
+    [ClassCleanup]
+    public static void ClassCleanup()
+        => throw new InvalidOperationException("ClassCleanup should not be called");
+
+    [TestMethod]
+    public void Method()
+        => throw new InvalidOperationException("Test method should not be called");
+}
+
+[TestClass]
+public class BaseClass
+{
+    [ClassCleanup]
+    public static void BaseClassCleanup()
+        => Console.WriteLine("BaseClass.ClassCleanup");
+}
+
+[Ignore]
+[TestClass]
+public class IntermediateClass : BaseClass
+{
+    [ClassCleanup]
+    public static void IntermediateClassCleanup()
+        => throw new InvalidOperationException("IntermediateClass.ClassCleanup should not be called");
+}
+
+[TestClass]
+public class SubClass : IntermediateClass
+{
+    [ClassCleanup]
+    public static void SubClassCleanup()
+        => Console.WriteLine("SubClass.ClassCleanup");
+
+    [TestMethod]
+    public void Method()
+        => Console.WriteLine("SubClass.Method");
+}
+""";
+    }
+}