Revert "Refactor GetResultOrRunClassInitialize to have clearer intent… (

#4311)
microsoft · Dec 10, 2024 · 6aa7715 · 6aa7715
1 parent 056912d
commit 6aa7715
Showing 1 changed file with 4 additions and 14 deletions.
diff --git a/src/Adapter/MSTest.TestAdapter/Execution/TestClassInfo.cs b/src/Adapter/MSTest.TestAdapter/Execution/TestClassInfo.cs
@@ -29,8 +29,6 @@ public class TestClassInfo
 {
     private readonly Lock _testClassExecuteSyncObject = new();
 
-    private UnitTestResult? _cachedClassInitializeResult;
-
     /// <summary>
     /// Initializes a new instance of the <see cref="TestClassInfo"/> class.
     /// </summary>
@@ -355,15 +353,10 @@ internal UnitTestResult GetResultOrRunClassInitialize(ITestContext testContext,
         {
             // For optimization purposes, we duplicate some of the logic of RunClassInitialize here so we don't need to start
             // a thread for nothing.
-            if (ClassInitializeMethod is null && BaseClassInitMethods.Count == 0)
+            if ((ClassInitializeMethod is null && BaseClassInitMethods.Count == 0)
+                || IsClassInitializeExecuted)
             {
-                return new() { Outcome = ObjectModelUnitTestOutcome.Passed };
-            }
-
-            if (IsClassInitializeExecuted)
-            {
-                DebugEx.Assert(_cachedClassInitializeResult is not null, "If class init was called, we should have cached the result.");
-                return _cachedClassInitializeResult;
+                return DoRun();
             }
 
             UnitTestResult result = new(ObjectModelUnitTestOutcome.Error, "MSTest STATestClass ClassInitialize didn't complete");
@@ -378,7 +371,6 @@ internal UnitTestResult GetResultOrRunClassInitialize(ITestContext testContext,
             try
             {
                 entryPointThread.Join();
-                _cachedClassInitializeResult = result;
                 return result;
             }
             catch (Exception ex)
@@ -395,9 +387,7 @@ internal UnitTestResult GetResultOrRunClassInitialize(ITestContext testContext,
                 PlatformServiceProvider.Instance.AdapterTraceLogger.LogWarning(Resource.STAIsOnlySupportedOnWindowsWarning);
             }
 
-            UnitTestResult result = DoRun();
-            _cachedClassInitializeResult = result;
-            return result;
+            return DoRun();
         }
 
         // Local functions