From 881be1a7780b610771b2f86863f17c5df5bfd179 Mon Sep 17 00:00:00 2001 From: Charlie Poole Date: Wed, 5 Feb 2025 01:04:19 -0800 Subject: [PATCH] Move all color console display to nunit.common for reuse --- .../nunit.common/TextDisplay}/ColorConsole.cs | 2 +- .../nunit.common/TextDisplay}/ColorConsoleWriter.cs | 2 +- .../nunit.common/TextDisplay}/ColorStyle.cs | 2 +- .../nunit.common/TextDisplay}/ExtendedTextWrapper.cs | 2 +- .../nunit.common/TextDisplay}/ExtendedTextWriter.cs | 2 +- src/NUnitConsole/nunit4-console.tests/BadFileTests.cs | 1 + src/NUnitConsole/nunit4-console.tests/ColorConsoleTests.cs | 4 +--- src/NUnitConsole/nunit4-console.tests/ColorStyleTests.cs | 2 +- src/NUnitConsole/nunit4-console.tests/ConsoleRunnerTests.cs | 3 +-- .../nunit4-console.tests/ExtendedTextWrapperTests.cs | 2 +- src/NUnitConsole/nunit4-console.tests/ResultReporterTests.cs | 1 + .../nunit4-console.tests/TestEventHandlerTests.cs | 1 + src/NUnitConsole/nunit4-console/ConsoleRunner.cs | 1 + src/NUnitConsole/nunit4-console/ConsoleTestResult.cs | 1 + src/NUnitConsole/nunit4-console/Program.cs | 1 + src/NUnitConsole/nunit4-console/ResultReporter.cs | 2 +- src/NUnitConsole/nunit4-console/TestEventHandler.cs | 1 + src/NUnitConsole/nunit4-netcore-console/Program.cs | 4 ++-- .../nunit4-netcore-console/nunit4-netcore-console.csproj | 5 ----- 19 files changed, 19 insertions(+), 20 deletions(-) rename src/{NUnitConsole/nunit4-console => NUnitCommon/nunit.common/TextDisplay}/ColorConsole.cs (99%) rename src/{NUnitConsole/nunit4-console => NUnitCommon/nunit.common/TextDisplay}/ColorConsoleWriter.cs (99%) rename src/{NUnitConsole/nunit4-console => NUnitCommon/nunit.common/TextDisplay}/ColorStyle.cs (98%) rename src/{NUnitConsole/nunit4-console => NUnitCommon/nunit.common/TextDisplay}/ExtendedTextWrapper.cs (99%) rename src/{NUnitConsole/nunit4-console => NUnitCommon/nunit.common/TextDisplay}/ExtendedTextWriter.cs (98%) diff --git a/src/NUnitConsole/nunit4-console/ColorConsole.cs b/src/NUnitCommon/nunit.common/TextDisplay/ColorConsole.cs similarity index 99% rename from src/NUnitConsole/nunit4-console/ColorConsole.cs rename to src/NUnitCommon/nunit.common/TextDisplay/ColorConsole.cs index 84ca437b3..1e16ff09c 100644 --- a/src/NUnitConsole/nunit4-console/ColorConsole.cs +++ b/src/NUnitCommon/nunit.common/TextDisplay/ColorConsole.cs @@ -2,7 +2,7 @@ using System; -namespace NUnit.ConsoleRunner +namespace NUnit.TextDisplay { /// /// Sets the console color in the constructor and resets it in the dispose diff --git a/src/NUnitConsole/nunit4-console/ColorConsoleWriter.cs b/src/NUnitCommon/nunit.common/TextDisplay/ColorConsoleWriter.cs similarity index 99% rename from src/NUnitConsole/nunit4-console/ColorConsoleWriter.cs rename to src/NUnitCommon/nunit.common/TextDisplay/ColorConsoleWriter.cs index 9bc555594..8af5957dc 100644 --- a/src/NUnitConsole/nunit4-console/ColorConsoleWriter.cs +++ b/src/NUnitCommon/nunit.common/TextDisplay/ColorConsoleWriter.cs @@ -2,7 +2,7 @@ using System; -namespace NUnit.ConsoleRunner +namespace NUnit.TextDisplay { public class ColorConsoleWriter : ExtendedTextWrapper { diff --git a/src/NUnitConsole/nunit4-console/ColorStyle.cs b/src/NUnitCommon/nunit.common/TextDisplay/ColorStyle.cs similarity index 98% rename from src/NUnitConsole/nunit4-console/ColorStyle.cs rename to src/NUnitCommon/nunit.common/TextDisplay/ColorStyle.cs index ca369e3c7..a80d1a8ed 100644 --- a/src/NUnitConsole/nunit4-console/ColorStyle.cs +++ b/src/NUnitCommon/nunit.common/TextDisplay/ColorStyle.cs @@ -1,6 +1,6 @@ // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt -namespace NUnit.ConsoleRunner +namespace NUnit.TextDisplay { /// /// ColorStyle enumerates the various styles used in the console display diff --git a/src/NUnitConsole/nunit4-console/ExtendedTextWrapper.cs b/src/NUnitCommon/nunit.common/TextDisplay/ExtendedTextWrapper.cs similarity index 99% rename from src/NUnitConsole/nunit4-console/ExtendedTextWrapper.cs rename to src/NUnitCommon/nunit.common/TextDisplay/ExtendedTextWrapper.cs index 08892960a..ac467cf00 100644 --- a/src/NUnitConsole/nunit4-console/ExtendedTextWrapper.cs +++ b/src/NUnitCommon/nunit.common/TextDisplay/ExtendedTextWrapper.cs @@ -3,7 +3,7 @@ using System.IO; using System.Text; -namespace NUnit.ConsoleRunner +namespace NUnit.TextDisplay { /// /// ExtendedTextWrapper wraps a TextWriter and makes it diff --git a/src/NUnitConsole/nunit4-console/ExtendedTextWriter.cs b/src/NUnitCommon/nunit.common/TextDisplay/ExtendedTextWriter.cs similarity index 98% rename from src/NUnitConsole/nunit4-console/ExtendedTextWriter.cs rename to src/NUnitCommon/nunit.common/TextDisplay/ExtendedTextWriter.cs index 4dffe2cd3..d6670be20 100644 --- a/src/NUnitConsole/nunit4-console/ExtendedTextWriter.cs +++ b/src/NUnitCommon/nunit.common/TextDisplay/ExtendedTextWriter.cs @@ -2,7 +2,7 @@ using System.IO; -namespace NUnit.ConsoleRunner +namespace NUnit.TextDisplay { /// /// ExtendedTextWriter extends the TextWriter abstract class diff --git a/src/NUnitConsole/nunit4-console.tests/BadFileTests.cs b/src/NUnitConsole/nunit4-console.tests/BadFileTests.cs index f096612af..2bbdaab44 100644 --- a/src/NUnitConsole/nunit4-console.tests/BadFileTests.cs +++ b/src/NUnitConsole/nunit4-console.tests/BadFileTests.cs @@ -7,6 +7,7 @@ using NUnit.Engine.Runners; using NUnit.Engine.Services; using NUnit.Framework; +using NUnit.TextDisplay; namespace NUnit.ConsoleRunner { diff --git a/src/NUnitConsole/nunit4-console.tests/ColorConsoleTests.cs b/src/NUnitConsole/nunit4-console.tests/ColorConsoleTests.cs index b08c48e86..5ab636be6 100644 --- a/src/NUnitConsole/nunit4-console.tests/ColorConsoleTests.cs +++ b/src/NUnitConsole/nunit4-console.tests/ColorConsoleTests.cs @@ -3,10 +3,8 @@ using System; using NUnit.Framework; -namespace NUnit.ConsoleRunner +namespace NUnit.TextDisplay { - using Utilities; - [TestFixture, Parallelizable(ParallelScope.None)] public class ColorConsoleTests { diff --git a/src/NUnitConsole/nunit4-console.tests/ColorStyleTests.cs b/src/NUnitConsole/nunit4-console.tests/ColorStyleTests.cs index 84e15365a..cd074e7f6 100644 --- a/src/NUnitConsole/nunit4-console.tests/ColorStyleTests.cs +++ b/src/NUnitConsole/nunit4-console.tests/ColorStyleTests.cs @@ -3,7 +3,7 @@ using System; using NUnit.Framework; -namespace NUnit.ConsoleRunner +namespace NUnit.TextDisplay { [TestFixture] public class ColorStyleTests diff --git a/src/NUnitConsole/nunit4-console.tests/ConsoleRunnerTests.cs b/src/NUnitConsole/nunit4-console.tests/ConsoleRunnerTests.cs index e49dd7d8d..74fceff0d 100644 --- a/src/NUnitConsole/nunit4-console.tests/ConsoleRunnerTests.cs +++ b/src/NUnitConsole/nunit4-console.tests/ConsoleRunnerTests.cs @@ -1,16 +1,15 @@ // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt using System; -using System.Collections.Generic; using System.IO; using System.Xml; using NSubstitute; -using NUnit.ConsoleRunner; using NUnit.ConsoleRunner.Options; using NUnit.Engine; using NUnit.Engine.Extensibility; using NUnit.Engine.Services; using NUnit.Framework; +using NUnit.TextDisplay; namespace NUnit.ConsoleRunner { diff --git a/src/NUnitConsole/nunit4-console.tests/ExtendedTextWrapperTests.cs b/src/NUnitConsole/nunit4-console.tests/ExtendedTextWrapperTests.cs index 7d4cec81c..fd377780b 100644 --- a/src/NUnitConsole/nunit4-console.tests/ExtendedTextWrapperTests.cs +++ b/src/NUnitConsole/nunit4-console.tests/ExtendedTextWrapperTests.cs @@ -6,7 +6,7 @@ using System.Text; using NUnit.Framework; -namespace NUnit.ConsoleRunner +namespace NUnit.TextDisplay { public class ExtendedTextWrapperTests { diff --git a/src/NUnitConsole/nunit4-console.tests/ResultReporterTests.cs b/src/NUnitConsole/nunit4-console.tests/ResultReporterTests.cs index d3a9e1ca4..a3963e27b 100644 --- a/src/NUnitConsole/nunit4-console.tests/ResultReporterTests.cs +++ b/src/NUnitConsole/nunit4-console.tests/ResultReporterTests.cs @@ -10,6 +10,7 @@ using NUnit.Framework; using NUnit.Framework.Api; using NUnit.TestData.Assemblies; +using NUnit.TextDisplay; namespace NUnit.ConsoleRunner { diff --git a/src/NUnitConsole/nunit4-console.tests/TestEventHandlerTests.cs b/src/NUnitConsole/nunit4-console.tests/TestEventHandlerTests.cs index 54c8f09a3..f92aafa13 100644 --- a/src/NUnitConsole/nunit4-console.tests/TestEventHandlerTests.cs +++ b/src/NUnitConsole/nunit4-console.tests/TestEventHandlerTests.cs @@ -4,6 +4,7 @@ using System.IO; using System.Text; using NUnit.Framework; +using NUnit.TextDisplay; namespace NUnit.ConsoleRunner { diff --git a/src/NUnitConsole/nunit4-console/ConsoleRunner.cs b/src/NUnitConsole/nunit4-console/ConsoleRunner.cs index eb0ad8f01..4823f1db9 100644 --- a/src/NUnitConsole/nunit4-console/ConsoleRunner.cs +++ b/src/NUnitConsole/nunit4-console/ConsoleRunner.cs @@ -9,6 +9,7 @@ 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/ConsoleTestResult.cs b/src/NUnitConsole/nunit4-console/ConsoleTestResult.cs index 19265bd28..292d627cc 100644 --- a/src/NUnitConsole/nunit4-console/ConsoleTestResult.cs +++ b/src/NUnitConsole/nunit4-console/ConsoleTestResult.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Text; using System.Xml; +using NUnit.TextDisplay; namespace NUnit.ConsoleRunner { diff --git a/src/NUnitConsole/nunit4-console/Program.cs b/src/NUnitConsole/nunit4-console/Program.cs index 164c48e04..dcf57e045 100644 --- a/src/NUnitConsole/nunit4-console/Program.cs +++ b/src/NUnitConsole/nunit4-console/Program.cs @@ -8,6 +8,7 @@ using System.Reflection; using System.Text; using NUnit.Engine; +using NUnit.TextDisplay; using NUnit.ConsoleRunner.Options; diff --git a/src/NUnitConsole/nunit4-console/ResultReporter.cs b/src/NUnitConsole/nunit4-console/ResultReporter.cs index 35893f5a2..7c7e69009 100644 --- a/src/NUnitConsole/nunit4-console/ResultReporter.cs +++ b/src/NUnitConsole/nunit4-console/ResultReporter.cs @@ -5,7 +5,7 @@ using System.Globalization; using System.Xml; using NUnit.ConsoleRunner.Options; -using NUnit.ConsoleRunner.Utilities; +using NUnit.TextDisplay; namespace NUnit.ConsoleRunner { diff --git a/src/NUnitConsole/nunit4-console/TestEventHandler.cs b/src/NUnitConsole/nunit4-console/TestEventHandler.cs index 871f5e260..95a884ad0 100644 --- a/src/NUnitConsole/nunit4-console/TestEventHandler.cs +++ b/src/NUnitConsole/nunit4-console/TestEventHandler.cs @@ -3,6 +3,7 @@ using System; using System.Xml; using NUnit.Engine; +using NUnit.TextDisplay; namespace NUnit.ConsoleRunner { diff --git a/src/NUnitConsole/nunit4-netcore-console/Program.cs b/src/NUnitConsole/nunit4-netcore-console/Program.cs index f7bdf9ac9..277086ad5 100644 --- a/src/NUnitConsole/nunit4-netcore-console/Program.cs +++ b/src/NUnitConsole/nunit4-netcore-console/Program.cs @@ -7,9 +7,9 @@ using System.Linq; using System.Reflection; using System.Text; -using NUnit.Engine; - using NUnit.ConsoleRunner.Options; +using NUnit.Engine; +using NUnit.TextDisplay; namespace NUnit.ConsoleRunner { diff --git a/src/NUnitConsole/nunit4-netcore-console/nunit4-netcore-console.csproj b/src/NUnitConsole/nunit4-netcore-console/nunit4-netcore-console.csproj index 128364b75..33c1f0b32 100644 --- a/src/NUnitConsole/nunit4-netcore-console/nunit4-netcore-console.csproj +++ b/src/NUnitConsole/nunit4-netcore-console/nunit4-netcore-console.csproj @@ -41,14 +41,9 @@ - - - - -