Move ResultReporter to nunit.common

Author: CharliePoole

src/NUnitConsole/nunit4-console.tests/ResultReporterTests.cs renamed to src/NUnitCommon/nunit.common.tests/TextDisplay/ResultReporterTests.cs

@@ -5,14 +5,12 @@
 using System.IO;
 using System.Text;
 using System.Xml;
-using NUnit.ConsoleRunner.Options;
 using NUnit.Engine;
 using NUnit.Framework;
 using NUnit.Framework.Api;
 using NUnit.TestData.Assemblies;
-using NUnit.TextDisplay;
 
-namespace NUnit.ConsoleRunner
+namespace NUnit.TextDisplay
 {
     public class ResultReporterTests
     {
@@ -51,7 +49,7 @@ public void CreateReporter()
         {
             _report = new StringBuilder();
             var writer = new ExtendedTextWrapper(new StringWriter(_report));
-            _reporter = new ResultReporter(_result, writer, ConsoleMocks.Options());
+            _reporter = new ResultReporter(_result, writer);
         }
 
         [Test]

src/NUnitCommon/nunit.common.tests/nunit.common.tests.csproj

@@ -7,6 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\TestData\mock-assembly\mock-assembly.csproj" />
     <ProjectReference Include="..\nunit.common\nunit.common.csproj" />
     <ProjectReference Include="..\..\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj" />
   </ItemGroup>

src/NUnitConsole/nunit4-console/ResultReporter.cs renamed to src/NUnitCommon/nunit.common/TextDisplay/ResultReporter.cs

@@ -1,21 +1,18 @@
 // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Xml;
-using NUnit.ConsoleRunner.Options;
-using NUnit.TextDisplay;
 
-namespace NUnit.ConsoleRunner
+namespace NUnit.TextDisplay
 {
     public class ResultReporter
     {
-        public ResultReporter(XmlNode resultNode, ExtendedTextWriter writer, ConsoleOptions options)
+        public ResultReporter(XmlNode resultNode, ExtendedTextWriter writer, bool stopOnError = false)
         {
             ResultNode = resultNode;
             Writer = writer;
-            Options = options;
+            StopOnError = stopOnError;
 
             string? overallResult = resultNode.GetAttribute("result");
             if (overallResult == "Skipped")
@@ -32,8 +29,8 @@ public ResultReporter(XmlNode resultNode, ExtendedTextWriter writer, ConsoleOpti
         private int ReportIndex { get; set; }
         private XmlNode ResultNode { get; set; }
         private ExtendedTextWriter Writer { get; set; }
-        private ConsoleOptions Options { get; set; }
         private string OverallResult { get; set; }
+        private bool StopOnError { get; set; }
 
         /// <summary>
         /// Reports the results to the console
@@ -53,7 +50,7 @@ public void ReportResults()
             WriteSummaryReport();
         }
 
-        internal void WriteRunSettingsReport()
+        public void WriteRunSettingsReport()
         {
             var firstSuite = ResultNode.SelectSingleNode("test-suite");
             if (firstSuite is not null)
@@ -150,11 +147,11 @@ public void WriteErrorsFailuresAndWarningsReport()
 
             WriteErrorsFailuresAndWarnings(ResultNode);
 
-            if (Options.StopOnError)
-            {
-                Writer.WriteLine(ColorStyle.Failure, "Execution terminated after first error");
-                Writer.WriteLine();
-            }
+            //if (Options.StopOnError)
+            //{
+            //    Writer.WriteLine(ColorStyle.Failure, "Execution terminated after first error");
+            //    Writer.WriteLine();
+            //}
         }
 
         private void WriteErrorsFailuresAndWarnings(XmlNode resultNode)

src/NUnitConsole/nunit4-console.tests/BadFileTests.cs

@@ -36,7 +36,7 @@ public void MissingFileTest(string filename, string message)
             var result = runner.Run(this, TestFilter.Empty);
             var sb = new StringBuilder();
             var writer = new ExtendedTextWrapper(new StringWriter(sb));
-            var reporter = new ResultReporter(result, writer, ConsoleMocks.Options());
+            var reporter = new ResultReporter(result, writer);
 
             reporter.WriteErrorsFailuresAndWarningsReport();
             var report = sb.ToString();

src/NUnitConsole/nunit4-console/ConsoleRunner.cs

@@ -271,7 +271,7 @@ private int RunTests(TestPackage package, TestFilter filter)
 
             if (result is not null)
             {
-                var reporter = new ResultReporter(result, writer, _options);
+                var reporter = new ResultReporter(result, writer, _options.StopOnError);
                 reporter.ReportResults();
 
                 foreach (var spec in _options.ResultOutputSpecifications)

src/NUnitConsole/nunit4-console/TestEventHandler.cs

@@ -1,12 +1,10 @@
 // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
 
-using System;
 using System.Xml;
 using NUnit.Common;
 using NUnit.Engine;
-using NUnit.TextDisplay;
 
-namespace NUnit.ConsoleRunner
+namespace NUnit.TextDisplay
 {
     /// <summary>
     /// TestEventHandler processes events from the running

src/NUnitConsole/nunit4-netcore-console/nunit4-netcore-console.csproj

@@ -50,7 +50,6 @@
     <Compile Include="..\nunit4-console\Options\OutputSpecification.cs" Link="Options\OutputSpecification.cs" />
     <Compile Include="..\nunit4-console\Options\TestNameParser.cs" Link="Options\TestNameParser.cs" />
     <Compile Include="..\nunit4-console\RequiredExtensionException.cs" Link="RequiredExtensionException.cs" />
-    <Compile Include="..\nunit4-console\ResultReporter.cs" Link="ResultReporter.cs" />
     <Compile Include="..\nunit4-console\TestEventHandler.cs" Link="TestEventHandler.cs" />
     <Compile Include="..\nunit4-console\Utilities\SaveConsoleOutput.cs" Link="Utilities\SaveConsoleOutput.cs" />
     <Content Include="..\..\..\LICENSE.txt" Link="LICENSE.txt" />