Skipped tests count as not run (#3243)

Evangelink · web-flow · commit 5c4e0e56fce7 · 2024-07-11T21:26:44.000+02:00
diff --git a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/InvokeTestingPlatformTask.cs b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/InvokeTestingPlatformTask.cs
@@ -370,7 +370,9 @@ private Task<IResponse> HandleRequestAsync(IRequest request)
             string summary = string.Format(
                 CultureInfo.CurrentCulture,
                 Resources.MSBuildResources.Summary,
-                runSummaryInfoRequest.TotalFailed > 0 ? Resources.MSBuildResources.Failed : Resources.MSBuildResources.Passed,
+                runSummaryInfoRequest.TotalFailed > 0 || runSummaryInfoRequest.TotalPassed == 0
+                    ? Resources.MSBuildResources.Failed
+                    : Resources.MSBuildResources.Passed,
                 runSummaryInfoRequest.TotalFailed,
                 runSummaryInfoRequest.TotalPassed,
                 runSummaryInfoRequest.TotalSkipped,
diff --git a/src/Platform/Microsoft.Testing.Platform/Messages/TestNodeProperties.Categories.cs b/src/Platform/Microsoft.Testing.Platform/Messages/TestNodeProperties.Categories.cs
@@ -15,7 +15,6 @@ internal static class TestNodePropertiesCategories
     public static Type[] WellKnownTestNodeTestRunOutcomeProperties { get; } =
         [
             typeof(PassedTestNodeStateProperty),
-            typeof(SkippedTestNodeStateProperty),
 
             typeof(FailedTestNodeStateProperty),
             typeof(ErrorTestNodeStateProperty),
diff --git a/src/Platform/Microsoft.Testing.Platform/OutputDevice/ConsoleDisplayService.cs b/src/Platform/Microsoft.Testing.Platform/OutputDevice/ConsoleDisplayService.cs
@@ -247,7 +247,7 @@ public async Task DisplayAfterSessionEndRunAsync()
                 {
                     (true, _, _) => (false, PlatformResources.Aborted),
                     (false, _, _) when _totalTests < _minimumExpectedTest => (false, string.Format(CultureInfo.CurrentCulture, PlatformResources.MinimumExpectedTestsPolicyViolation, _totalTests, _minimumExpectedTest)),
-                    (false, 0, _) => (false, PlatformResources.ZeroTestsRan),
+                    (false, _, _) when _totalTests == 0 || _totalTests == _totalSkippedTests => (false, PlatformResources.ZeroTestsRan),
                     (false, _, > 0) => (false, string.Format(CultureInfo.CurrentCulture, "{0}!", PlatformResources.Failed)),
                     _ => (true, string.Format(CultureInfo.CurrentCulture, "{0}!", PlatformResources.Passed)),
                 };
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ParameterizedTestTests.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ParameterizedTestTests.cs
@@ -132,17 +132,17 @@ public class TestClass
     [TestMethod]
     [DynamicData(nameof(AdditionalData))]
     [DynamicData(nameof(AdditionalData2))]
-    public void Test()
+    public void Test(int i)
     {
     }
 
-    public static IEnumerable<int> AdditionalData => Array.Empty<int>();
+    public static IEnumerable<object[]> AdditionalData => Array.Empty<object[]>();
 
-    public static IEnumerable<int> AdditionalData2
+    public static IEnumerable<object[]> AdditionalData2
     {
         get
         {
-            yield return 2;
+            yield return new object[] { 2 };
         }
     }
 }
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Properties/launchSettings.json b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Microsoft.Testing.Platform.Acceptance.IntegrationTests": {
       "commandName": "Project",
-      "commandLineArgs": "--treenode-filter /*/*/InfoTests/**",
+      "commandLineArgs": "--treenode-filter /*/*/*/**",
       "environmentVariables": {
         //"TESTINGPLATFORM_HOTRELOAD_ENABLED": "1"
       }
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/TrxTests.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/TrxTests.cs
@@ -71,7 +71,7 @@ public async Task Trx_WhenSkipTest_ItAppearsAsExpectedInsideTheTrx(string tfm)
         var testHost = TestInfrastructure.TestHost.LocateFrom(_testAssetFixture.TargetAssetPathWithSkippedTest, TestAssetFixture.AssetNameUsingMSTest, tfm);
         TestHostResult testHostResult = await testHost.ExecuteAsync($"--report-trx --report-trx-filename {fileName}.trx");
 
-        testHostResult.AssertExitCodeIs(ExitCodes.Success);
+        testHostResult.AssertExitCodeIs(ExitCodes.ZeroTests);
 
         string trxFile = Directory.GetFiles(testHost.DirectoryName, $"{fileName}.trx", SearchOption.AllDirectories).Single();
 
@@ -107,7 +107,7 @@ public async Task Trx_UsingDataDriven_CreatesUnitTestTagForEachOneInsideTheTrx(s
         var testHost = TestInfrastructure.TestHost.LocateFrom(_testAssetFixture.TargetAssetPathWithSkippedTest, TestAssetFixture.AssetNameUsingMSTest, tfm);
         TestHostResult testHostResult = await testHost.ExecuteAsync($"--report-trx --report-trx-filename {fileName}.trx");
 
-        testHostResult.AssertExitCodeIs(ExitCodes.Success);
+        testHostResult.AssertExitCodeIs(ExitCodes.ZeroTests);
 
         string trxFile = Directory.GetFiles(testHost.DirectoryName, $"{fileName}.trx", SearchOption.AllDirectories).Single();
 
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Services/TestApplicationResultTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Services/TestApplicationResultTests.cs
@@ -22,7 +22,7 @@ public TestApplicationResultTests(ITestExecutionContext testExecutionContext)
     {
     }
 
-    public async Task GetProcessExitCodeAsync_If_All_Skipped_Returns_Zero()
+    public async Task GetProcessExitCodeAsync_If_All_Skipped_Returns_ZeroTestsRan()
     {
         await _testApplicationResult.ConsumeAsync(new DummyProducer(), new TestNodeUpdateMessage(
             default,
@@ -33,7 +33,7 @@ public async Task GetProcessExitCodeAsync_If_All_Skipped_Returns_Zero()
                 Properties = new PropertyBag(SkippedTestNodeStateProperty.CachedInstance),
             }), CancellationToken.None);
 
-        Assert.AreEqual(ExitCodes.Success, await _testApplicationResult.GetProcessExitCodeAsync());
+        Assert.AreEqual(ExitCodes.ZeroTests, await _testApplicationResult.GetProcessExitCodeAsync());
     }
 
     public async Task GetProcessExitCodeAsync_If_No_Tests_Ran_Returns_ZeroTestsRan()

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ internal static class TestNodePropertiesCategories`
`15`	`15`	`public static Type[] WellKnownTestNodeTestRunOutcomeProperties { get; } =`
`16`	`16`	`[`
`17`	`17`	`typeof(PassedTestNodeStateProperty),`
`18`		`- typeof(SkippedTestNodeStateProperty),`
`19`	`18`
`20`	`19`	`typeof(FailedTestNodeStateProperty),`
`21`	`20`	`typeof(ErrorTestNodeStateProperty),`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ public async Task DisplayAfterSessionEndRunAsync()`
`247`	`247`	`{`
`248`	`248`	`(true, _, _) => (false, PlatformResources.Aborted),`
`249`	`249`	`(false, _, _) when _totalTests < _minimumExpectedTest => (false, string.Format(CultureInfo.CurrentCulture, PlatformResources.MinimumExpectedTestsPolicyViolation, _totalTests, _minimumExpectedTest)),`
`250`		`- (false, 0, _) => (false, PlatformResources.ZeroTestsRan),`
	`250`	`+ (false, _, _) when _totalTests == 0 \|\| _totalTests == _totalSkippedTests => (false, PlatformResources.ZeroTestsRan),`
`251`	`251`	`(false, _, > 0) => (false, string.Format(CultureInfo.CurrentCulture, "{0}!", PlatformResources.Failed)),`
`252`	`252`	`_ => (true, string.Format(CultureInfo.CurrentCulture, "{0}!", PlatformResources.Passed)),`
`253`	`253`	`};`
Original file line number	Diff line number	Diff line change
`@@ -132,17 +132,17 @@ public class TestClass`
`132`	`132`	`[TestMethod]`
`133`	`133`	`[DynamicData(nameof(AdditionalData))]`
`134`	`134`	`[DynamicData(nameof(AdditionalData2))]`
`135`		`- public void Test()`
	`135`	`+ public void Test(int i)`
`136`	`136`	`{`
`137`	`137`	`}`
`138`	`138`
`139`		`- public static IEnumerable<int> AdditionalData => Array.Empty<int>();`
	`139`	`+ public static IEnumerable<object[]> AdditionalData => Array.Empty<object[]>();`
`140`	`140`
`141`		`- public static IEnumerable<int> AdditionalData2`
	`141`	`+ public static IEnumerable<object[]> AdditionalData2`
`142`	`142`	`{`
`143`	`143`	`get`
`144`	`144`	`{`
`145`		`- yield return 2;`
	`145`	`+ yield return new object[] { 2 };`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"profiles": {`
`3`	`3`	`"Microsoft.Testing.Platform.Acceptance.IntegrationTests": {`
`4`	`4`	`"commandName": "Project",`
`5`		`- "commandLineArgs": "--treenode-filter ///InfoTests/**",`
	`5`	`+ "commandLineArgs": "--treenode-filter ////*",`
`6`	`6`	`"environmentVariables": {`
`7`	`7`	`//"TESTINGPLATFORM_HOTRELOAD_ENABLED": "1"`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public TestApplicationResultTests(ITestExecutionContext testExecutionContext)`
`22`	`22`	`{`
`23`	`23`	`}`
`24`	`24`
`25`		`- public async Task GetProcessExitCodeAsync_If_All_Skipped_Returns_Zero()`
	`25`	`+ public async Task GetProcessExitCodeAsync_If_All_Skipped_Returns_ZeroTestsRan()`
`26`	`26`	`{`
`27`	`27`	`await _testApplicationResult.ConsumeAsync(new DummyProducer(), new TestNodeUpdateMessage(`
`28`	`28`	`default,`
`@@ -33,7 +33,7 @@ public async Task GetProcessExitCodeAsync_If_All_Skipped_Returns_Zero()`
`33`	`33`	`Properties = new PropertyBag(SkippedTestNodeStateProperty.CachedInstance),`
`34`	`34`	`}), CancellationToken.None);`
`35`	`35`
`36`		`- Assert.AreEqual(ExitCodes.Success, await _testApplicationResult.GetProcessExitCodeAsync());`
	`36`	`+ Assert.AreEqual(ExitCodes.ZeroTests, await _testApplicationResult.GetProcessExitCodeAsync());`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`public async Task GetProcessExitCodeAsync_If_No_Tests_Ran_Returns_ZeroTestsRan()`