Merge pull request #2118 from IT-VBFK/build/improve-report-summaries

Add test summaries
fluentassertions · Jan 23, 2023 · 214dd22 · 214dd22
2 parents 9a2be7c + 829c588
commit 214dd22
Showing 1 changed file with 58 additions and 17 deletions.
diff --git a/Build/Build.cs b/Build/Build.cs
@@ -118,7 +118,7 @@ class Build : NukeBuild
         .Executes(() =>
         {
             ReportSummary(s => s
-                .WhenNotNull(GitVersion,(_, o) => _
+                .WhenNotNull(GitVersion, (_, o) => _
                     .AddPair("Version", o.SemVer)));
 
             DotNetBuild(s => s
@@ -136,12 +136,18 @@ class Build : NukeBuild
         .OnlyWhenDynamic(() => RunAllTargets || HasSourceChanges)
         .Executes(() =>
         {
+            Project project = Solution.Specs.Approval_Tests;
+
             DotNetTest(s => s
                 .SetConfiguration(Configuration.Release)
                 .SetProcessEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE", "en-US")
                 .EnableNoBuild()
-                .CombineWith(
-                    cc => cc.SetProjectFile(Solution.Specs.Approval_Tests)));
+                .SetResultsDirectory(TestResultsDirectory)
+                .CombineWith(cc => cc
+                    .SetProjectFile(project)
+                    .AddLoggers($"trx;LogFileName={project.Name}.trx")), completeOnFailure: true);
+
+            ReportTestOutcome(globFilters: $"*{project.Name}.trx");
         });
 
     Project[] Projects => new[]
@@ -158,7 +164,7 @@ class Build : NukeBuild
         {
             IEnumerable<string> testAssemblies = Projects
                     .SelectMany(project => GlobFiles(project.Directory, "bin/Debug/net47/*.Specs.dll"));
-            
+
             Assert.NotEmpty(testAssemblies.ToList());
 
             Xunit2(s => s
@@ -173,6 +179,8 @@ class Build : NukeBuild
         .OnlyWhenDynamic(() => RunAllTargets || HasSourceChanges)
         .Executes(() =>
         {
+            const string NET47 = "net47";
+
             DotNetTest(s => s
                 .SetConfiguration(Configuration.Debug)
                 .SetProcessEnvironmentVariable("DOTNET_CLI_UI_LANGUAGE", "en-US")
@@ -187,19 +195,45 @@ class Build : NukeBuild
                     (_, project) => _
                         .SetProjectFile(project)
                         .CombineWith(
-                            project.GetTargetFrameworks().Except(new[] { "net47" }),
-                            (_, framework) => _.SetFramework(framework)
+                            project.GetTargetFrameworks().Except(new[] { NET47 }),
+                            (_, framework) => _
+                                .SetFramework(framework)
+                                .AddLoggers($"trx;LogFileName={project.Name}_{framework}.trx")
                         )
-                )
+                ), completeOnFailure: true
             );
+
+            ReportTestOutcome(globFilters: $"*[!*{NET47}].trx");
         });
 
     Target UnitTests => _ => _
         .DependsOn(UnitTestsNetFramework)
         .DependsOn(UnitTestsNetCore);
 
+    static string[] Outcomes(AbsolutePath path)
+        => XmlTasks.XmlPeek(
+                path,
+                "/xn:TestRun/xn:Results/xn:UnitTestResult/@outcome",
+                ("xn", "http://microsoft.com/schemas/VisualStudio/TeamTest/2010")).ToArray();
+
+    void ReportTestOutcome(params string[] globFilters)
+    {
+        var resultFiles = TestResultsDirectory.GlobFiles(globFilters);
+        var outcomes = resultFiles.SelectMany(Outcomes).ToList();
+        var passedTests = outcomes.Count(outcome => outcome is "Passed");
+        var failedTests = outcomes.Count(outcome => outcome is "Failed");
+        var skippedTests = outcomes.Count(outcome => outcome is "NotExecuted");
+
+        ReportSummary(_ => _
+            .When(failedTests > 0, _ => _
+                .AddPair("Failed", failedTests.ToString()))
+            .AddPair("Passed", passedTests.ToString())
+            .When(skippedTests > 0, _ => _
+                .AddPair("Skipped", skippedTests.ToString())));
+    }
+
     Target CodeCoverage => _ => _
-        .DependsOn(TestFrameworks) 
+        .DependsOn(TestFrameworks)
         .DependsOn(UnitTests)
         .OnlyWhenDynamic(() => RunAllTargets || HasSourceChanges)
         .Executes(() =>
@@ -223,14 +257,16 @@ class Build : NukeBuild
         .OnlyWhenDynamic(() => RunAllTargets || HasSourceChanges)
         .Executes(() =>
         {
+            var projects = new[]
+            {
+                Solution.TestFrameworks.MSpec_Specs,
+                Solution.TestFrameworks.MSTestV2_Specs,
+                Solution.TestFrameworks.NUnit3_Specs,
+                Solution.TestFrameworks.XUnit2_Specs
+            };
+
             var testCombinations =
-                from project in new[]
-                {
-                    Solution.TestFrameworks.MSpec_Specs,
-                    Solution.TestFrameworks.MSTestV2_Specs,
-                    Solution.TestFrameworks.NUnit3_Specs,
-                    Solution.TestFrameworks.XUnit2_Specs
-                }
+                from project in projects
                 let frameworks = project.GetTargetFrameworks()
                 let supportedFrameworks = EnvironmentInfo.IsWin ? frameworks : frameworks.Except(new[] { "net47" })
                 from framework in supportedFrameworks
@@ -247,12 +283,17 @@ class Build : NukeBuild
                     "DoesNotReturnAttribute")
                 .CombineWith(
                     testCombinations,
-                    (_, v) => _.SetProjectFile(v.project).SetFramework(v.framework)));
+                    (_, v) => _
+                        .SetProjectFile(v.project)
+                        .SetFramework(v.framework)
+                        .AddLoggers($"trx;LogFileName={v.project.Name}_{v.framework}.trx")), completeOnFailure: true);
 
             if (EnvironmentInfo.IsWin)
             {
                 NSpec3(Solution.TestFrameworks.NSpec3_Net47_Specs.Directory / "bin" / "Debug" / "net47" / "NSpec3.Specs.dll");
             }
+
+            ReportTestOutcome(projects.Select(p => $"*{p.Name}*.trx").ToArray());
         });
 
     Target Pack => _ => _
@@ -265,7 +306,7 @@ class Build : NukeBuild
         .Executes(() =>
         {
             ReportSummary(s => s
-                .WhenNotNull(SemVer,(_, semVer) => _
+                .WhenNotNull(SemVer, (_, semVer) => _
                     .AddPair("Packed version", semVer)));
 
             DotNetPack(s => s