From a487eb72e6f4087f7794c2320ea0cfb1f2363ed0 Mon Sep 17 00:00:00 2001 From: Pressacco <5507864+pressacco@users.noreply.github.com> Date: Fri, 22 Nov 2024 17:57:19 -0500 Subject: [PATCH 1/6] Refactor : All unit tests now use the same regular expressions. #191 --- .../BlueDotBrigade.Weevil.TestingTools}/X.cs | 19 +- .../Filter/FilteringSteps.cs | 250 +++++++++--------- .../GlobalUsings.cs | 3 +- .../PreconditionSteps.cs | 69 +++-- .../Filter/FilteringSteps.cs | 2 +- .../GlobalUsings.cs | 5 +- .../StatusBarSteps.cs | 4 +- .../X.cs | 20 -- 8 files changed, 173 insertions(+), 199 deletions(-) rename {Tst/BlueDotBrigade.Weevil.Core-FeatureTests => Src/BlueDotBrigade.Weevil.TestingTools}/X.cs (77%) delete mode 100644 Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/X.cs diff --git a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/X.cs b/Src/BlueDotBrigade.Weevil.TestingTools/X.cs similarity index 77% rename from Tst/BlueDotBrigade.Weevil.Core-FeatureTests/X.cs rename to Src/BlueDotBrigade.Weevil.TestingTools/X.cs index 6d51a935..fbc4299a 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/X.cs +++ b/Src/BlueDotBrigade.Weevil.TestingTools/X.cs @@ -1,4 +1,4 @@ -namespace BlueDotBrigade.Weevil +namespace BlueDotBrigade.Weevil.TestingTools { /// /// Represents commonly used parameters in Reqnroll step definitions. @@ -6,20 +6,17 @@ /// Reqnroll: Step Definitions /// Reqnroll: Gherkin Expressions /// Regular Expressions - internal sealed class X + public sealed class X { - public const string FileName = @"""([a-zA-Z0-9]+\.[a-zA-Z0-9]{1,4})"""; - - public const string FilePath = @"((?:(?[A-Za-z]:\\))(?([a-zA-Z0-9._-]+\\)*)(?[a-zA-Z0-9._-]+)\.(?[a-zA-Z]{1,4}))"; - - //public const string TextExpression = @"(plain text|regular expression)"; <<< The Renroll Gherkin statement does not recognize this at compile time - public const string TextExpression ="(.*)"; + public const string AnyText = @"(.*)"; public const string WholeNumber = @"(\d+)"; - public const string AnyText = @"(.*)"; + public const string FileName = @"""([a-zA-Z0-9]+\.[a-zA-Z0-9]{1,4})"""; + + public const string FilePath = @"((?:(?[A-Za-z]:\\))(?([a-zA-Z0-9._-]+\\)*)(?[a-zA-Z0-9._-]+)\.(?[a-zA-Z]{1,4}))"; - public const string Integer = @"(\d+)"; + public const string TimePeriod = @"((?:\d+) (?:min|sec))"; public const string OnOff = @"(on|off)"; @@ -27,4 +24,4 @@ internal sealed class X public const string FilterMode = @"(Plain Text|Regular Expression)"; } -} \ No newline at end of file +} diff --git a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Filter/FilteringSteps.cs b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Filter/FilteringSteps.cs index d313927f..6b3aa940 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Filter/FilteringSteps.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Filter/FilteringSteps.cs @@ -1,165 +1,161 @@ using BlueDotBrigade; using BlueDotBrigade.Weevil; using BlueDotBrigade.Weevil.Filter; +using BlueDotBrigade.Weevil.Data; +using BlueDotBrigade.Weevil.Filter; +using BlueDotBrigade.Weevil.Filter.Expressions.PlainText; + +using static System.Net.Mime.MediaTypeNames; -namespace BlueDotBrigade.Weevil.Filter +[Binding] +internal sealed class FilteringSteps : ReqnrollSteps { - using BlueDotBrigade.Weevil.Data; - using BlueDotBrigade.Weevil.Filter; - using BlueDotBrigade.Weevil.Filter.Expressions.PlainText; + public FilteringSteps(Token token) : base(token) + { + // nothing to do + } - using static System.Net.Mime.MediaTypeNames; + /// + [When($"using the include filter: {X.AnyText}")] + public void WhenUsingTheIncludeFilter(string includeFilter) + { + this.Context.IncludeFilter = includeFilter; + } - [Binding] - internal sealed class FilteringSteps : ReqnrollSteps + /// + [When($"using the exclude filter: {X.AnyText}")] + public void WhenUsingTheExcludeFilter(string excludeFilter) { - public FilteringSteps(Token token) : base(token) - { - // nothing to do - } + this.Context.ExcludeFilter = excludeFilter; + } - /// - [When($"using the include filter: {X.AnyText}")] - public void WhenUsingTheIncludeFilter(string includeFilter) - { - this.Context.IncludeFilter = includeFilter; - } + [When("applying the filters")] + public void WhenApplyingTheFilters() + { + this.Context.Engine.Filter.Apply( + this.Context.FilterType, + this.Context.FilterCriteria); + } - /// - [When($"using the exclude filter: {X.AnyText}")] - public void WhenUsingTheExcludeFilter(string excludeFilter) - { - this.Context.ExcludeFilter = excludeFilter; - } + /// + [When($"applying the include filter: {X.AnyText}")] + public void WhenApplyingTheIncludeFilter(string includeFilter) + { + this.Context.IncludeFilter = includeFilter; - [When("applying the filters")] - public void WhenApplyingTheFilters() - { - this.Context.Engine.Filter.Apply( - this.Context.FilterType, - this.Context.FilterCriteria); - } + this.Context.Engine.Filter.Apply( + this.Context.FilterType, + this.Context.FilterCriteria); + } - /// - [When($"applying the include filter: {X.AnyText}")] - public void WhenApplyingTheIncludeFilter(string includeFilter) - { - this.Context.IncludeFilter = includeFilter; + /// + [When($"applying the exclude filter: {X.AnyText}")] + public void WhenApplyingTheExcludeFilter(string excludeFilter) + { + this.Context.ExcludeFilter = excludeFilter; - this.Context.Engine.Filter.Apply( - this.Context.FilterType, - this.Context.FilterCriteria); - } + this.Context.Engine.Filter.Apply( + this.Context.FilterType, + this.Context.FilterCriteria); + } - /// - [When($"applying the exclude filter: {X.AnyText}")] - public void WhenApplyingTheExcludeFilter(string excludeFilter) - { - this.Context.ExcludeFilter = excludeFilter; + [Then($@"there will be {X.WholeNumber} matching records")] + public void ThenThereWillBeMatchingRecords(int recordCount) + { + this.Context.Results.Length + .Should() + .Be(recordCount); + } - this.Context.Engine.Filter.Apply( - this.Context.FilterType, - this.Context.FilterCriteria); - } + [Then($@"all records will include: {X.AnyText}")] + public void ThenAllRecordsWillInclude(string text) + { + this.Context.Results + .Should() + .Contain(s => s.Content.Contains(text)); + } - [Then($@"there will be {X.Integer} matching records")] - public void ThenThereWillBeMatchingRecords(int recordCount) - { - this.Context.Results.Length - .Should() - .Be(recordCount); - } + [Then($@"all records will exclude: {X.AnyText}")] + public void ThenAllRecordsWillExclude(string text) + { + this.Context.Results + .Should() + .NotContain(s => s.Content.Contains(text)); + } + + [Then("each record will include all of the following")] + public void ThenEachRecordWillIncludeAllOfTheFollowing(string multilineText) + { + var textValues = multilineText.Split( + new[] { Environment.NewLine }, + StringSplitOptions.RemoveEmptyEntries); - [Then($@"all records will include: {X.AnyText}")] - public void ThenAllRecordsWillInclude(string text) + foreach (var record in this.Context.Results) { - this.Context.Results - .Should() - .Contain(s => s.Content.Contains(text)); + foreach (var text in textValues) + { + text.Should().Contain(text); + } } + } + + [Then("each record will exclude all of the following")] + public void ThenEachRecordWillExcludeAllOfTheFollowing(string multilineText) + { + var textValues = multilineText.Split( + new[] { Environment.NewLine }, + StringSplitOptions.RemoveEmptyEntries); - [Then($@"all records will exclude: {X.AnyText}")] - public void ThenAllRecordsWillExclude(string text) + foreach (var text in textValues) { this.Context.Results .Should() .NotContain(s => s.Content.Contains(text)); } + } - [Then("each record will include all of the following")] - public void ThenEachRecordWillIncludeAllOfTheFollowing(string multilineText) - { - var textValues = multilineText.Split( - new[] { Environment.NewLine }, - StringSplitOptions.RemoveEmptyEntries); - - foreach (var record in this.Context.Results) - { - foreach (var text in textValues) - { - text.Should().Contain(text); - } - } - } + [Then("each record will include either")] + public void ThenEachRecordWillIncludeEither(string multilineText) + { + var textValues = multilineText.Split( + new[] { Environment.NewLine }, + StringSplitOptions.RemoveEmptyEntries); - [Then("each record will exclude all of the following")] - public void ThenEachRecordWillExcludeAllOfTheFollowing(string multilineText) + foreach (var text in textValues) { - var textValues = multilineText.Split( - new[] { Environment.NewLine }, - StringSplitOptions.RemoveEmptyEntries); - - foreach (var text in textValues) - { - this.Context.Results - .Should() - .NotContain(s => s.Content.Contains(text)); - } + this.Context.Results + .Should() + .Contain(s => s.Content.Contains(text)); } + } - [Then("each record will include either")] - public void ThenEachRecordWillIncludeEither(string multilineText) - { - var textValues = multilineText.Split( - new[] { Environment.NewLine }, - StringSplitOptions.RemoveEmptyEntries); - - foreach (var text in textValues) - { - this.Context.Results - .Should() - .Contain(s => s.Content.Contains(text)); - } - } + [Then("no record will contain any of the following")] + public void ThenNoRecordWillContainAnyOfTheFollowing(string multilineText) + { + var textValues = multilineText.Split( + new[] { Environment.NewLine }, + StringSplitOptions.RemoveEmptyEntries); - [Then("no record will contain any of the following")] - public void ThenNoRecordWillContainAnyOfTheFollowing(string multilineText) + foreach (var text in textValues) { - var textValues = multilineText.Split( - new[] { Environment.NewLine }, - StringSplitOptions.RemoveEmptyEntries); - - foreach (var text in textValues) - { - this.Context.Results - .Should() - .NotContain(s => s.Content.Contains(text)); - } + this.Context.Results + .Should() + .NotContain(s => s.Content.Contains(text)); } + } - [When($"pinning the record on line {X.WholeNumber}")] - public void WhenPinningTheRecordOnLine(int lineNumber) - { - var index = this.Context.Engine.Records.IndexOfLineNumber(lineNumber); - this.Context.Engine.Records[index].Metadata.IsPinned = true; - } + [When($"pinning the record on line {X.WholeNumber}")] + public void WhenPinningTheRecordOnLine(int lineNumber) + { + var index = this.Context.Engine.Records.IndexOfLineNumber(lineNumber); + this.Context.Engine.Records[index].Metadata.IsPinned = true; + } - [Then($"line number {X.WholeNumber} will be visible")] - public void ThenLineNumberWillBeVisible(int lineNumber) - { - var index = this.Context.Results.IndexOfLineNumber(lineNumber); + [Then($"line number {X.WholeNumber} will be visible")] + public void ThenLineNumberWillBeVisible(int lineNumber) + { + var index = this.Context.Results.IndexOfLineNumber(lineNumber); - index.Should().BeGreaterOrEqualTo(0); - } + index.Should().BeGreaterOrEqualTo(0); } } \ No newline at end of file diff --git a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/GlobalUsings.cs b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/GlobalUsings.cs index 2abd74ba..0d7bfaad 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/GlobalUsings.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/GlobalUsings.cs @@ -4,4 +4,5 @@ global using Reqnroll; -global using BlueDotBrigade.DatenLokator.TestsTools; \ No newline at end of file +global using BlueDotBrigade.DatenLokator.TestsTools; +global using BlueDotBrigade.Weevil.TestingTools; \ No newline at end of file diff --git a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/PreconditionSteps.cs b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/PreconditionSteps.cs index 09bab97f..86aa34aa 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/PreconditionSteps.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/PreconditionSteps.cs @@ -1,44 +1,43 @@ -namespace BlueDotBrigade.Weevil.StepDefinitions -{ - using System.Linq.Expressions; - using BlueDotBrigade.Weevil.Data; - using BlueDotBrigade.Weevil.Filter; - using BlueDotBrigade.Weevil.Filter.Expressions.PlainText; +namespace BlueDotBrigade.Weevil.StepDefinitions; + +using System.Linq.Expressions; +using BlueDotBrigade.Weevil.Data; +using BlueDotBrigade.Weevil.Filter; +using BlueDotBrigade.Weevil.Filter.Expressions.PlainText; - [Binding] - internal sealed class PreconditionSteps : ReqnrollSteps +[Binding] +internal sealed class PreconditionSteps : ReqnrollSteps +{ + public PreconditionSteps(Token token) : base(token) { - public PreconditionSteps(Token token) : base(token) - { - // nothing to do - } + // nothing to do + } - [Given(@"that the default log file is open")] - public void GivenThatTheDefaultLogFileIsOpen() - { - var filePath = new Daten().AsFilePath(From.GlobalDefault); + [Given(@"that the default log file is open")] + public void GivenThatTheDefaultLogFileIsOpen() + { + var filePath = new Daten().AsFilePath(From.GlobalDefault); - this.Context.Engine = Engine - .UsingPath(filePath) - .Open(); - } + this.Context.Engine = Engine + .UsingPath(filePath) + .Open(); + } - [Given(@$"that the {X.FileName} log file name is open")] - public void GivenThatTheLogFileNameIsOpen(string fileName) - { - var filePath = new Daten().AsFilePath(fileName); + [Given(@$"that the {X.FileName} log file name is open")] + public void GivenThatTheLogFileNameIsOpen(string fileName) + { + var filePath = new Daten().AsFilePath(fileName); - this.Context.Engine = Engine - .UsingPath(filePath) - .Open(); - } + this.Context.Engine = Engine + .UsingPath(filePath) + .Open(); + } - [Given($@"that the log file is open at `{X.FilePath}`")] - public void GivenThatTheLogFileIsOpenAt(string filePath) - { - this.Context.Engine = Engine - .UsingPath(filePath) - .Open(); - } + [Given($@"that the log file is open at `{X.FilePath}`")] + public void GivenThatTheLogFileIsOpenAt(string filePath) + { + this.Context.Engine = Engine + .UsingPath(filePath) + .Open(); } } diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Filter/FilteringSteps.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Filter/FilteringSteps.cs index 11b29128..3a6131bf 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Filter/FilteringSteps.cs +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Filter/FilteringSteps.cs @@ -40,7 +40,7 @@ public void WhenApplyingTheExcludeFilter(string exclude) this.Context.Filter.Filter(); } - [Then($@"there will be {X.Integer} matching records")] + [Then($@"there will be {X.WholeNumber} matching records")] public void ThenThereWillBeMatchingRecords(int recordCount) { this.Context.StatusBar.FilterDetails.VisibleRecordCount diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/GlobalUsings.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/GlobalUsings.cs index 0513fd18..dc121f88 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/GlobalUsings.cs +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/GlobalUsings.cs @@ -2,6 +2,9 @@ global using FluentAssertions; +global using Reqnroll; + global using Microsoft.VisualStudio.TestTools.UnitTesting; -global using Reqnroll; \ No newline at end of file +global using BlueDotBrigade.DatenLokator.TestsTools; +global using BlueDotBrigade.Weevil.TestingTools; \ No newline at end of file diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/StatusBarSteps.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/StatusBarSteps.cs index 0e4b1d59..b121158f 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/StatusBarSteps.cs +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/StatusBarSteps.cs @@ -1,7 +1,5 @@ namespace BlueDotBrigade.Weevil.Gui { - using BlueDotBrigade.DatenLokator.TestsTools; - using Microsoft.VisualStudio.TestTools.UnitTesting; [Binding] @@ -12,7 +10,7 @@ internal StatusBarSteps(Token token) : base(token) // nothing to do } - [Then($"the visible record count in the status bar will be {X.Integer}")] + [Then($"the visible record count in the status bar will be {X.WholeNumber}")] public void ThenTheVisibleRecordCountInTheStatusBarWillBe(int recordCount) { Assert.AreEqual( diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/X.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/X.cs deleted file mode 100644 index 06aec9aa..00000000 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/X.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace BlueDotBrigade.Weevil.Gui -{ - /// - /// Represents commonly used parameters in Reqnroll step definitions. - /// - /// Reqnroll: Step Definitions - /// Reqnroll: Gherkin Expressions - /// Regular Expressions - internal sealed class X - { - public const string AnyText = @"(.*)"; - - public const string Integer = @"(\d+)"; - - public const string FileName = @"""([a-zA-Z0-9]+\.[a-zA-Z0-9]{1,4})"""; - - public const string TimePeriod = @"((?:\d+) (?:min|sec))"; - } -} - From 7f45c450903bfb2c74ee469786081651681d87eb Mon Sep 17 00:00:00 2001 From: Pressacco <5507864+pressacco@users.noreply.github.com> Date: Fri, 22 Nov 2024 18:08:09 -0500 Subject: [PATCH 2/6] Refactor : Moved codebase to the correct namespace `BlueDotBrigade.Weevil.TestTools` #191 --- .../BlueDotBrigade.Weevil.TestTools.csproj} | 4 ++-- .../Configuration/Reqnroll/Constants.cs | 2 +- .../Data/R.cs | 2 +- .../Text/RegexHelper.cs | 2 +- .../X.cs | 2 +- Weevil-v2.sln | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename Src/{BlueDotBrigade.Weevil.TestingTools/BlueDotBrigade.Weevil.TestingTools.csproj => BlueDotBrigade.Weevil.TestTools/BlueDotBrigade.Weevil.TestTools.csproj} (86%) rename Src/{BlueDotBrigade.Weevil.TestingTools => BlueDotBrigade.Weevil.TestTools}/Configuration/Reqnroll/Constants.cs (89%) rename Src/{BlueDotBrigade.Weevil.TestingTools => BlueDotBrigade.Weevil.TestTools}/Data/R.cs (97%) rename Src/{BlueDotBrigade.Weevil.TestingTools => BlueDotBrigade.Weevil.TestTools}/Text/RegexHelper.cs (82%) rename Src/{BlueDotBrigade.Weevil.TestingTools => BlueDotBrigade.Weevil.TestTools}/X.cs (95%) diff --git a/Src/BlueDotBrigade.Weevil.TestingTools/BlueDotBrigade.Weevil.TestingTools.csproj b/Src/BlueDotBrigade.Weevil.TestTools/BlueDotBrigade.Weevil.TestTools.csproj similarity index 86% rename from Src/BlueDotBrigade.Weevil.TestingTools/BlueDotBrigade.Weevil.TestingTools.csproj rename to Src/BlueDotBrigade.Weevil.TestTools/BlueDotBrigade.Weevil.TestTools.csproj index 766f36c5..fb127b93 100644 --- a/Src/BlueDotBrigade.Weevil.TestingTools/BlueDotBrigade.Weevil.TestingTools.csproj +++ b/Src/BlueDotBrigade.Weevil.TestTools/BlueDotBrigade.Weevil.TestTools.csproj @@ -3,14 +3,14 @@ net8.0 x64 BlueDotBrigade.Weevil.TestingTools - BlueDotBrigade.Weevil.TestingTools + BlueDotBrigade.Weevil.TestTools 2.11.0 BlueDotBrigade; © 2022 Blue Dot Brigade. All rights reserved. Blue Dot Brigade Includes types, interfaces, and utilities that are shared by all of the Weevil assemblies. - BlueDotBrigade.Weevil.TestingTools + BlueDotBrigade.Weevil.TestTools Blue Dot Brigade diff --git a/Src/BlueDotBrigade.Weevil.TestingTools/Configuration/Reqnroll/Constants.cs b/Src/BlueDotBrigade.Weevil.TestTools/Configuration/Reqnroll/Constants.cs similarity index 89% rename from Src/BlueDotBrigade.Weevil.TestingTools/Configuration/Reqnroll/Constants.cs rename to Src/BlueDotBrigade.Weevil.TestTools/Configuration/Reqnroll/Constants.cs index 6fdf07c7..b9c4267f 100644 --- a/Src/BlueDotBrigade.Weevil.TestingTools/Configuration/Reqnroll/Constants.cs +++ b/Src/BlueDotBrigade.Weevil.TestTools/Configuration/Reqnroll/Constants.cs @@ -1,4 +1,4 @@ -namespace BlueDotBrigade.Weevil.TestingTools.Configuration.Reqnroll +namespace BlueDotBrigade.Weevil.TestTools.Configuration.Reqnroll { using System; diff --git a/Src/BlueDotBrigade.Weevil.TestingTools/Data/R.cs b/Src/BlueDotBrigade.Weevil.TestTools/Data/R.cs similarity index 97% rename from Src/BlueDotBrigade.Weevil.TestingTools/Data/R.cs rename to Src/BlueDotBrigade.Weevil.TestTools/Data/R.cs index 99e43d9a..6683bed3 100644 --- a/Src/BlueDotBrigade.Weevil.TestingTools/Data/R.cs +++ b/Src/BlueDotBrigade.Weevil.TestTools/Data/R.cs @@ -1,4 +1,4 @@ -namespace BlueDotBrigade.Weevil.TestingTools.Data +namespace BlueDotBrigade.Weevil.TestTools.Data { using System; using System.Collections.Generic; diff --git a/Src/BlueDotBrigade.Weevil.TestingTools/Text/RegexHelper.cs b/Src/BlueDotBrigade.Weevil.TestTools/Text/RegexHelper.cs similarity index 82% rename from Src/BlueDotBrigade.Weevil.TestingTools/Text/RegexHelper.cs rename to Src/BlueDotBrigade.Weevil.TestTools/Text/RegexHelper.cs index a98dba95..9930bee4 100644 --- a/Src/BlueDotBrigade.Weevil.TestingTools/Text/RegexHelper.cs +++ b/Src/BlueDotBrigade.Weevil.TestTools/Text/RegexHelper.cs @@ -1,4 +1,4 @@ -namespace BlueDotBrigade.Weevil.TestingTools.Text +namespace BlueDotBrigade.Weevil.TestTools.Text { public class RegexHelper { diff --git a/Src/BlueDotBrigade.Weevil.TestingTools/X.cs b/Src/BlueDotBrigade.Weevil.TestTools/X.cs similarity index 95% rename from Src/BlueDotBrigade.Weevil.TestingTools/X.cs rename to Src/BlueDotBrigade.Weevil.TestTools/X.cs index fbc4299a..e5946c78 100644 --- a/Src/BlueDotBrigade.Weevil.TestingTools/X.cs +++ b/Src/BlueDotBrigade.Weevil.TestTools/X.cs @@ -1,4 +1,4 @@ -namespace BlueDotBrigade.Weevil.TestingTools +namespace BlueDotBrigade.Weevil.TestTools { /// /// Represents commonly used parameters in Reqnroll step definitions. diff --git a/Weevil-v2.sln b/Weevil-v2.sln index ae166fa7..14bfa768 100644 --- a/Weevil-v2.sln +++ b/Weevil-v2.sln @@ -33,7 +33,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlueDotBrigade.Weevil.Commo EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlueDotBrigade.Weevil.Windows", "Src\BlueDotBrigade.Weevil.Windows\BlueDotBrigade.Weevil.Windows.csproj", "{D54EA855-B071-40DA-ABF1-2D8227F9130D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlueDotBrigade.Weevil.TestingTools", "Src\BlueDotBrigade.Weevil.TestingTools\BlueDotBrigade.Weevil.TestingTools.csproj", "{CBFA74F4-AF15-4B6B-B46A-CB7B8049C879}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlueDotBrigade.Weevil.TestTools", "Src\BlueDotBrigade.Weevil.TestTools\BlueDotBrigade.Weevil.TestTools.csproj", "{CBFA74F4-AF15-4B6B-B46A-CB7B8049C879}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlueDotBrigade.Weevil.Cli", "Src\BlueDotBrigade.Weevil.Cli\BlueDotBrigade.Weevil.Cli.csproj", "{655E4324-C7C5-4314-87CE-748CDFD20004}" EndProject From 088d7d377858c3278d7fe46ac3e6cd0246913acd Mon Sep 17 00:00:00 2001 From: Pressacco <5507864+pressacco@users.noreply.github.com> Date: Fri, 22 Nov 2024 18:08:43 -0500 Subject: [PATCH 3/6] Fix : Updated all test projects to reference the new `BlueDotBrigade.Weevil.TestTools` library #191 --- .../Analysis/TemporalAnomalyAnalyzerTests.cs | 1 - .../Analysis/TemporalAnomalyMetricsTests.cs | 2 +- .../BlueDotBrigade.Weevil.Common-UnitTests.csproj | 2 +- .../Data/RecordCollectionExtensionsTests.cs | 1 - Tst/BlueDotBrigade.Weevil.Common-UnitTests/GlobalUsings.cs | 2 ++ .../Navigation/RecordSearchTests.cs | 2 +- .../BlueDotBrigade.Weevil.Core-FeatureTests.csproj | 2 +- .../Configuration/Reqnroll/ScenarioHooks.cs | 2 +- .../Configuration/Reqnroll/TestRunHooks.cs | 2 +- Tst/BlueDotBrigade.Weevil.Core-FeatureTests/GlobalUsings.cs | 2 +- .../BlueDotBrigade.Weevil.Core-UnitTests.csproj | 2 +- Tst/BlueDotBrigade.Weevil.Core-UnitTests/GlobalUsings.cs | 4 +++- .../Navigation/ActiveRecordTests.cs | 1 - .../Navigation/ContentNavigatorTests.cs | 1 - .../Navigation/LineNumberNavigatorTests.cs | 1 - .../Navigation/TimestampNavigatorTests.cs | 1 - .../BlueDotBrigade.Weevil.Gui-FeatureTests.csproj | 2 +- .../Configuration/Reqnroll/Plugins.cs | 1 - .../Configuration/Reqnroll/ScenarioHooks.cs | 2 +- .../Configuration/Reqnroll/TestRunHooks.cs | 2 +- .../Filter/FilterResultsViewModelTests.cs | 1 - Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/GlobalUsings.cs | 2 +- .../PreconditionSteps.cs | 1 - .../Transforms/TimeSpanTransform.cs | 2 +- Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/UiTestBase.cs | 1 - 25 files changed, 18 insertions(+), 24 deletions(-) create mode 100644 Tst/BlueDotBrigade.Weevil.Common-UnitTests/GlobalUsings.cs diff --git a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Analysis/TemporalAnomalyAnalyzerTests.cs b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Analysis/TemporalAnomalyAnalyzerTests.cs index 4505b0c7..39ef67b8 100644 --- a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Analysis/TemporalAnomalyAnalyzerTests.cs +++ b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Analysis/TemporalAnomalyAnalyzerTests.cs @@ -4,7 +4,6 @@ using global::BlueDotBrigade.Weevil.Analysis; using global::BlueDotBrigade.Weevil.Data; using global::BlueDotBrigade.Weevil.IO; - using global::BlueDotBrigade.Weevil.TestingTools.Data; using Microsoft.VisualStudio.TestTools.UnitTesting; using NSubstitute; diff --git a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Analysis/TemporalAnomalyMetricsTests.cs b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Analysis/TemporalAnomalyMetricsTests.cs index 11d24c76..356da702 100644 --- a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Analysis/TemporalAnomalyMetricsTests.cs +++ b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Analysis/TemporalAnomalyMetricsTests.cs @@ -5,7 +5,7 @@ using global::BlueDotBrigade.Weevil.Analysis; using global::BlueDotBrigade.Weevil.Data; using global::BlueDotBrigade.Weevil.Linq; - using global::BlueDotBrigade.Weevil.TestingTools.Data; + using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] diff --git a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/BlueDotBrigade.Weevil.Common-UnitTests.csproj b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/BlueDotBrigade.Weevil.Common-UnitTests.csproj index 1f7439f3..4337739e 100644 --- a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/BlueDotBrigade.Weevil.Common-UnitTests.csproj +++ b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/BlueDotBrigade.Weevil.Common-UnitTests.csproj @@ -35,7 +35,7 @@ - + diff --git a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Data/RecordCollectionExtensionsTests.cs b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Data/RecordCollectionExtensionsTests.cs index 54569c37..12c3ece7 100644 --- a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Data/RecordCollectionExtensionsTests.cs +++ b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Data/RecordCollectionExtensionsTests.cs @@ -6,7 +6,6 @@ using System.Linq; using BlueDotBrigade.Weevil.Data; using BlueDotBrigade.Weevil.Navigation; - using BlueDotBrigade.Weevil.TestingTools.Data; using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] diff --git a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/GlobalUsings.cs b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/GlobalUsings.cs new file mode 100644 index 00000000..ce2cf3c3 --- /dev/null +++ b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/GlobalUsings.cs @@ -0,0 +1,2 @@ +global using BlueDotBrigade.Weevil.TestTools; +global using BlueDotBrigade.Weevil.TestTools.Data; \ No newline at end of file diff --git a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Navigation/RecordSearchTests.cs b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Navigation/RecordSearchTests.cs index 39c7aef2..3616bce0 100644 --- a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Navigation/RecordSearchTests.cs +++ b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Navigation/RecordSearchTests.cs @@ -5,7 +5,7 @@ using System.Collections.Immutable; using BlueDotBrigade.Weevil.Data; using BlueDotBrigade.Weevil.Navigation; - using BlueDotBrigade.Weevil.TestingTools.Data; + using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] diff --git a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/BlueDotBrigade.Weevil.Core-FeatureTests.csproj b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/BlueDotBrigade.Weevil.Core-FeatureTests.csproj index e428d99c..ddd79f3b 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/BlueDotBrigade.Weevil.Core-FeatureTests.csproj +++ b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/BlueDotBrigade.Weevil.Core-FeatureTests.csproj @@ -35,7 +35,7 @@ - + diff --git a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Configuration/Reqnroll/ScenarioHooks.cs b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Configuration/Reqnroll/ScenarioHooks.cs index b28f7a0c..b55eb9a4 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Configuration/Reqnroll/ScenarioHooks.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Configuration/Reqnroll/ScenarioHooks.cs @@ -1,6 +1,6 @@ namespace BlueDotBrigade.Weevil.Configuration.Reqnroll { - using BlueDotBrigade.Weevil.TestingTools.Configuration.Reqnroll; + using BlueDotBrigade.Weevil.TestTools.Configuration.Reqnroll; /// /// Represents Reqnroll events that execute before & after every Gherkin scenario. diff --git a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Configuration/Reqnroll/TestRunHooks.cs b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Configuration/Reqnroll/TestRunHooks.cs index 0841fdc8..bee530e2 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Configuration/Reqnroll/TestRunHooks.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Configuration/Reqnroll/TestRunHooks.cs @@ -2,7 +2,7 @@ { using BlueDotBrigade.DatenLokator.TestsTools.Configuration; using BlueDotBrigade.Weevil.Diagnostics; - using BlueDotBrigade.Weevil.TestingTools.Configuration.Reqnroll; + using BlueDotBrigade.Weevil.TestTools.Configuration.Reqnroll; /// /// Represents Reqnroll events that execute before & after every test run. diff --git a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/GlobalUsings.cs b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/GlobalUsings.cs index 0d7bfaad..8c762883 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/GlobalUsings.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/GlobalUsings.cs @@ -5,4 +5,4 @@ global using Reqnroll; global using BlueDotBrigade.DatenLokator.TestsTools; -global using BlueDotBrigade.Weevil.TestingTools; \ No newline at end of file +global using BlueDotBrigade.Weevil.TestTools; \ No newline at end of file diff --git a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/BlueDotBrigade.Weevil.Core-UnitTests.csproj b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/BlueDotBrigade.Weevil.Core-UnitTests.csproj index 48c83112..92e6f659 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/BlueDotBrigade.Weevil.Core-UnitTests.csproj +++ b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/BlueDotBrigade.Weevil.Core-UnitTests.csproj @@ -33,7 +33,7 @@ - + diff --git a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/GlobalUsings.cs b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/GlobalUsings.cs index 0d008416..376e710a 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/GlobalUsings.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/GlobalUsings.cs @@ -1,3 +1,5 @@ global using NLog; -global using FluentAssertions; \ No newline at end of file +global using FluentAssertions; + +global using BlueDotBrigade.Weevil.TestTools.Data; \ No newline at end of file diff --git a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Navigation/ActiveRecordTests.cs b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Navigation/ActiveRecordTests.cs index 69198283..6d4994cd 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Navigation/ActiveRecordTests.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Navigation/ActiveRecordTests.cs @@ -4,7 +4,6 @@ using System.Collections.Generic; using System.Collections.Immutable; using BlueDotBrigade.Weevil.Data; - using BlueDotBrigade.Weevil.TestingTools.Data; using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] diff --git a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Navigation/ContentNavigatorTests.cs b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Navigation/ContentNavigatorTests.cs index d154b93e..f8909880 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Navigation/ContentNavigatorTests.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Navigation/ContentNavigatorTests.cs @@ -1,7 +1,6 @@ namespace BlueDotBrigade.Weevil.Navigation { using BlueDotBrigade.Weevil.Data; - using BlueDotBrigade.Weevil.TestingTools.Data; using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] diff --git a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Navigation/LineNumberNavigatorTests.cs b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Navigation/LineNumberNavigatorTests.cs index 39e29a30..873e230c 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Navigation/LineNumberNavigatorTests.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Navigation/LineNumberNavigatorTests.cs @@ -2,7 +2,6 @@ { using System.Collections.Generic; using BlueDotBrigade.Weevil.Data; - using BlueDotBrigade.Weevil.TestingTools.Data; using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] diff --git a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Navigation/TimestampNavigatorTests.cs b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Navigation/TimestampNavigatorTests.cs index 2a4e5e8c..b9cde375 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Navigation/TimestampNavigatorTests.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Navigation/TimestampNavigatorTests.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using BlueDotBrigade.Weevil.Data; - using BlueDotBrigade.Weevil.TestingTools.Data; using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/BlueDotBrigade.Weevil.Gui-FeatureTests.csproj b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/BlueDotBrigade.Weevil.Gui-FeatureTests.csproj index 38bf5a0f..5413b075 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/BlueDotBrigade.Weevil.Gui-FeatureTests.csproj +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/BlueDotBrigade.Weevil.Gui-FeatureTests.csproj @@ -51,6 +51,6 @@ - + diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Configuration/Reqnroll/Plugins.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Configuration/Reqnroll/Plugins.cs index 534815f6..6e7eeeb3 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Configuration/Reqnroll/Plugins.cs +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Configuration/Reqnroll/Plugins.cs @@ -7,7 +7,6 @@ using BlueDotBrigade; using BlueDotBrigade.Weevil; using BlueDotBrigade.Weevil.Gui.Configuration.Reqnroll; -using BlueDotBrigade.Weevil.TestingTools; using Reqnroll.Bindings.CucumberExpressions; using Reqnroll.Plugins; using Reqnroll.UnitTestProvider; diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Configuration/Reqnroll/ScenarioHooks.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Configuration/Reqnroll/ScenarioHooks.cs index 6882c07a..155e0ad4 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Configuration/Reqnroll/ScenarioHooks.cs +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Configuration/Reqnroll/ScenarioHooks.cs @@ -1,6 +1,6 @@ namespace BlueDotBrigade.Weevil.Gui.Configuration.Reqnroll { - using BlueDotBrigade.Weevil.TestingTools.Configuration.Reqnroll; + using BlueDotBrigade.Weevil.TestTools.Configuration.Reqnroll; /// /// Represents Reqnroll events that execute before & after every Gherkin scenario. diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Configuration/Reqnroll/TestRunHooks.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Configuration/Reqnroll/TestRunHooks.cs index 094dbb49..f5915a44 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Configuration/Reqnroll/TestRunHooks.cs +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Configuration/Reqnroll/TestRunHooks.cs @@ -2,7 +2,7 @@ { using BlueDotBrigade.DatenLokator.TestsTools.Configuration; using BlueDotBrigade.Weevil.Diagnostics; - using BlueDotBrigade.Weevil.TestingTools.Configuration.Reqnroll; + using BlueDotBrigade.Weevil.TestTools.Configuration.Reqnroll; /// /// Represents Reqnroll events that execute before & after every test run. diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Filter/FilterResultsViewModelTests.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Filter/FilterResultsViewModelTests.cs index 50751913..8dea84fa 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Filter/FilterResultsViewModelTests.cs +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Filter/FilterResultsViewModelTests.cs @@ -7,7 +7,6 @@ using System.Windows; using BlueDotBrigade.DatenLokator.TestsTools; using BlueDotBrigade.Weevil.Gui.Threading; - using BlueDotBrigade.Weevil.TestingTools; using Microsoft.VisualStudio.TestTools.UnitTesting; using NSubstitute; diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/GlobalUsings.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/GlobalUsings.cs index dc121f88..2d67bbd4 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/GlobalUsings.cs +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/GlobalUsings.cs @@ -7,4 +7,4 @@ global using Microsoft.VisualStudio.TestTools.UnitTesting; global using BlueDotBrigade.DatenLokator.TestsTools; -global using BlueDotBrigade.Weevil.TestingTools; \ No newline at end of file +global using BlueDotBrigade.Weevil.TestTools; \ No newline at end of file diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/PreconditionSteps.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/PreconditionSteps.cs index 8d4cd438..878433cf 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/PreconditionSteps.cs +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/PreconditionSteps.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Text; using System.Threading.Tasks; - using BlueDotBrigade.Weevil.TestingTools; using BlueDotBrigade.DatenLokator.TestsTools; [Binding] diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Transforms/TimeSpanTransform.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Transforms/TimeSpanTransform.cs index e2bbb5fc..3b3ed93d 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Transforms/TimeSpanTransform.cs +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Transforms/TimeSpanTransform.cs @@ -6,7 +6,7 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; - using BlueDotBrigade.Weevil.TestingTools.Text; + using BlueDotBrigade.Weevil.TestTools.Text; using Newtonsoft.Json.Converters; [Binding] diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/UiTestBase.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/UiTestBase.cs index d1c56c0d..86b4e288 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/UiTestBase.cs +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/UiTestBase.cs @@ -6,7 +6,6 @@ using System.Text; using System.Threading.Tasks; using BlueDotBrigade.Weevil.Gui.Threading; - using BlueDotBrigade.Weevil.TestingTools; public abstract class UiTestBase { From 1aacd335419ce573cf6926b94bbee47a0c9e4c0c Mon Sep 17 00:00:00 2001 From: Pressacco <5507864+pressacco@users.noreply.github.com> Date: Mon, 25 Nov 2024 21:38:24 -0500 Subject: [PATCH 4/6] New : Upgraded all libraries to .NET Core 9 #191 --- Doc/Notes/Notes.csproj | 2 +- Src/BlueDotBrigade.Weevil.Cli/BlueDotBrigade.Weevil.Cli.csproj | 2 +- .../BlueDotBrigade.Weevil.Common.csproj | 2 +- .../BlueDotBrigade.Weevil.Core.csproj | 2 +- Src/BlueDotBrigade.Weevil.Gui/BlueDotBrigade.Weevil.Gui.csproj | 2 +- .../BlueDotBrigade.Weevil.Plugins.csproj | 2 +- .../BlueDotBrigade.Weevil.PowerShell.csproj | 2 +- .../BlueDotBrigade.Weevil.TestTools.csproj | 2 +- .../BlueDotBrigade.Weevil.Windows.csproj | 2 +- .../BlueDotBrigade.Weevil.Common-UnitTests.csproj | 2 +- .../BlueDotBrigade.Weevil.Core-FeatureTests.csproj | 2 +- .../BlueDotBrigade.Weevil.Core-FunctionalTests.csproj | 2 +- .../BlueDotBrigade.Weevil.Core-UnitTests.csproj | 2 +- .../BlueDotBrigade.Weevil.Gui-FeatureTests.csproj | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Doc/Notes/Notes.csproj b/Doc/Notes/Notes.csproj index e333d472..d1695959 100644 --- a/Doc/Notes/Notes.csproj +++ b/Doc/Notes/Notes.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 x64 Notes 2.10.0 diff --git a/Src/BlueDotBrigade.Weevil.Cli/BlueDotBrigade.Weevil.Cli.csproj b/Src/BlueDotBrigade.Weevil.Cli/BlueDotBrigade.Weevil.Cli.csproj index dd1a1034..46ec811d 100644 --- a/Src/BlueDotBrigade.Weevil.Cli/BlueDotBrigade.Weevil.Cli.csproj +++ b/Src/BlueDotBrigade.Weevil.Cli/BlueDotBrigade.Weevil.Cli.csproj @@ -1,6 +1,6 @@  - net8.0 + net9.0 Exe x64 WeevilCli diff --git a/Src/BlueDotBrigade.Weevil.Common/BlueDotBrigade.Weevil.Common.csproj b/Src/BlueDotBrigade.Weevil.Common/BlueDotBrigade.Weevil.Common.csproj index dd0bedee..1bd21f98 100644 --- a/Src/BlueDotBrigade.Weevil.Common/BlueDotBrigade.Weevil.Common.csproj +++ b/Src/BlueDotBrigade.Weevil.Common/BlueDotBrigade.Weevil.Common.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 x64 BlueDotBrigade.Weevil.Common BlueDotBrigade.Weevil diff --git a/Src/BlueDotBrigade.Weevil.Core/BlueDotBrigade.Weevil.Core.csproj b/Src/BlueDotBrigade.Weevil.Core/BlueDotBrigade.Weevil.Core.csproj index 4fbc6283..84fff295 100644 --- a/Src/BlueDotBrigade.Weevil.Core/BlueDotBrigade.Weevil.Core.csproj +++ b/Src/BlueDotBrigade.Weevil.Core/BlueDotBrigade.Weevil.Core.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 x64 BlueDotBrigade.Weevil.Core BlueDotBrigade.Weevil diff --git a/Src/BlueDotBrigade.Weevil.Gui/BlueDotBrigade.Weevil.Gui.csproj b/Src/BlueDotBrigade.Weevil.Gui/BlueDotBrigade.Weevil.Gui.csproj index ff6b2a2a..c4dda553 100644 --- a/Src/BlueDotBrigade.Weevil.Gui/BlueDotBrigade.Weevil.Gui.csproj +++ b/Src/BlueDotBrigade.Weevil.Gui/BlueDotBrigade.Weevil.Gui.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net9.0-windows true true diff --git a/Src/BlueDotBrigade.Weevil.Plugins/BlueDotBrigade.Weevil.Plugins.csproj b/Src/BlueDotBrigade.Weevil.Plugins/BlueDotBrigade.Weevil.Plugins.csproj index 69af8246..0c81830a 100644 --- a/Src/BlueDotBrigade.Weevil.Plugins/BlueDotBrigade.Weevil.Plugins.csproj +++ b/Src/BlueDotBrigade.Weevil.Plugins/BlueDotBrigade.Weevil.Plugins.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 x64 BlueDotBrigade.Weevil.Plugins 2.11.0 diff --git a/Src/BlueDotBrigade.Weevil.PowerShell/BlueDotBrigade.Weevil.PowerShell.csproj b/Src/BlueDotBrigade.Weevil.PowerShell/BlueDotBrigade.Weevil.PowerShell.csproj index 2763b127..41689dd6 100644 --- a/Src/BlueDotBrigade.Weevil.PowerShell/BlueDotBrigade.Weevil.PowerShell.csproj +++ b/Src/BlueDotBrigade.Weevil.PowerShell/BlueDotBrigade.Weevil.PowerShell.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 BlueDotBrigade.Weevil.PowerShell BlueDotBrigade.Weevil.PowerShell Library diff --git a/Src/BlueDotBrigade.Weevil.TestTools/BlueDotBrigade.Weevil.TestTools.csproj b/Src/BlueDotBrigade.Weevil.TestTools/BlueDotBrigade.Weevil.TestTools.csproj index fb127b93..ebd971af 100644 --- a/Src/BlueDotBrigade.Weevil.TestTools/BlueDotBrigade.Weevil.TestTools.csproj +++ b/Src/BlueDotBrigade.Weevil.TestTools/BlueDotBrigade.Weevil.TestTools.csproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 x64 BlueDotBrigade.Weevil.TestingTools BlueDotBrigade.Weevil.TestTools diff --git a/Src/BlueDotBrigade.Weevil.Windows/BlueDotBrigade.Weevil.Windows.csproj b/Src/BlueDotBrigade.Weevil.Windows/BlueDotBrigade.Weevil.Windows.csproj index c503bf73..f2995754 100644 --- a/Src/BlueDotBrigade.Weevil.Windows/BlueDotBrigade.Weevil.Windows.csproj +++ b/Src/BlueDotBrigade.Weevil.Windows/BlueDotBrigade.Weevil.Windows.csproj @@ -1,6 +1,6 @@ - net8.0-windows + net9.0-windows x64 BlueDotBrigade.Weevil.Windows BlueDotBrigade.Weevil.Windows diff --git a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/BlueDotBrigade.Weevil.Common-UnitTests.csproj b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/BlueDotBrigade.Weevil.Common-UnitTests.csproj index 4337739e..9df9c537 100644 --- a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/BlueDotBrigade.Weevil.Common-UnitTests.csproj +++ b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/BlueDotBrigade.Weevil.Common-UnitTests.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net9.0-windows Library BlueDotBrigade.Weevil.Common false diff --git a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/BlueDotBrigade.Weevil.Core-FeatureTests.csproj b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/BlueDotBrigade.Weevil.Core-FeatureTests.csproj index ddd79f3b..05c3b820 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/BlueDotBrigade.Weevil.Core-FeatureTests.csproj +++ b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/BlueDotBrigade.Weevil.Core-FeatureTests.csproj @@ -1,6 +1,6 @@  - net8.0 + net9.0 Library enable enable diff --git a/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/BlueDotBrigade.Weevil.Core-FunctionalTests.csproj b/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/BlueDotBrigade.Weevil.Core-FunctionalTests.csproj index 0e19c0f1..96fd462c 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/BlueDotBrigade.Weevil.Core-FunctionalTests.csproj +++ b/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/BlueDotBrigade.Weevil.Core-FunctionalTests.csproj @@ -1,6 +1,6 @@  - net8.0 + net9.0 Library enable enable diff --git a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/BlueDotBrigade.Weevil.Core-UnitTests.csproj b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/BlueDotBrigade.Weevil.Core-UnitTests.csproj index 92e6f659..559e6f2f 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/BlueDotBrigade.Weevil.Core-UnitTests.csproj +++ b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/BlueDotBrigade.Weevil.Core-UnitTests.csproj @@ -1,6 +1,6 @@  - net8.0-windows + net9.0-windows Library BlueDotBrigade.Weevil false diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/BlueDotBrigade.Weevil.Gui-FeatureTests.csproj b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/BlueDotBrigade.Weevil.Gui-FeatureTests.csproj index 5413b075..c536ac91 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/BlueDotBrigade.Weevil.Gui-FeatureTests.csproj +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/BlueDotBrigade.Weevil.Gui-FeatureTests.csproj @@ -1,6 +1,6 @@  - net8.0-windows10.0.26100.0 + net9.0-windows10.0.26100.0 WinExe enable enable From 77d5045c4382a9ab1f875000b638f704eb6ba4eb Mon Sep 17 00:00:00 2001 From: Pressacco <5507864+pressacco@users.noreply.github.com> Date: Mon, 25 Nov 2024 21:46:42 -0500 Subject: [PATCH 5/6] New : Upgraded to DatenLokator NuGet package 2.1.0 #191 --- .../BlueDotBrigade.Weevil.Common-UnitTests.csproj | 2 +- .../BlueDotBrigade.Weevil.Core-FeatureTests.csproj | 2 +- .../BlueDotBrigade.Weevil.Core-FunctionalTests.csproj | 2 +- .../BlueDotBrigade.Weevil.Core-UnitTests.csproj | 2 +- .../BlueDotBrigade.Weevil.Gui-FeatureTests.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/BlueDotBrigade.Weevil.Common-UnitTests.csproj b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/BlueDotBrigade.Weevil.Common-UnitTests.csproj index 9df9c537..9ec1aa3a 100644 --- a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/BlueDotBrigade.Weevil.Common-UnitTests.csproj +++ b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/BlueDotBrigade.Weevil.Common-UnitTests.csproj @@ -22,7 +22,7 @@ - 2.0.0 + 2.1.0 diff --git a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/BlueDotBrigade.Weevil.Core-FeatureTests.csproj b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/BlueDotBrigade.Weevil.Core-FeatureTests.csproj index 05c3b820..a54e08f8 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/BlueDotBrigade.Weevil.Core-FeatureTests.csproj +++ b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/BlueDotBrigade.Weevil.Core-FeatureTests.csproj @@ -23,7 +23,7 @@ - + diff --git a/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/BlueDotBrigade.Weevil.Core-FunctionalTests.csproj b/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/BlueDotBrigade.Weevil.Core-FunctionalTests.csproj index 96fd462c..86b8c001 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/BlueDotBrigade.Weevil.Core-FunctionalTests.csproj +++ b/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/BlueDotBrigade.Weevil.Core-FunctionalTests.csproj @@ -23,7 +23,7 @@ - + diff --git a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/BlueDotBrigade.Weevil.Core-UnitTests.csproj b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/BlueDotBrigade.Weevil.Core-UnitTests.csproj index 559e6f2f..106b1f4a 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/BlueDotBrigade.Weevil.Core-UnitTests.csproj +++ b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/BlueDotBrigade.Weevil.Core-UnitTests.csproj @@ -16,7 +16,7 @@ - 2.0.0 + 2.1.0 diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/BlueDotBrigade.Weevil.Gui-FeatureTests.csproj b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/BlueDotBrigade.Weevil.Gui-FeatureTests.csproj index c536ac91..626dc321 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/BlueDotBrigade.Weevil.Gui-FeatureTests.csproj +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/BlueDotBrigade.Weevil.Gui-FeatureTests.csproj @@ -27,7 +27,7 @@ - + From d06069e47eaf6900c48a1274049b868e0b67443b Mon Sep 17 00:00:00 2001 From: Pressacco <5507864+pressacco@users.noreply.github.com> Date: Mon, 25 Nov 2024 21:48:00 -0500 Subject: [PATCH 6/6] Fix : Updated the DatenLokator namespace references. #191 --- .../GlobalUsings.cs | 4 +++- .../Runtime/Serialization/TypeFactoryTest.cs | 2 -- .../SimpleCallStackFormatterTests.cs | 1 - .../TestEnvironment.cs | 3 +-- .../Configuration/Reqnroll/TestRunHooks.cs | 2 +- .../GlobalUsings.cs | 2 +- .../GlobalUsings.cs | 2 +- .../OpeningFileShould.cs | 2 -- .../SavingRecordsShould.cs | 1 - .../SidecarDataShould.cs | 1 - .../TestEnvironment.cs | 4 ++-- .../Data/MultiLineRecordParserTest.cs | 2 -- .../Data/TsvRecordParserTest.cs | 3 --- Tst/BlueDotBrigade.Weevil.Core-UnitTests/GlobalUsings.cs | 8 ++++++-- .../SelectionManagerTest.cs | 2 -- .../TestEnvironment.cs | 3 ++- .../Configuration/Reqnroll/TestRunHooks.cs | 2 +- .../Converters/ContentConverterTests.cs | 2 -- .../Filter/FilterResultsViewModelTests.cs | 3 --- .../GlobalUsings.cs | 4 +++- .../PreconditionSteps.cs | 1 - .../ReqnrollSteps.cs | 2 -- 22 files changed, 21 insertions(+), 35 deletions(-) diff --git a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/GlobalUsings.cs b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/GlobalUsings.cs index ce2cf3c3..cadf29eb 100644 --- a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/GlobalUsings.cs +++ b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/GlobalUsings.cs @@ -1,2 +1,4 @@ -global using BlueDotBrigade.Weevil.TestTools; +global using Microsoft.VisualStudio.TestTools.UnitTesting; + +global using BlueDotBrigade.DatenLokator.TestTools; global using BlueDotBrigade.Weevil.TestTools.Data; \ No newline at end of file diff --git a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Runtime/Serialization/TypeFactoryTest.cs b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Runtime/Serialization/TypeFactoryTest.cs index 98b3c6dd..bdd2a938 100644 --- a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Runtime/Serialization/TypeFactoryTest.cs +++ b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/Runtime/Serialization/TypeFactoryTest.cs @@ -2,8 +2,6 @@ { using System.Collections.Generic; using System.IO; - using Microsoft.VisualStudio.TestTools.UnitTesting; - using BlueDotBrigade.DatenLokator.TestsTools; using Weevil.Runtime.Serialization; [TestClass] diff --git a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/SimpleCallStackFormatterTests.cs b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/SimpleCallStackFormatterTests.cs index 489ed966..63d9fc55 100644 --- a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/SimpleCallStackFormatterTests.cs +++ b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/SimpleCallStackFormatterTests.cs @@ -1,7 +1,6 @@ namespace BlueDotBrigade.Weevil.Common { using System; - using BlueDotBrigade.DatenLokator.TestsTools; using BlueDotBrigade.Weevil.Data; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/TestEnvironment.cs b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/TestEnvironment.cs index 7e62a781..dcd2756d 100644 --- a/Tst/BlueDotBrigade.Weevil.Common-UnitTests/TestEnvironment.cs +++ b/Tst/BlueDotBrigade.Weevil.Common-UnitTests/TestEnvironment.cs @@ -1,8 +1,7 @@ namespace BlueDotBrigade.Weevil.Common { using System; - using BlueDotBrigade.DatenLokator.TestsTools.Configuration; - using Microsoft.VisualStudio.TestTools.UnitTesting; + using BlueDotBrigade.DatenLokator.TestTools.Configuration; [TestClass] public class TestEnvironment diff --git a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Configuration/Reqnroll/TestRunHooks.cs b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Configuration/Reqnroll/TestRunHooks.cs index bee530e2..fd5f4ce1 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Configuration/Reqnroll/TestRunHooks.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/Configuration/Reqnroll/TestRunHooks.cs @@ -1,6 +1,6 @@ namespace BlueDotBrigade.Weevil.Configuration.Reqnroll { - using BlueDotBrigade.DatenLokator.TestsTools.Configuration; + using BlueDotBrigade.DatenLokator.TestTools.Configuration; using BlueDotBrigade.Weevil.Diagnostics; using BlueDotBrigade.Weevil.TestTools.Configuration.Reqnroll; diff --git a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/GlobalUsings.cs b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/GlobalUsings.cs index 8c762883..4ab78490 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/GlobalUsings.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-FeatureTests/GlobalUsings.cs @@ -4,5 +4,5 @@ global using Reqnroll; -global using BlueDotBrigade.DatenLokator.TestsTools; +global using BlueDotBrigade.DatenLokator.TestTools; global using BlueDotBrigade.Weevil.TestTools; \ No newline at end of file diff --git a/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/GlobalUsings.cs b/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/GlobalUsings.cs index 8bfb4b27..65b61485 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/GlobalUsings.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/GlobalUsings.cs @@ -4,4 +4,4 @@ global using Microsoft.VisualStudio.TestTools.UnitTesting; -global using BlueDotBrigade.DatenLokator.TestsTools; \ No newline at end of file +global using BlueDotBrigade.DatenLokator.TestTools; \ No newline at end of file diff --git a/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/OpeningFileShould.cs b/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/OpeningFileShould.cs index 6f15ff3b..a7b94018 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/OpeningFileShould.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/OpeningFileShould.cs @@ -2,9 +2,7 @@ namespace BlueDotBrigade.Weevil { using System; - using BlueDotBrigade.DatenLokator.TestsTools; using BlueDotBrigade.Weevil.Filter; - using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] public class OpeningFileShould diff --git a/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/SavingRecordsShould.cs b/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/SavingRecordsShould.cs index 7e7cc57b..7878d276 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/SavingRecordsShould.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/SavingRecordsShould.cs @@ -1,7 +1,6 @@ namespace BlueDotBrigade.Weevil { using System.IO; - using BlueDotBrigade.DatenLokator.TestsTools; using BlueDotBrigade.Weevil.Analysis; using BlueDotBrigade.Weevil.Test; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/SidecarDataShould.cs b/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/SidecarDataShould.cs index 730188d8..afb89d0c 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/SidecarDataShould.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/SidecarDataShould.cs @@ -1,6 +1,5 @@ namespace BlueDotBrigade.Weevil { - using BlueDotBrigade.DatenLokator.TestsTools; using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] diff --git a/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/TestEnvironment.cs b/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/TestEnvironment.cs index eba73a44..1e6bd56e 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/TestEnvironment.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-FunctionalTests/TestEnvironment.cs @@ -1,8 +1,8 @@ namespace BlueDotBrigade.Weevil { using System; - using BlueDotBrigade.DatenLokator.TestsTools.Configuration; - using Microsoft.VisualStudio.TestTools.UnitTesting; + + using BlueDotBrigade.DatenLokator.TestTools.Configuration; [TestClass] public class TestEnvironment diff --git a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Data/MultiLineRecordParserTest.cs b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Data/MultiLineRecordParserTest.cs index 9cbe97e5..39187836 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Data/MultiLineRecordParserTest.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Data/MultiLineRecordParserTest.cs @@ -2,8 +2,6 @@ { using System; using System.IO; - using BlueDotBrigade.DatenLokator.TestsTools; - using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] public class MultiLineRecordParserTest diff --git a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Data/TsvRecordParserTest.cs b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Data/TsvRecordParserTest.cs index 90eee864..d3de355b 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Data/TsvRecordParserTest.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/Data/TsvRecordParserTest.cs @@ -1,8 +1,5 @@ namespace BlueDotBrigade.Weevil.Data { - using BlueDotBrigade.DatenLokator.TestsTools; - using Microsoft.VisualStudio.TestTools.UnitTesting; - [TestClass] public class TsvRecordParserTest { diff --git a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/GlobalUsings.cs b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/GlobalUsings.cs index 376e710a..17e7f136 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/GlobalUsings.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/GlobalUsings.cs @@ -1,5 +1,9 @@ -global using NLog; +global using Microsoft.VisualStudio.TestTools.UnitTesting; + +global using NLog; global using FluentAssertions; -global using BlueDotBrigade.Weevil.TestTools.Data; \ No newline at end of file +global using BlueDotBrigade.Weevil.TestTools; +global using BlueDotBrigade.Weevil.TestTools.Data; +global using BlueDotBrigade.DatenLokator.TestTools; \ No newline at end of file diff --git a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/SelectionManagerTest.cs b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/SelectionManagerTest.cs index 6804cdbf..e9c06bbd 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/SelectionManagerTest.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/SelectionManagerTest.cs @@ -1,9 +1,7 @@ namespace BlueDotBrigade.Weevil { using System; - using BlueDotBrigade.DatenLokator.TestsTools; using BlueDotBrigade.Weevil.Navigation; - using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] public class SelectionManagerTest diff --git a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/TestEnvironment.cs b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/TestEnvironment.cs index 86b27032..0357c98c 100644 --- a/Tst/BlueDotBrigade.Weevil.Core-UnitTests/TestEnvironment.cs +++ b/Tst/BlueDotBrigade.Weevil.Core-UnitTests/TestEnvironment.cs @@ -1,9 +1,10 @@ namespace BlueDotBrigade.Weevil { using System; - using BlueDotBrigade.DatenLokator.TestsTools.Configuration; using Microsoft.VisualStudio.TestTools.UnitTesting; + using BlueDotBrigade.DatenLokator.TestTools.Configuration; + [TestClass] public class TestEnvironment { diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Configuration/Reqnroll/TestRunHooks.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Configuration/Reqnroll/TestRunHooks.cs index f5915a44..eacecb6a 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Configuration/Reqnroll/TestRunHooks.cs +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Configuration/Reqnroll/TestRunHooks.cs @@ -1,6 +1,6 @@ namespace BlueDotBrigade.Weevil.Gui.Configuration.Reqnroll { - using BlueDotBrigade.DatenLokator.TestsTools.Configuration; + using BlueDotBrigade.DatenLokator.TestTools.Configuration; using BlueDotBrigade.Weevil.Diagnostics; using BlueDotBrigade.Weevil.TestTools.Configuration.Reqnroll; diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Converters/ContentConverterTests.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Converters/ContentConverterTests.cs index 0619d86d..3faa91fa 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Converters/ContentConverterTests.cs +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Converters/ContentConverterTests.cs @@ -2,9 +2,7 @@ { using System; using System.Globalization; - using BlueDotBrigade.DatenLokator.TestsTools; using BlueDotBrigade.Weevil.Data; - using Microsoft.VisualStudio.TestTools.UnitTesting; [TestClass] public class ContentConverterTests diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Filter/FilterResultsViewModelTests.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Filter/FilterResultsViewModelTests.cs index 8dea84fa..7be419ab 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Filter/FilterResultsViewModelTests.cs +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/Filter/FilterResultsViewModelTests.cs @@ -5,10 +5,7 @@ using System.Threading; using System.Threading.Tasks; using System.Windows; - using BlueDotBrigade.DatenLokator.TestsTools; using BlueDotBrigade.Weevil.Gui.Threading; - using Microsoft.VisualStudio.TestTools.UnitTesting; - using NSubstitute; // Adding this attribute prevents the exception: InvalidOperationException The calling thread must be STA, because many UI components require this. // Mention this in: https://github.com/BlueDotBrigade/weevil/issues/191 diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/GlobalUsings.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/GlobalUsings.cs index 2d67bbd4..868141c7 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/GlobalUsings.cs +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/GlobalUsings.cs @@ -2,9 +2,11 @@ global using FluentAssertions; +global using NSubstitute; + global using Reqnroll; global using Microsoft.VisualStudio.TestTools.UnitTesting; -global using BlueDotBrigade.DatenLokator.TestsTools; +global using BlueDotBrigade.DatenLokator.TestTools; global using BlueDotBrigade.Weevil.TestTools; \ No newline at end of file diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/PreconditionSteps.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/PreconditionSteps.cs index 878433cf..37487284 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/PreconditionSteps.cs +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/PreconditionSteps.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Text; using System.Threading.Tasks; - using BlueDotBrigade.DatenLokator.TestsTools; [Binding] internal class PreconditionSteps : ReqnrollSteps diff --git a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/ReqnrollSteps.cs b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/ReqnrollSteps.cs index 392f941b..9458896b 100644 --- a/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/ReqnrollSteps.cs +++ b/Tst/BlueDotBrigade.Weevil.Gui-FeatureTests/ReqnrollSteps.cs @@ -1,10 +1,8 @@ namespace BlueDotBrigade.Weevil.Gui { using System.Collections.Generic; - using BlueDotBrigade.DatenLokator.TestsTools; using System.Windows; using BlueDotBrigade.Weevil.Gui.Filter; - using NSubstitute; using BlueDotBrigade.Weevil.Gui.Threading; internal abstract class ReqnrollSteps