Fix parallelism:enabled incorrectly setting `OrderTestsByNameInClas…

…s` (#5090)
microsoft · Feb 21, 2025 · d8cf362 · d8cf362
1 parent f0167dd
commit d8cf362
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 26 deletions.
diff --git a/src/Adapter/MSTest.TestAdapter/MSTestSettings.cs b/src/Adapter/MSTest.TestAdapter/MSTestSettings.cs
@@ -954,7 +954,7 @@ internal static void SetSettingsFromConfig(IConfiguration configuration, IMessag
 
         ParseBooleanSetting(configuration, "output:captureTrace", logger, value => settings.CaptureDebugTraces = value);
 
-        ParseBooleanSetting(configuration, "parallelism:enabled", logger, value => settings.OrderTestsByNameInClass = value);
+        ParseBooleanSetting(configuration, "parallelism:enabled", logger, value => settings.DisableParallelization = !value);
 
         ParseBooleanSetting(configuration, "execution:mapInconclusiveToFailed", logger, value => settings.MapInconclusiveToFailed = value);
         ParseBooleanSetting(configuration, "execution:mapNotRunnableToFailed", logger, value => settings.MapNotRunnableToFailed = value);

diff --git a/test/UnitTests/MSTestAdapter.UnitTests/MSTestSettingsTests.cs b/test/UnitTests/MSTestAdapter.UnitTests/MSTestSettingsTests.cs
@@ -7,7 +7,6 @@
 using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.TestableImplementations;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using Moq;
 
@@ -1310,33 +1309,32 @@ public void ConfigJson_WithInvalidValues_GettingAWarningForEachInvalidSetting()
         _mockMessageLogger.Verify(lm => lm.SendMessage(TestMessageLevel.Warning, "Invalid value '3' for runsettings entry 'execution:considerFixturesAsSpecialTests', setting will be ignored."), Times.Once);
     }
 
-    [TestMethod]
     public void ConfigJson_WithValidValues_ValuesAreSetCorrectly()
     {
         // Arrange - setting up valid configuration values
         var configDictionary = new Dictionary<string, string>
-    {
-        { "mstest:timeout:assemblyInitialize", "300" },
-        { "mstest:timeout:assemblyCleanup", "300" },
-        { "mstest:timeout:classInitialize", "200" },
-        { "mstest:timeout:classCleanup", "200" },
-        { "mstest:timeout:testInitialize", "100" },
-        { "mstest:timeout:testCleanup", "100" },
-        { "mstest:timeout:test", "60" },
-        { "mstest:timeout:useCooperativeCancellation", "true" },
-        { "mstest:parallelism:enabled", "true" },
-        { "mstest:parallelism:workers", "4" },
-        { "mstest:parallelism:scope", "class" },
-        { "mstest:execution:mapInconclusiveToFailed", "true" },
-        { "mstest:execution:mapNotRunnableToFailed", "true" },
-        { "mstest:execution:treatDiscoveryWarningsAsErrors", "true" },
-        { "mstest:execution:considerEmptyDataSourceAsInconclusive", "true" },
-        { "mstest:execution:treatClassAndAssemblyCleanupWarningsAsErrors", "true" },
-        { "mstest:execution:considerFixturesAsSpecialTests", "true" },
-        { "mstest:enableBaseClassTestMethodsFromOtherAssemblies", "true" },
-        { "mstest:orderTestsByNameInClass", "true" },
-        { "mstest:output:captureTrace", "true" },
-    };
+        {
+            { "mstest:timeout:assemblyInitialize", "300" },
+            { "mstest:timeout:assemblyCleanup", "300" },
+            { "mstest:timeout:classInitialize", "200" },
+            { "mstest:timeout:classCleanup", "200" },
+            { "mstest:timeout:testInitialize", "100" },
+            { "mstest:timeout:testCleanup", "100" },
+            { "mstest:timeout:test", "60" },
+            { "mstest:timeout:useCooperativeCancellation", "true" },
+            { "mstest:parallelism:enabled", "true" },
+            { "mstest:parallelism:workers", "4" },
+            { "mstest:parallelism:scope", "class" },
+            { "mstest:execution:mapInconclusiveToFailed", "true" },
+            { "mstest:execution:mapNotRunnableToFailed", "true" },
+            { "mstest:execution:treatDiscoveryWarningsAsErrors", "true" },
+            { "mstest:execution:considerEmptyDataSourceAsInconclusive", "true" },
+            { "mstest:execution:treatClassAndAssemblyCleanupWarningsAsErrors", "true" },
+            { "mstest:execution:considerFixturesAsSpecialTests", "true" },
+            { "mstest:enableBaseClassTestMethodsFromOtherAssemblies", "true" },
+            { "mstest:orderTestsByNameInClass", "true" },
+            { "mstest:output:captureTrace", "true" },
+        };
 
         var mockConfig = new Mock<IConfiguration>();
         mockConfig.Setup(config => config[It.IsAny<string>()])
@@ -1367,11 +1365,40 @@ public void ConfigJson_WithValidValues_ValuesAreSetCorrectly()
         Verify(settings.TestInitializeTimeout == 100);
         Verify(settings.TestCleanupTimeout == 100);
 
+        Verify(!settings.DisableParallelization);
+        Verify(settings.ParallelizationWorkers == 4);
+        Verify(settings.ParallelizationScope == ExecutionScope.ClassLevel);
+    }
+
+    public void ConfigJson_Parllelism_Enabled_True() => ConfigJson_Parllelism_Enabled_Core(true);
+
+    public void ConfigJson_Parllelism_Enabled_False() => ConfigJson_Parllelism_Enabled_Core(false);
+
+    private void ConfigJson_Parllelism_Enabled_Core(bool parallelismEnabled)
+    {
+        // Arrange - setting up valid configuration values
+        var configDictionary = new Dictionary<string, string>
+        {
+            { "mstest:parallelism:enabled", parallelismEnabled.ToString().ToLowerInvariant() },
+            { "mstest:parallelism:workers", "4" },
+            { "mstest:parallelism:scope", "class" },
+        };
+
+        var mockConfig = new Mock<IConfiguration>();
+        mockConfig.Setup(config => config[It.IsAny<string>()])
+                  .Returns((string key) => configDictionary.TryGetValue(key, out string? value) ? value : null);
+
+        var settings = new MSTestSettings();
+
+        // Act
+        MSTestSettings.SetSettingsFromConfig(mockConfig.Object, _mockMessageLogger.Object, settings);
+
+        // Assert
+        Verify(settings.DisableParallelization == !parallelismEnabled);
         Verify(settings.ParallelizationWorkers == 4);
         Verify(settings.ParallelizationScope == ExecutionScope.ClassLevel);
     }
 
-    [TestMethod]
     public void ConfigJson_WithValidValues_MethodScope()
     {
         // Arrange - setting up valid configuration values