Changes from code review

CharliePoole · CharliePoole · commit dbf62c01e2ab · 2025-04-23T09:37:44.000-07:00
diff --git a/src/NUnitCommon/nunit.agent.core.tests/Drivers/NotRunnableFrameworkDriverTests.cs b/src/NUnitCommon/nunit.agent.core.tests/Drivers/NotRunnableFrameworkDriverTests.cs
@@ -6,7 +6,6 @@
 using NUnit.Framework;
 using NUnit.Framework.Internal;
 using NUnit.Engine.Extensibility;
-using NUnit.Engine.Internal;
 using System;
 
 namespace NUnit.Engine.Drivers
diff --git a/src/NUnitCommon/nunit.agent.core.tests/Runners/TestAgentRunnerTests.cs b/src/NUnitCommon/nunit.agent.core.tests/Runners/TestAgentRunnerTests.cs
@@ -5,7 +5,6 @@
 using System.IO;
 using System.Linq;
 using System.Xml;
-using NUnit.Engine.Internal;
 using NUnit.Framework;
 using NUnit.TestData;
 using NUnit.TestData.Assemblies;
diff --git a/src/NUnitCommon/nunit.agent.core/AgentDirectRunner.cs b/src/NUnitCommon/nunit.agent.core/AgentDirectRunner.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Xml;
 using NUnit.TextDisplay;
+using NUnit.Common;
 using NUnit.Engine;
 using NUnit.Engine.Runners;
 
diff --git a/src/NUnitCommon/nunit.agent.core/Drivers/DriverService.cs b/src/NUnitCommon/nunit.agent.core/Drivers/DriverService.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using NUnit.Common;
 using NUnit.Engine.Extensibility;
 using TestCentric.Metadata;
 
diff --git a/src/NUnitCommon/nunit.agent.core/NUnitAgent.cs b/src/NUnitCommon/nunit.agent.core/NUnitAgent.cs
@@ -5,6 +5,7 @@
 using System.IO;
 using System.Security;
 using System.Reflection;
+using NUnit.Common;
 using NUnit.Engine.Agents;
 
 #if NETFRAMEWORK
diff --git a/src/NUnitCommon/nunit.agent.core/Runners/DomainManager.cs b/src/NUnitCommon/nunit.agent.core/Runners/DomainManager.cs
@@ -11,6 +11,7 @@
 using System.Security.Policy;
 using System.Security.Principal;
 using System.Linq;
+using NUnit.Common;
 
 namespace NUnit.Engine.Runners
 {
diff --git a/src/NUnitCommon/nunit.common.tests/Communication/Transports/Remoting/TcpChannelUtilsTests.cs b/src/NUnitCommon/nunit.common.tests/Communication/Transports/Remoting/TcpChannelUtilsTests.cs
@@ -8,7 +8,7 @@
 using NUnit.Framework;
 using NUnit.Framework.Constraints;
 
-namespace NUnit.Engine.Internal
+namespace NUnit.Engine.Communication.Transports.Remoting
 {
     [TestFixture]
     [Parallelizable(ParallelScope.None)] // GetTcpChannel affects the whole AppDomain
diff --git a/src/NUnitCommon/nunit.common.tests/PathUtilTests.cs b/src/NUnitCommon/nunit.common.tests/PathUtilTests.cs
@@ -5,7 +5,7 @@
 using System.Runtime.InteropServices;
 using NUnit.Framework;
 
-namespace NUnit.Engine.Internal
+namespace NUnit.Common
 {
     [TestFixture]
     public class PathUtilsTests
diff --git a/src/NUnitCommon/nunit.common.tests/TextDisplay/ResultReporterTests.cs b/src/NUnitCommon/nunit.common.tests/TextDisplay/ResultReporterTests.cs
@@ -5,6 +5,7 @@
 using System.IO;
 using System.Text;
 using System.Xml;
+using NUnit.Common;
 using NUnit.Engine;
 using NUnit.Framework;
 using NUnit.Framework.Api;
@@ -19,13 +20,11 @@ public class ResultReporterTests
         private StringBuilder _reportBuilder;
         private ExtendedTextWrapper _writer;
 
-        private string ReportOutput => _reportBuilder.ToString();
-
         private List<string> ReportLines
         {
             get
             {
-                var rdr = new StringReader(ReportOutput);
+                var rdr = new StringReader(_reportBuilder.ToString());
 
                 string? line;
                 var lines = new List<string>();
@@ -86,9 +85,10 @@ public void ReportSequenceTest()
 
             int last = -1;
 
+            string reportOutput = _reportBuilder.ToString();
             foreach (string title in reportSequence)
             {
-                var index = ReportOutput.IndexOf(title);
+                var index = reportOutput.IndexOf(title);
                 Assert.That(index > 0, "Report not found: " + title);
                 Assert.That(index > last, "Report out of sequence: " + title);
                 last = index;
@@ -141,8 +141,9 @@ public void ErrorsFailuresAndWarningsReportTest()
 
             ResultReporter.WriteErrorsFailuresAndWarningsReport(_result, _writer);
 
+            string reportOutput = _reportBuilder.ToString();
             foreach (var item in expected)
-                Assert.That(ReportOutput.Contains(item));
+                Assert.That(reportOutput.Contains(item));
         }
 
         [Test]
@@ -178,12 +179,6 @@ public void TestsNotRunTest()
             Assert.That(ReportLines, Is.EqualTo(expected));
         }
 
-        //[Test, Explicit("Displays failure behavior")]
-        //public void WarningsOnlyDisplayOnce()
-        //{
-        //    Assert.Warn("Just a warning");
-        //}
-
         [Test]
         public void TestParameterSettingsWrittenCorrectly()
         {
diff --git a/src/NUnitCommon/nunit.common/AgentExitCodes.cs b/src/NUnitCommon/nunit.common/AgentExitCodes.cs
@@ -1,6 +1,6 @@
 ﻿// Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
 
-namespace NUnit
+namespace NUnit.Common
 {
     public static class AgentExitCodes
     {
diff --git a/src/NUnitCommon/nunit.common/Communitcation/Transports/Remoting/TcpChannelUtils.ObservableServerChannelSinkProvider.cs b/src/NUnitCommon/nunit.common/Communitcation/Transports/Remoting/TcpChannelUtils.ObservableServerChannelSinkProvider.cs
@@ -7,7 +7,7 @@
 using System.Runtime.Remoting.Channels;
 using System.Runtime.Remoting.Messaging;
 
-namespace NUnit.Engine
+namespace NUnit.Engine.Communication.Transports.Remoting
 {
     partial class TcpChannelUtils
     {
diff --git a/src/NUnitCommon/nunit.common/Communitcation/Transports/Remoting/TcpChannelUtils.cs b/src/NUnitCommon/nunit.common/Communitcation/Transports/Remoting/TcpChannelUtils.cs
@@ -3,13 +3,12 @@
 #if NETFRAMEWORK
 using System;
 using System.Collections.Generic;
-using System.Runtime.Remoting;
 using System.Runtime.Remoting.Channels;
 using System.Runtime.Remoting.Channels.Tcp;
 using System.Runtime.Serialization.Formatters;
 using System.Threading;
 
-namespace NUnit.Engine
+namespace NUnit.Engine.Communication.Transports.Remoting
 {
     /// <summary>
     /// A collection of utility methods used to create, retrieve
diff --git a/src/NUnitCommon/nunit.common/DotNet.cs b/src/NUnitCommon/nunit.common/DotNet.cs
@@ -5,7 +5,7 @@
 using System.IO;
 using System.Runtime.InteropServices;
 
-namespace NUnit.Engine
+namespace NUnit.Common
 {
     public static class DotNet
     {
diff --git a/src/NUnitCommon/nunit.common/FrameworkIdentifers.cs b/src/NUnitCommon/nunit.common/FrameworkIdentifers.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
 
-namespace NUnit
+namespace NUnit.Common
 {
     public static class FrameworkIdentifiers
     {
diff --git a/src/NUnitCommon/nunit.common/Modernization/StringExtensions.cs b/src/NUnitCommon/nunit.common/Modernization/StringExtensions.cs
@@ -2,7 +2,7 @@
 
 #if !NETSTANDARD2_1 && !NETCOREAPP2_0_OR_GREATER
 
-namespace NUnit.Common
+namespace NUnit
 {
     public static class StringExtensions
     {
diff --git a/src/NUnitCommon/nunit.common/PathUtils.cs b/src/NUnitCommon/nunit.common/PathUtils.cs
@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
-namespace NUnit
+namespace NUnit.Common
 {
     /// <summary>
     /// Static methods for manipulating project paths, including both directories
diff --git a/src/NUnitCommon/nunit.common/ResultSummary.cs b/src/NUnitCommon/nunit.common/ResultSummary.cs
@@ -3,7 +3,7 @@
 using System;
 using System.Xml;
 
-namespace NUnit
+namespace NUnit.Common
 {
     /// <summary>
     /// Summary description for ResultSummary.
diff --git a/src/NUnitCommon/nunit.common/RuntimeInformation.cs b/src/NUnitCommon/nunit.common/RuntimeInformation.cs
diff --git a/src/NUnitCommon/nunit.common/TestPackageExtensions.cs b/src/NUnitCommon/nunit.common/TestPackageExtensions.cs
@@ -2,6 +2,7 @@
 
 using System;
 using System.Collections.Generic;
+using NUnit.Common;
 
 namespace NUnit.Engine
 {
diff --git a/src/NUnitCommon/nunit.common/TextDisplay/ClientTestResult.cs b/src/NUnitCommon/nunit.common/TextDisplay/ClientTestResult.cs
@@ -1,12 +1,9 @@
 ﻿// Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
 
-using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Xml;
-using NUnit.TextDisplay;
 
-namespace NUnit
+namespace NUnit.TextDisplay
 {
     /// <summary>
     /// ConsoleTestResult represents the result of one test being
@@ -73,7 +70,7 @@ public List<AssertionResult> Assertions
                     XmlNodeList? assertions = _resultNode.SelectNodes("assertions/assertion");
                     if (assertions is not null)
                         foreach (XmlNode assertion in assertions)
-                            Assertions.Add(new ClientTestResult.AssertionResult(assertion));
+                            Assertions.Add(new AssertionResult(assertion));
                 }
 
                 return _assertions;
diff --git a/src/NUnitCommon/nunit.common/TextDisplay/ResultReporter.cs b/src/NUnitCommon/nunit.common/TextDisplay/ResultReporter.cs
@@ -5,6 +5,7 @@
 using System.Globalization;
 using System.Reflection;
 using System.Xml;
+using NUnit.Common;
 
 namespace NUnit.TextDisplay
 {
@@ -17,8 +18,6 @@ public static void WriteHeader(ExtendedTextWriter writer)
 
             var header = $"{versionBlock.ProductName} {versionBlock.ProductVersion}";
 
-            var configurationAttributes = entryAssembly.GetCustomAttribute<AssemblyConfigurationAttribute>();
-
             writer.WriteLine(ColorStyle.Header, header);
             writer.WriteLine(ColorStyle.SubHeader, versionBlock.LegalCopyright ?? "No Copyright statement found");
             writer.WriteLine(ColorStyle.SubHeader, DateTime.Now.ToString(CultureInfo.CurrentCulture.DateTimeFormat.FullDateTimePattern));
diff --git a/src/NUnitCommon/nunit.extensibility.tests/ExtensionSelectorTests.cs b/src/NUnitCommon/nunit.extensibility.tests/ExtensionSelectorTests.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Runtime.Versioning;
 using NSubstitute;
-using NUnit.Extensibility;
+using NUnit.Common;
 using NUnit.Framework;
 
 namespace NUnit.Extensibility
diff --git a/src/NUnitCommon/nunit.extensibility/AddinsFileEntry.cs b/src/NUnitCommon/nunit.extensibility/AddinsFileEntry.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using NUnit.Common;
 
 namespace NUnit.Extensibility
 {
diff --git a/src/NUnitConsole/nunit4-console/ConsoleOptions.cs b/src/NUnitConsole/nunit4-console/ConsoleOptions.cs
@@ -6,7 +6,6 @@
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
-using NUnit.Common;
 using NUnit.ConsoleRunner.Options;
 
 namespace NUnit.ConsoleRunner
diff --git a/src/NUnitConsole/nunit4-console/ConsoleRunner.cs b/src/NUnitConsole/nunit4-console/ConsoleRunner.cs
@@ -4,11 +4,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Xml;
+using NUnit.Common;
 using NUnit.ConsoleRunner.Utilities;
 using NUnit.ConsoleRunner.Options;
 using NUnit.Engine;
 using NUnit.Engine.Extensibility;
-using NUnit.Extensibility;
 using NUnit.TextDisplay;
 using System.Runtime.InteropServices;
 using System.Text;
diff --git a/src/NUnitConsole/nunit4-console/Options/Options.cs b/src/NUnitConsole/nunit4-console/Options/Options.cs
diff --git a/src/NUnitConsole/nunit4-console/TestEventHandler.cs b/src/NUnitConsole/nunit4-console/TestEventHandler.cs
diff --git a/src/NUnitConsole/nunit4-netcore-console/Program.cs b/src/NUnitConsole/nunit4-netcore-console/Program.cs
diff --git a/src/NUnitEngine/nunit.engine.tests/Services/ProcessUtilsTests.cs b/src/NUnitEngine/nunit.engine.tests/Services/ProcessUtilsTests.cs
diff --git a/src/NUnitEngine/nunit.engine.tests/TestEngineResultTests.cs b/src/NUnitEngine/nunit.engine.tests/TestEngineResultTests.cs
diff --git a/src/NUnitEngine/nunit.engine/Runtime.cs b/src/NUnitEngine/nunit.engine/Runtime.cs
diff --git a/src/NUnitEngine/nunit.engine/Services/AgentProcess.cs b/src/NUnitEngine/nunit.engine/Services/AgentProcess.cs
diff --git a/src/NUnitEngine/nunit.engine/Services/ProcessUtils.cs b/src/NUnitEngine/nunit.engine/Services/ProcessUtils.cs
diff --git a/src/NUnitEngine/nunit.engine/Services/RuntimeFrameworkService.cs b/src/NUnitEngine/nunit.engine/Services/RuntimeFrameworkService.cs
diff --git a/src/NUnitEngine/nunit.engine/Services/RuntimeLocators/NetCoreRuntimeLocator.cs b/src/NUnitEngine/nunit.engine/Services/RuntimeLocators/NetCoreRuntimeLocator.cs
diff --git a/src/NUnitEngine/nunit.engine/Services/TestAgency.cs b/src/NUnitEngine/nunit.engine/Services/TestAgency.cs

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`using System.Security.Policy;`
`12`	`12`	`using System.Security.Principal;`
`13`	`13`	`using System.Linq;`
	`14`	`+using NUnit.Common;`
`14`	`15`
`15`	`16`	`namespace NUnit.Engine.Runners`
`16`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`using NUnit.Framework;`
`9`	`9`	`using NUnit.Framework.Constraints;`
`10`	`10`
`11`		`-namespace NUnit.Engine.Internal`
	`11`	`+namespace NUnit.Engine.Communication.Transports.Remoting`
`12`	`12`	`{`
`13`	`13`	`[TestFixture]`
`14`	`14`	`[Parallelizable(ParallelScope.None)] // GetTcpChannel affects the whole AppDomain`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using System.Runtime.InteropServices;`
`6`	`6`	`using NUnit.Framework;`
`7`	`7`
`8`		`-namespace NUnit.Engine.Internal`
	`8`	`+namespace NUnit.Common`
`9`	`9`	`{`
`10`	`10`	`[TestFixture]`
`11`	`11`	`public class PathUtilsTests`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt`
`2`	`2`
`3`		`-namespace NUnit`
	`3`	`+namespace NUnit.Common`
`4`	`4`	`{`
`5`	`5`	`public static class AgentExitCodes`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using System.Runtime.Remoting.Channels;`
`8`	`8`	`using System.Runtime.Remoting.Messaging;`
`9`	`9`
`10`		`-namespace NUnit.Engine`
	`10`	`+namespace NUnit.Engine.Communication.Transports.Remoting`
`11`	`11`	`{`
`12`	`12`	`partial class TcpChannelUtils`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using System.IO;`
`6`	`6`	`using System.Runtime.InteropServices;`
`7`	`7`
`8`		`-namespace NUnit.Engine`
	`8`	`+namespace NUnit.Common`
`9`	`9`	`{`
`10`	`10`	`public static class DotNet`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`#if !NETSTANDARD2_1 && !NETCOREAPP2_0_OR_GREATER`
`4`	`4`
`5`		`-namespace NUnit.Common`
	`5`	`+namespace NUnit`
`6`	`6`	`{`
`7`	`7`	`public static class StringExtensions`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using System.Collections.Generic;`
`8`	`8`	`using System.Runtime.InteropServices;`
`9`	`9`
`10`		`-namespace NUnit`
	`10`	`+namespace NUnit.Common`
`11`	`11`	`{`
`12`	`12`	`/// <summary>`
`13`	`13`	`/// Static methods for manipulating project paths, including both directories`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System;`
`4`	`4`	`using System.Xml;`
`5`	`5`
`6`		`-namespace NUnit`
	`6`	`+namespace NUnit.Common`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Summary description for ResultSummary.`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`using System;`
`4`	`4`	`using System.Collections.Generic;`
	`5`	`+using NUnit.Common;`
`5`	`6`
`6`	`7`	`namespace NUnit.Engine`
`7`	`8`	`{`