Convert ResultReporter to static class

Author: CharliePoole

src/NUnitCommon/nunit.agent.core/AgentDirectRunner.cs

@@ -30,7 +30,7 @@ public void ExecuteTestsDirectly()
             {
                 var testFile = _options.Files[0];
 
-                WriteHeader();
+                WriteHeader(OutWriter);
 
                 TestPackage package = new TestPackage(testFile).SubPackages[0];
 
@@ -66,7 +66,7 @@ public void ExecuteTestsDirectly()
             Environment.Exit(AgentExitCodes.OK);
         }
 
-        private void WriteHeader()
+        private static void WriteHeader(ExtendedTextWriter outWriter)
         {
             var ea = Assembly.GetEntryAssembly();
             if (ea is not null)
@@ -75,11 +75,11 @@ private void WriteHeader()
                 var version = GetAttribute<AssemblyFileVersionAttribute>(ea)?.Version;
                 var copyright = GetAttribute<AssemblyCopyrightAttribute>(ea)?.Copyright;
 
-                OutWriter.WriteLine(ColorStyle.Header, $"{title} {version}");
+                outWriter.WriteLine(ColorStyle.Header, $"{title} {version}");
                 if (copyright is not null)
-                    OutWriter.WriteLine(ColorStyle.SubHeader, copyright);
-                OutWriter.WriteLine(ColorStyle.SubHeader, DateTime.Now.ToString(CultureInfo.CurrentCulture.DateTimeFormat.FullDateTimePattern));
-                OutWriter.WriteLine();
+                    outWriter.WriteLine(ColorStyle.SubHeader, copyright);
+                outWriter.WriteLine(ColorStyle.SubHeader, DateTime.Now.ToString(CultureInfo.CurrentCulture.DateTimeFormat.FullDateTimePattern));
+                outWriter.WriteLine();
             }
         }
 

src/NUnitCommon/nunit.common.tests/TextDisplay/ResultReporterTests.cs

@@ -15,7 +15,6 @@ namespace NUnit.TextDisplay
     public class ResultReporterTests
     {
         private XmlNode _result;
-        private ResultReporter _reporter;
         private StringBuilder _report;
 
         [OneTimeSetUp]
@@ -49,13 +48,15 @@ public void CreateReporter()
         {
             _report = new StringBuilder();
             var writer = new ExtendedTextWrapper(new StringWriter(_report));
-            _reporter = new ResultReporter(_result, writer);
         }
 
         [Test]
         public void ReportSequenceTest()
         {
-            var report = GetReport(_reporter.ReportResults);
+            var sb = new StringBuilder();
+            var writer = new ExtendedTextWrapper(new StringWriter(sb));
+            ResultReporter.ReportResults(new ResultSummary(_result), writer);
+            var report = sb.ToString();
 
             var reportSequence = new[]
             {
@@ -93,12 +94,15 @@ public void SummaryReportTest()
             };
 #pragma warning restore SA1137 // Elements should have the same indentation
 
-            var actualSummary = GetReportLines(_reporter.WriteSummaryReport);
-            Assert.That(actualSummary, Is.EqualTo(expected));
+            var report = new StringBuilder();
+            var writer = new ExtendedTextWrapper(new StringWriter(report));
+            ResultReporter.WriteSummaryReport(_result, new ResultSummary(_result), writer);
+            var lines = GetReportLines(report.ToString());
+            Assert.That(lines, Is.EqualTo(expected));
         }
 
         [Test]
-        public void ErrorsAndFailuresReportTest()
+        public void ErrorsFailuresAndWarningsReportTest()
         {
             var nl = Environment.NewLine;
 
@@ -119,12 +123,14 @@ public void ErrorsAndFailuresReportTest()
                 "No suitable constructor was found"
             };
 
-            var actualErrorFailuresReport = GetReport(_reporter.WriteErrorsFailuresAndWarningsReport);
+            var sb = new StringBuilder();
+            var writer = new ExtendedTextWrapper(new StringWriter(sb));
+            ResultReporter.WriteErrorsFailuresAndWarningsReport(_result, writer);
 
-            foreach (var ex in expected)
-            {
-                Assert.That(actualErrorFailuresReport, Does.Contain(ex));
-            }
+            var report = sb.ToString();
+
+            foreach (var item in expected)
+                Assert.That(report.Contains(item));
         }
 
         [Test]
@@ -156,8 +162,11 @@ public void TestsNotRunTest()
                 string.Empty
             };
 
-            var report = GetReportLines(_reporter.WriteNotRunReport);
-            Assert.That(report, Is.EqualTo(expected));
+            var report = new StringBuilder();
+            var writer = new ExtendedTextWrapper(new StringWriter(report));
+            ResultReporter.WriteNotRunReport(_result, writer);
+            var lines = GetReportLines(report.ToString());
+            Assert.That(lines, Is.EqualTo(expected));
         }
 
         [Test, Explicit("Displays failure behavior")]
@@ -177,24 +186,21 @@ public void TestParameterSettingsWrittenCorrectly()
                 "        2 -> |c|"
             };
 
-            var report = GetReportLines(_reporter.WriteRunSettingsReport);
-            Assert.That(report, Is.SupersetOf(expected));
+            var report = new StringBuilder();
+            var writer = new ExtendedTextWrapper(new StringWriter(report));
+            ResultReporter.WriteRunSettingsReport(_result, writer);
+            var lines = GetReportLines(report.ToString());
+            Assert.That(lines, Is.SupersetOf(expected));
         }
 
         private static TestEngineResult AddMetadata(TestEngineResult input)
         {
             return input.Aggregate("test-run start-time=\"2015-10-19 02:12:28Z\" end-time=\"2015-10-19 02:12:29Z\" duration=\"0.348616\"", string.Empty, string.Empty, string.Empty);
         }
 
-        private string GetReport(TestDelegate del)
-        {
-            del();
-            return _report.ToString();
-        }
-
-        private List<string> GetReportLines(TestDelegate del)
+        private static List<string> GetReportLines(string report)
         {
-            var rdr = new StringReader(GetReport(del));
+            var rdr = new StringReader(report.ToString());
 
             string? line;
             var lines = new List<string>();

src/NUnitCommon/nunit.common/ResultSummary.cs

@@ -10,16 +10,30 @@ namespace NUnit
     /// </summary>
     public class ResultSummary
     {
-        public ResultSummary(XmlNode result)
+        public ResultSummary(XmlNode resultNode)
         {
-            if (result.Name != "test-run")
-                throw new InvalidOperationException("Expected <test-run> as top-level element but was <" + result.Name + ">");
+            if (resultNode.Name != "test-run")
+                throw new InvalidOperationException("Expected <test-run> as top-level element but was <" + resultNode.Name + ">");
 
             InitializeCounters();
 
-            Summarize(result, false);
+            Summarize(resultNode, false);
+
+            string? overallResult = resultNode.GetAttribute("result");
+            if (overallResult == "Skipped")
+                OverallResult = "Warning";
+            if (overallResult is null)
+                OverallResult = "Unknown";
+            else
+                OverallResult = overallResult;
+
+            ResultNode = resultNode;
         }
 
+        public XmlNode ResultNode { get; }
+
+        public string OverallResult { get; }
+
         /// <summary>
         /// Gets the number of test cases for which results
         /// have been summarized. Any tests excluded by use of