From 35678fddb1d0db986a053cda4648edfff365d6f5 Mon Sep 17 00:00:00 2001
From: Daniel Cazzulino <daniel@cazzulino.com>
Date: Wed, 3 Jul 2024 16:19:19 -0300
Subject: [PATCH] Render all results for all files found as a single summary

Fixes #6
---
 src/dotnet-trx/TrxCommand.cs | 70 +++++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 32 deletions(-)

diff --git a/src/dotnet-trx/TrxCommand.cs b/src/dotnet-trx/TrxCommand.cs
index 9165dfb..120a42b 100644
--- a/src/dotnet-trx/TrxCommand.cs
+++ b/src/dotnet-trx/TrxCommand.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
@@ -22,7 +23,7 @@ public class TrxSettings : CommandSettings
         [Description("Include test output")]
         [CommandOption("-o|--output")]
         [DefaultValue(false)]
-        public bool? Output { get; init; }
+        public bool Output { get; init; }
 
         [Description("Recursively search for *.trx files")]
         [CommandOption("-r|--recursive")]
@@ -38,24 +39,35 @@ public override int Execute(CommandContext context, TrxSettings settings)
     {
         var path = settings.Path ?? Directory.GetCurrentDirectory();
         var search = settings.Recursive ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly;
-
-        foreach (var trx in Directory.EnumerateFiles(path, "*.trx", search))
+        var testIds = new HashSet<string>();
+        var passed = 0;
+        var failed = 0;
+        var skipped = 0;
+        var duration = TimeSpan.Zero;
+
+        // Process from newest files to oldest
+        foreach (var trx in Directory.EnumerateFiles(path, "*.trx", search).OrderByDescending(File.GetLastWriteTime))
         {
             using var file = File.OpenRead(trx);
-            // This is not counted in the Counters.
-            var skipped = 0;
-
             // Clears namespaces
             var doc = HtmlDocument.Load(file, new HtmlReaderSettings { CaseFolding = Sgml.CaseFolding.None });
+
             foreach (var result in doc.CssSelectElements("UnitTestResult").OrderBy(x => x.Attribute("testName")?.Value))
             {
-                var test = result.Attribute("testName")?.Value;
+                var id = result.Attribute("testId")!.Value;
+                // Process only once per test id, this avoids duplicates when multiple trx files are processed
+                if (!testIds.Add(id))
+                    continue;
+
+                var test = result.Attribute("testName")!.Value;
                 switch (result.Attribute("outcome")?.Value)
                 {
                     case "Passed":
+                        passed++;
                         MarkupLine($":check_mark_button: {test}");
                         break;
                     case "Failed":
+                        failed++;
                         MarkupLine($":cross_mark: {test}");
                         if (result.CssSelectElement("Message")?.Value is string message &&
                             result.CssSelectElement("StackTrace")?.Value is string stackTrace)
@@ -71,8 +83,8 @@ public override int Execute(CommandContext context, TrxSettings settings)
                         }
                         break;
                     case "NotExecuted":
-                        MarkupLine($":fast_forward_button: {test}");
                         skipped++;
+                        MarkupLine($":fast_forward_button: [dim]{test}[/]");
                         break;
                     default:
                         break;
@@ -86,39 +98,33 @@ public override int Execute(CommandContext context, TrxSettings settings)
                     });
             }
 
-            var counters = doc.CssSelectElement("ResultSummary > Counters");
             var times = doc.CssSelectElement("Times");
-            if (counters == null || times == null)
+            if (times == null)
                 continue;
 
-            var total = int.Parse(counters.Attribute("total")?.Value ?? "0");
-            var passed = int.Parse(counters.Attribute("passed")?.Value ?? "0");
-            var failed = int.Parse(counters.Attribute("failed")?.Value ?? "0");
-
-            var start = DateTime.Parse(times.Attribute("start")?.Value!);
-            var finish = DateTime.Parse(times.Attribute("finish")?.Value!);
-            var duration = finish - start;
-
-            WriteLine();
+            var start = DateTime.Parse(times.Attribute("start")!.Value);
+            var finish = DateTime.Parse(times.Attribute("finish")!.Value);
+            duration += finish - start;
+        }
 
-            Markup($":backhand_index_pointing_right: Run {total} tests in ~ {duration.Humanize()}");
+        WriteLine();
+        Markup($":backhand_index_pointing_right: Run {passed + failed + skipped} tests in ~ {duration.Humanize()}");
 
-            if (failed > 0)
-                MarkupLine($" :cross_mark:");
-            else
-                MarkupLine($" :check_mark_button:");
+        if (failed > 0)
+            MarkupLine($" :cross_mark:");
+        else
+            MarkupLine($" :check_mark_button:");
 
-            if (passed > 0)
-                MarkupLine($"   :check_mark_button: {passed} passed");
+        if (passed > 0)
+            MarkupLine($"   :check_mark_button: {passed} passed");
 
-            if (failed > 0)
-                MarkupLine($"   :cross_mark: {failed} failed");
+        if (failed > 0)
+            MarkupLine($"   :cross_mark: {failed} failed");
 
-            if (skipped > 0)
-                MarkupLine($"   :fast_forward_button: {skipped} skipped");
+        if (skipped > 0)
+            MarkupLine($"   :fast_forward_button: {skipped} skipped");
 
-            WriteLine();
-        }
+        WriteLine();
 
         return 0;
     }