diff --git a/.editorconfig b/.editorconfig index 9789e177cf..748af0581a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -180,6 +180,18 @@ dotnet_diagnostic.IDE0078.severity = warning # not default, increased severity t # Keep this in sync with csharp_style_prefer_not_pattern dotnet_diagnostic.IDE0083.severity = warning # not default, increased severity to ensure it is applied +# CA1836: Prefer IsEmpty over Count +dotnet_diagnostic.CA1836.severity = warning # not default, increased severity to ensure it is applied + +# CA2211: Non-constant fields should not be visible +dotnet_diagnostic.CA2211.severity = warning # not default, increased severity to ensure it is applied + +# CA1806: Do not ignore method results +dotnet_diagnostic.CA1806.severity = warning # not default, increased severity to ensure it is applied + +# CA1834: Consider using 'StringBuilder.Append(char)' when applicable +dotnet_diagnostic.CA1834.severity = warning # not default, increased severity to ensure it is always applied + #### C# Coding Conventions #### # var preferences diff --git a/src/Microsoft.TestPlatform.Build/Tracing.cs b/src/Microsoft.TestPlatform.Build/Tracing.cs index 704400ea3d..f8289b48f2 100644 --- a/src/Microsoft.TestPlatform.Build/Tracing.cs +++ b/src/Microsoft.TestPlatform.Build/Tracing.cs @@ -8,6 +8,7 @@ namespace Microsoft.TestPlatform.Build.Trace; public static class Tracing { [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Part of the public API.")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2211:Non-constant fields should not be visible", Justification = "Part of the public API.")] public static bool traceEnabled = false; public static void Trace(string message) diff --git a/src/Microsoft.TestPlatform.Common/Telemetry/TelemetryDataConstants.cs b/src/Microsoft.TestPlatform.Common/Telemetry/TelemetryDataConstants.cs index e5f7d539cc..fad59332b1 100644 --- a/src/Microsoft.TestPlatform.Common/Telemetry/TelemetryDataConstants.cs +++ b/src/Microsoft.TestPlatform.Common/Telemetry/TelemetryDataConstants.cs @@ -6,6 +6,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Common.Telemetry; /// /// The Telemetry data constants. /// +[System.Diagnostics.CodeAnalysis.SuppressMessage("Usage", "CA2211:Non-constant fields should not be visible", Justification = "Part of the public API.")] public static class TelemetryDataConstants { // ******************** Execution *********************** diff --git a/src/Microsoft.TestPlatform.Common/Utilities/ExceptionUtilities.cs b/src/Microsoft.TestPlatform.Common/Utilities/ExceptionUtilities.cs index 9a2c3d8d57..cb8c74d14a 100644 --- a/src/Microsoft.TestPlatform.Common/Utilities/ExceptionUtilities.cs +++ b/src/Microsoft.TestPlatform.Common/Utilities/ExceptionUtilities.cs @@ -31,7 +31,7 @@ public static string GetExceptionMessage(Exception exception) { exceptionString .AppendLine() - .Append(Resources.Resources.InnerException).Append(" ").AppendLine(inner.Message); + .Append(Resources.Resources.InnerException).Append(' ').AppendLine(inner.Message); AppendStackTrace(exceptionString, inner); inner = inner.InnerException; } diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryDataAggregator.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryDataAggregator.cs index e2ccacb0ce..4884e11e36 100644 --- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryDataAggregator.cs +++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryDataAggregator.cs @@ -51,7 +51,7 @@ public ParallelDiscoveryDataAggregator() /// public IDictionary GetAggregatedDiscoveryDataMetrics() { - if (_metricsAggregator == null || _metricsAggregator.Count == 0) + if (_metricsAggregator == null || _metricsAggregator.IsEmpty) { return new ConcurrentDictionary(); } diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelRunDataAggregator.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelRunDataAggregator.cs index 44e6eafaa6..d552304331 100644 --- a/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelRunDataAggregator.cs +++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelRunDataAggregator.cs @@ -103,7 +103,7 @@ public ITestRunStatistics GetAggregatedRunStats() /// public IDictionary GetAggregatedRunDataMetrics() { - if (_metricsAggregator == null || _metricsAggregator.Count == 0) + if (_metricsAggregator == null || _metricsAggregator.IsEmpty) { return new ConcurrentDictionary(); } diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameCollector.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameCollector.cs index 29781b73c8..c06f6a9f6c 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameCollector.cs +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameCollector.cs @@ -301,11 +301,9 @@ private void ValidateAndAddTriggerBasedProcessDumpParameters(XmlElement collectD { case XmlAttribute attribute when string.Equals(attribute.Name, Constants.CollectDumpAlwaysKey, StringComparison.OrdinalIgnoreCase): - if (string.Equals(attribute.Value, Constants.TrueConfigurationValue, StringComparison.OrdinalIgnoreCase) || string.Equals(attribute.Value, Constants.FalseConfigurationValue, StringComparison.OrdinalIgnoreCase)) - { - bool.TryParse(attribute.Value, out _collectDumpAlways); - } - else + if ((!string.Equals(attribute.Value, Constants.TrueConfigurationValue, StringComparison.OrdinalIgnoreCase) + && !string.Equals(attribute.Value, Constants.FalseConfigurationValue, StringComparison.OrdinalIgnoreCase)) + || !bool.TryParse(attribute.Value, out _collectDumpAlways)) { _logger.LogWarning(_context.SessionDataCollectionContext, string.Format(CultureInfo.CurrentUICulture, Resources.Resources.BlameParameterValueIncorrect, attribute.Name, Constants.TrueConfigurationValue, Constants.FalseConfigurationValue)); } diff --git a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameLogger.cs b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameLogger.cs index 13c1d63222..e829654273 100644 --- a/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameLogger.cs +++ b/src/Microsoft.TestPlatform.Extensions.BlameDataCollector/BlameLogger.cs @@ -15,8 +15,8 @@ namespace Microsoft.TestPlatform.Extensions.BlameDataCollector; /// /// The blame logger. /// -[FriendlyName(BlameLogger.FriendlyName)] -[ExtensionUri(BlameLogger.ExtensionUri)] +[FriendlyName(FriendlyName)] +[ExtensionUri(ExtensionUri)] public class BlameLogger : ITestLogger { #region Constants diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestCategoryItems.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestCategoryItems.cs index 3d430e855c..7add41fb94 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestCategoryItems.cs +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestCategoryItems.cs @@ -184,11 +184,11 @@ public override string ToString() StringBuilder returnString = new(); if (Count > 0) { - returnString.Append(","); + returnString.Append(','); foreach (TestCategoryItem item in this) { returnString.Append(item.TestCategory); - returnString.Append(","); + returnString.Append(','); } } diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/WorkItems.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/WorkItems.cs index e71799eb71..ca23e19b80 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/WorkItems.cs +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/WorkItems.cs @@ -153,11 +153,11 @@ public override string ToString() StringBuilder returnString = new(); if (Count > 0) { - returnString.Append(","); + returnString.Append(','); foreach (WorkItem item in this) { returnString.Append(item); - returnString.Append(","); + returnString.Append(','); } } diff --git a/src/Microsoft.TestPlatform.ObjectModel/Logger/LoggerSettings.cs b/src/Microsoft.TestPlatform.ObjectModel/Logger/LoggerSettings.cs index 05aa3c6c64..83fb4b047d 100644 --- a/src/Microsoft.TestPlatform.ObjectModel/Logger/LoggerSettings.cs +++ b/src/Microsoft.TestPlatform.ObjectModel/Logger/LoggerSettings.cs @@ -168,7 +168,7 @@ internal static LoggerSettings FromXml(XmlReader reader) break; case Constants.LoggerEnabledName: - bool.TryParse(reader.Value, out var value); + _ = bool.TryParse(reader.Value, out var value); settings.IsEnabled = value; break; diff --git a/src/Microsoft.TestPlatform.ObjectModel/TestCase.cs b/src/Microsoft.TestPlatform.ObjectModel/TestCase.cs index ee75c61965..0b4cd000c9 100644 --- a/src/Microsoft.TestPlatform.ObjectModel/TestCase.cs +++ b/src/Microsoft.TestPlatform.ObjectModel/TestCase.cs @@ -245,26 +245,18 @@ protected override object ProtectedGetPropertyValue(TestProperty property, objec { ValidateArg.NotNull(property, nameof(property)); - switch (property.Id) + return property.Id switch { - case "TestCase.CodeFilePath": - return CodeFilePath; - case "TestCase.DisplayName": - return DisplayName; - case "TestCase.ExecutorUri": - return ExecutorUri; - case "TestCase.FullyQualifiedName": - return FullyQualifiedName; - case "TestCase.Id": - return Id; - case "TestCase.LineNumber": - return LineNumber; - case "TestCase.Source": - return Source; - } - - // It is a custom test case property. Should be retrieved from the TestObject store. - return base.ProtectedGetPropertyValue(property, defaultValue); + "TestCase.CodeFilePath" => CodeFilePath, + "TestCase.DisplayName" => DisplayName, + "TestCase.ExecutorUri" => ExecutorUri, + "TestCase.FullyQualifiedName" => FullyQualifiedName, + "TestCase.Id" => Id, + "TestCase.LineNumber" => LineNumber, + "TestCase.Source" => Source, + // It is a custom test case property. Should be retrieved from the TestObject store. + _ => base.ProtectedGetPropertyValue(property, defaultValue), + }; } /// @@ -398,7 +390,7 @@ private static bool ValidateGuid(object value) { try { - new Guid(value.ToString()); + _ = new Guid(value.ToString()); return true; } catch (ArgumentNullException) diff --git a/src/vstest.console/Internal/ConsoleLogger.cs b/src/vstest.console/Internal/ConsoleLogger.cs index f2e120db9a..7930e3def4 100644 --- a/src/vstest.console/Internal/ConsoleLogger.cs +++ b/src/vstest.console/Internal/ConsoleLogger.cs @@ -82,7 +82,7 @@ internal class ConsoleLogger : ITestLoggerWithParameters /// public const string ExecutionIdPropertyIdentifier = "ExecutionId"; - // Figure out the longest result string (+1 for ! where applicable), so we don't + // Figure out the longest result string (+1 for ! where applicable), so we don't // get misaligned output on non-english systems private static readonly int LongestResultIndicator = new[] { @@ -134,7 +134,7 @@ internal ConsoleLogger(IOutput output, IProgressIndicator progressIndicator, IFe #endregion - #region Properties + #region Properties /// /// Gets instance of IOutput used for sending output. @@ -163,7 +163,7 @@ protected static IOutput Output #endif /// - /// Tracks leaf test outcomes per source. This is needed to correctly count hierarchical tests as well as + /// Tracks leaf test outcomes per source. This is needed to correctly count hierarchical tests as well as /// tracking counts per source for the minimal and quiet output. /// private ConcurrentDictionary LeafTestResults { get; set; } @@ -230,13 +230,13 @@ public void Initialize(TestLoggerEvents events, Dictionary param var prefixExists = parameters.TryGetValue(PrefixParam, out var prefix); if (prefixExists) { - bool.TryParse(prefix, out AppendPrefix); + _ = bool.TryParse(prefix, out AppendPrefix); } var progressArgExists = parameters.TryGetValue(ProgressIndicatorParam, out var enableProgress); if (progressArgExists) { - bool.TryParse(enableProgress, out EnableProgress); + _ = bool.TryParse(enableProgress, out EnableProgress); } parameters.TryGetValue(DefaultLoggerParameterNames.TargetFramework, out _targetFramework); @@ -249,7 +249,7 @@ public void Initialize(TestLoggerEvents events, Dictionary param #region Private Methods /// - /// Prints the timespan onto console. + /// Prints the timespan onto console. /// private static void PrintTimeSpan(TimeSpan timeSpan) { @@ -544,7 +544,7 @@ private void TestResultHandler(object sender, TestResultEventArgs e) if (!LeafTestResults.TryAdd(executionId, new MinimalTestResult(e.Result))) { - // This would happen if the key already exists. This should not happen, because we are + // This would happen if the key already exists. This should not happen, because we are // inserting by GUID key, so this would mean an error in our code. throw new InvalidOperationException($"ExecutionId {executionId} already exists."); } @@ -751,24 +751,13 @@ private void TestRunCompleteHandler(object sender, TestRunCompleteEventArgs e) sourceOutcome = TestOutcome.Skipped; } - - string resultString; - switch (sourceOutcome) + string resultString = sourceOutcome switch { - case TestOutcome.Failed: - resultString = (CommandLineResources.FailedTestIndicator + "!").PadRight(LongestResultIndicator); - break; - case TestOutcome.Passed: - resultString = (CommandLineResources.PassedTestIndicator + "!").PadRight(LongestResultIndicator); - break; - case TestOutcome.Skipped: - resultString = (CommandLineResources.SkippedTestIndicator + "!").PadRight(LongestResultIndicator); - break; - default: - resultString = CommandLineResources.None.PadRight(LongestResultIndicator); - break; - } - + TestOutcome.Failed => (CommandLineResources.FailedTestIndicator + "!").PadRight(LongestResultIndicator), + TestOutcome.Passed => (CommandLineResources.PassedTestIndicator + "!").PadRight(LongestResultIndicator), + TestOutcome.Skipped => (CommandLineResources.SkippedTestIndicator + "!").PadRight(LongestResultIndicator), + _ => CommandLineResources.None.PadRight(LongestResultIndicator), + }; var failed = sourceSummary.FailedTests.ToString().PadLeft(5); var passed = sourceSummary.PassedTests.ToString().PadLeft(5); var skipped = sourceSummary.SkippedTests.ToString().PadLeft(5); diff --git a/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs b/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs index 3e689cd5d4..ef9de1a80c 100644 --- a/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs +++ b/src/vstest.console/TestPlatformHelpers/TestRequestManager.cs @@ -692,7 +692,7 @@ private bool UpdateRunSettingsIfRequired( registrar); settingsUpdated |= UpdateDesignMode(document, runConfiguration); settingsUpdated |= UpdateCollectSourceInformation(document, runConfiguration); - settingsUpdated |= UpdateTargetDevice(navigator, document, runConfiguration); + settingsUpdated |= UpdateTargetDevice(navigator, document); settingsUpdated |= AddOrUpdateConsoleLogger(document, runConfiguration, loggerRunSettings); updatedRunSettingsXml = navigator.OuterXml; @@ -752,8 +752,7 @@ private bool AddOrUpdateConsoleLogger( private bool UpdateTargetDevice( XPathNavigator navigator, - XmlDocument document, - RunConfiguration runConfiguration) + XmlDocument document) { bool updateRequired = InferRunSettingsHelper.TryGetDeviceXml(navigator, out string deviceXml); if (updateRequired) diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs b/test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs index d9848e6e54..e45a51f82f 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs @@ -84,7 +84,7 @@ protected static string DeriveFrameworkArgValue(IntegrationTestEnvironment testE }; protected bool IsDesktopTargetFramework() - => _testEnvironment.TargetFramework == AcceptanceTestBase.DesktopTargetFramework; + => _testEnvironment.TargetFramework == DesktopTargetFramework; protected string GetTargetFramworkForRunsettings() { diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/AppDomainTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/AppDomainTests.cs index b7e51c2262..7e0d6eb1a3 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/AppDomainTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/AppDomainTests.cs @@ -23,7 +23,7 @@ public class AppDomainTests : AcceptanceTestBase [NetFullTargetFrameworkDataSource] public void RunTestExecutionWithDisableAppDomain(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var testAppDomainDetailFileName = Path.Combine(tempDir.Path, "appdomain_test.txt"); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/BlameDataCollectorTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/BlameDataCollectorTests.cs index c18eabe2fd..49459cceb0 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/BlameDataCollectorTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/BlameDataCollectorTests.cs @@ -30,7 +30,7 @@ public class BlameDataCollectorTests : AcceptanceTestBase public void BlameDataCollectorShouldGiveCorrectTestCaseName(RunnerInfo runnerInfo) { using var tempDir = new TempDirectory(); - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var assemblyPaths = GetAssetFullPath("BlameUnitTestProject.dll"); var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue); arguments = string.Concat(arguments, $" /Blame"); @@ -49,7 +49,7 @@ public void BlameDataCollectorShouldOutputDumpFile(RunnerInfo runnerInfo) { using var tempDir = new TempDirectory(); - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var assemblyPaths = BuildMultipleAssemblyPath("SimpleTestProject3.dll").Trim('\"'); var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue); arguments = string.Concat(arguments, $" /Blame:CollectDump"); @@ -75,7 +75,7 @@ public void BlameDataCollectorShouldNotOutputDumpFileWhenNoCrashOccurs(RunnerInf { using var tempDir = new TempDirectory(); - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var assemblyPaths = BuildMultipleAssemblyPath("SimpleTestProject.dll").Trim('\"'); var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue); arguments = string.Concat(arguments, $" /Blame:CollectDump"); @@ -101,7 +101,7 @@ public void BlameDataCollectorShouldOutputDumpFileWhenNoCrashOccursButCollectAlw { using var tempDir = new TempDirectory(); - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var assemblyPaths = BuildMultipleAssemblyPath("SimpleTestProject.dll").Trim('\"'); var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue); arguments = string.Concat(arguments, $" /Blame:CollectDump;CollectAlways=True"); @@ -124,7 +124,7 @@ public void BlameDataCollectorShouldOutputDumpFileWhenNoCrashOccursButCollectAlw // [NetFrameworkRunner("net452;net472;netcoreapp3.1;net5.0")] public void HangDumpOnTimeout(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var assemblyPaths = GetAssetFullPath("timeout.dll"); var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue); arguments = string.Concat(arguments, $@" /Blame:""CollectHangDump;HangDumpType=full;TestTimeout=3s"""); @@ -147,7 +147,7 @@ public void HangDumpOnTimeout(RunnerInfo runnerInfo) public void CrashDumpWhenThereIsNoTimeout(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var assemblyPaths = GetAssetFullPath("timeout.dll"); var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue); arguments = string.Concat(arguments, $@" /Blame:""CollectDump;DumpType=full;CollectAlways=true;CollectHangDump"""); @@ -170,7 +170,7 @@ public void CrashDumpWhenThereIsNoTimeout(RunnerInfo runnerInfo) public void CrashDumpOnExit(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var assemblyPaths = GetAssetFullPath("timeout.dll"); var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue); arguments = string.Concat(arguments, $@" /Blame:""CollectDump;DumpType=full;CollectAlways=true"""); @@ -191,7 +191,7 @@ public void CrashDumpOnExit(RunnerInfo runnerInfo) // [NetFrameworkRunner("net452;net472;netcoreapp3.1;net5.0")] public void CrashDumpOnStackOverflow(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var assemblyPaths = GetAssetFullPath("crash.dll"); var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue); arguments = string.Concat(arguments, $@" /Blame:""CollectDump;DumpType=full"""); @@ -212,7 +212,7 @@ public void CrashDumpOnStackOverflow(RunnerInfo runnerInfo) // [NetFrameworkRunner(NET50)] public void CrashDumpChildProcesses(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var assemblyPaths = GetAssetFullPath("child-crash.dll"); var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue); arguments = string.Concat(arguments, $@" /Blame:""CollectDump;DumpType=full"""); @@ -227,7 +227,7 @@ public void CrashDumpChildProcesses(RunnerInfo runnerInfo) // [NetFrameworkRunner("net452;net472;netcoreapp3.1;net5.0")] public void HangDumpChildProcesses(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var assemblyPaths = GetAssetFullPath("child-hang.dll"); var arguments = PrepareArguments(assemblyPaths, GetTestAdapterPath(), string.Empty, string.Empty, runnerInfo.InIsolationValue); arguments = string.Concat(arguments, $@" /Blame:""CollectHangDump;HangDumpType=full;TestTimeout=15s"""); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/CodeCoverageTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/CodeCoverageTests.cs index 838e2d4bc1..672de952ce 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/CodeCoverageTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/CodeCoverageTests.cs @@ -207,7 +207,7 @@ public void CollectCodeCoverageSpecifyOutputFormatCoberturaOverrideRunSettingsCo private void CollectCodeCoverage(RunnerInfo runnerInfo, TestParameters testParameters) { using var tempDir = new TempDirectory(); - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var arguments = CreateArguments(tempDir, runnerInfo, testParameters, out var trxFilePath); @@ -218,7 +218,7 @@ private void CollectCodeCoverage(RunnerInfo runnerInfo, TestParameters testParam testParameters.ExpectedSkippedTests, testParameters.ExpectedFailedTests); - var actualCoverageFile = CodeCoverageTests.GetCoverageFileNameFromTrx(trxFilePath, tempDir.Path); + var actualCoverageFile = GetCoverageFileNameFromTrx(trxFilePath, tempDir.Path); Console.WriteLine($@"Coverage file: {actualCoverageFile} Results directory: {tempDir.Path} trxfile: {trxFilePath}"); Assert.IsTrue(File.Exists(actualCoverageFile), "Coverage file not found: {0}", actualCoverageFile); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DataCollectionTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DataCollectionTests.cs index 2a89fabd93..832fdae456 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/DataCollectionTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/DataCollectionTests.cs @@ -24,7 +24,7 @@ public class DataCollectionTests : AcceptanceTestBase [NetCoreTargetFrameworkDataSource] public void ExecuteTestsWithDataCollection(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var assemblyPaths = BuildMultipleAssemblyPath("SimpleTestProject2.dll").Trim('\"'); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DebugAssertTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DebugAssertTests.cs index c24f60597b..7fada7b084 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/DebugAssertTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/DebugAssertTests.cs @@ -16,7 +16,7 @@ public void RunningTestWithAFailingDebugAssertDoesNotCrashTheHostingProcess(Runn { // when debugging this test in case it starts failing, be aware that the default behavior of Debug.Assert // is to not crash the process when we are running in debug, and debugger is attached - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var assemblyPath = BuildMultipleAssemblyPath("CrashingOnDebugAssertTestProject.dll").Trim('\"'); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs index e788e09f85..7f8fbbc4eb 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs @@ -17,7 +17,7 @@ public class DifferentTestFrameworkSimpleTests : AcceptanceTestBase [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)] public void ChutzpahRunAllTestExecution(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var testJSFileAbsolutePath = Path.Combine(_testEnvironment.TestAssetsPath, "test.js"); var arguments = PrepareArguments(testJSFileAbsolutePath, GetTestAdapterPath(UnitTestFramework.Chutzpah), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, resultsDirectory: tempDir.Path); @@ -32,7 +32,7 @@ public void ChutzpahRunAllTestExecution(RunnerInfo runnerInfo) [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true, useCoreRunner: false)] public void CPPRunAllTestExecutionNetFramework(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); CppRunAllTests(runnerInfo.RunnerFramework, "x86"); } @@ -44,7 +44,7 @@ public void CPPRunAllTestExecutionNetFramework(RunnerInfo runnerInfo) [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true, useCoreRunner: false)] public void CPPRunAllTestExecutionPlatformx64NetFramework(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); CppRunAllTests(runnerInfo.RunnerFramework, "x64"); } @@ -55,7 +55,7 @@ public void CPPRunAllTestExecutionPlatformx64NetFramework(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource(useDesktopRunner: false, useCoreRunner: true, useNetCore21Target: false, useNetCore31Target: true)] public void CPPRunAllTestExecutionPlatformx64Net(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); CppRunAllTests(runnerInfo.RunnerFramework, "x64"); } @@ -65,7 +65,7 @@ public void CPPRunAllTestExecutionPlatformx64Net(RunnerInfo runnerInfo) public void WebTestRunAllTestsWithRunSettings(RunnerInfo runnerInfo) { using var tempDir = new TempDirectory(); - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var runSettingsFilePath = Path.Combine(tempDir.Path, Guid.NewGuid() + ".runsettings"); //test the iterationCount setting for WebTestRunConfiguration in run settings @@ -77,7 +77,7 @@ public void WebTestRunAllTestsWithRunSettings(RunnerInfo runnerInfo) "; - IntegrationTestBase.CreateRunSettingsFile(runSettingsFilePath, runSettingsXml); + CreateRunSettingsFile(runSettingsFilePath, runSettingsXml); //minWebTestResultFileSizeInKB is set to 150 here as the web test has a iteration count set to 5 //therefore, the test will run for 5 iterations resulting in web test result file size of at least 150 KB @@ -89,7 +89,7 @@ public void WebTestRunAllTestsWithRunSettings(RunnerInfo runnerInfo) [NetFullTargetFrameworkDataSource] public void CodedWebTestRunAllTests(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); CodedWebTestRunAllTests(runnerInfo.RunnerFramework); } @@ -98,7 +98,7 @@ public void CodedWebTestRunAllTests(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void NUnitRunAllTestExecution(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments( @@ -115,7 +115,7 @@ public void NUnitRunAllTestExecution(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void XUnitRunAllTestExecution(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); string testAssemblyPath; diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DiscoveryTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DiscoveryTests.cs index 3816760ee4..a5f940a920 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/DiscoveryTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/DiscoveryTests.cs @@ -21,7 +21,7 @@ public class DiscoveryTests : AcceptanceTestBase [NetCoreTargetFrameworkDataSource] public void DiscoverAllTests(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); InvokeVsTestForDiscovery(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue); @@ -60,7 +60,7 @@ public void DiscoverFullyQualifiedTests(RunnerInfo runnerInfo) using var tempDir = new TempDirectory(); var dummyFilePath = Path.Combine(tempDir.Path, $"{Guid.NewGuid()}.txt"); - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var listOfTests = new[] { "SampleUnitTestProject.UnitTest1.PassingTest", "SampleUnitTestProject.UnitTest1.FailingTest", "SampleUnitTestProject.UnitTest1.SkippingTest" }; @@ -77,7 +77,7 @@ public void DiscoverFullyQualifiedTests(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void DiscoverTestsShouldShowProperWarningIfNoTestsOnTestCaseFilter(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var assetFullPath = GetAssetFullPath("SimpleTestProject2.dll"); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DotnetTestTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DotnetTestTests.cs index 6773654c46..6e5dc8579c 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/DotnetTestTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/DotnetTestTests.cs @@ -66,7 +66,7 @@ public void PassInlineSettings(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void PassInlineSettingsToDll(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var assemblyPath = BuildMultipleAssemblyPath("ParametrizedTestProject.dll").Trim('\"'); InvokeDotnetTest($@"{assemblyPath} --logger:""Console;Verbosity=normal"" -- TestRunParameters.Parameter(name=\""weburl\"", value=\""http://localhost//def\"")"); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs index ab2cb51c0c..9a0b50709a 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs @@ -57,7 +57,7 @@ public void RunMultipleTestAssembliesWithoutTestAdapterPath(RunnerInfo runnerInf [NetCoreTargetFrameworkDataSource] public void RunMultipleTestAssembliesInParallel(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var assemblyPaths = BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll").Trim('\"'); @@ -87,7 +87,7 @@ public void RunMultipleTestAssembliesInParallel(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void TestSessionTimeOutTests(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var assemblyPaths = @@ -109,7 +109,7 @@ public void TestSessionTimeOutTests(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void TestPlatformShouldBeCompatibleWithOldTestHost(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var assemblyPaths = BuildMultipleAssemblyPath("SampleProjectWithOldTestHost.dll").Trim('\"'); @@ -126,7 +126,7 @@ public void TestPlatformShouldBeCompatibleWithOldTestHost(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void WorkingDirectoryIsSourceDirectory(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var assemblyPaths = BuildMultipleAssemblyPath("SimpleTestProject3.dll").Trim('\"'); @@ -144,7 +144,7 @@ public void WorkingDirectoryIsSourceDirectory(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void StackOverflowExceptionShouldBeLoggedToConsoleAndDiagLogFile(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); if (IntegrationTestEnvironment.BuildConfiguration.Equals("release", StringComparison.OrdinalIgnoreCase)) @@ -181,7 +181,7 @@ public void StackOverflowExceptionShouldBeLoggedToConsoleAndDiagLogFile(RunnerIn [NetCoreTargetFrameworkDataSource] public void UnhandleExceptionExceptionShouldBeLoggedToDiagLogFile(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var diagLogFilePath = Path.Combine(tempDir.Path, $"std_error_log_{Guid.NewGuid()}.txt"); @@ -205,7 +205,7 @@ public void UnhandleExceptionExceptionShouldBeLoggedToDiagLogFile(RunnerInfo run [NetFullTargetFrameworkDataSource] public void IncompatibleSourcesWarningShouldBeDisplayedInTheConsole(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var expectedWarningContains = @"Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.5.1 framework and X86 platform. SimpleTestProject3.dll is built for Framework .NETFramework,Version=v4.5.1 and Platform X64"; @@ -228,7 +228,7 @@ public void IncompatibleSourcesWarningShouldBeDisplayedInTheConsole(RunnerInfo r [NetFullTargetFrameworkDataSource] public void NoIncompatibleSourcesWarningShouldBeDisplayedInTheConsole(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var expectedWarningContains = @"Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.5.1 framework and X86 platform. SimpleTestProjectx86 is built for Framework .NETFramework,Version=v4.5.1 and Platform X86"; @@ -249,7 +249,7 @@ public void NoIncompatibleSourcesWarningShouldBeDisplayedInTheConsole(RunnerInfo [NetFullTargetFrameworkDataSource] public void IncompatibleSourcesWarningShouldBeDisplayedInTheConsoleOnlyWhenRunningIn32BitOS(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var expectedWarningContains = @"Following DLL(s) do not match current settings, which are .NETFramework,Version=v4.5.1 framework and X86 platform. SimpleTestProject2.dll is built for Framework .NETFramework,Version=v4.5.1 and Platform X64"; diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionThreadApartmentStateTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionThreadApartmentStateTests.cs index d594a81421..20619578a8 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionThreadApartmentStateTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionThreadApartmentStateTests.cs @@ -14,7 +14,7 @@ public class ExecutionThreadApartmentStateTests : AcceptanceTestBase [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)] public void UITestShouldPassIfApartmentStateIsSTA(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var assemblyPaths = BuildMultipleAssemblyPath("SimpleTestProject3.dll").Trim('\"'); @@ -28,7 +28,7 @@ public void UITestShouldPassIfApartmentStateIsSTA(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void WarningShouldBeShownWhenValueIsSTAForNetCore(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var assemblyPaths = @@ -44,7 +44,7 @@ public void WarningShouldBeShownWhenValueIsSTAForNetCore(RunnerInfo runnerInfo) [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)] public void UITestShouldFailWhenDefaultApartmentStateIsMTA(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var assemblyPaths = @@ -60,7 +60,7 @@ public void UITestShouldFailWhenDefaultApartmentStateIsMTA(RunnerInfo runnerInfo [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)] public void CancelTestExectionShouldWorkWhenApartmentStateIsSTA(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var assemblyPaths = diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/FilePatternParserTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/FilePatternParserTests.cs index d89fdd0eab..3d4ab325ec 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/FilePatternParserTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/FilePatternParserTests.cs @@ -16,7 +16,7 @@ public class FilePatternParserTests : AcceptanceTestBase [NetCoreTargetFrameworkDataSource] public void WildCardPatternShouldCorrectlyWorkOnFiles(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var testAssembly = GetSampleTestAssembly(); @@ -37,7 +37,7 @@ public void WildCardPatternShouldCorrectlyWorkOnFiles(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void WildCardPatternShouldCorrectlyWorkOnArbitraryDepthDirectories(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var testAssembly = GetSampleTestAssembly(); @@ -60,7 +60,7 @@ public void WildCardPatternShouldCorrectlyWorkOnArbitraryDepthDirectories(Runner [NetCoreTargetFrameworkDataSource] public void WildCardPatternShouldCorrectlyWorkForRelativeAssemblyPath(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var testAssembly = GetSampleTestAssembly(); @@ -87,7 +87,7 @@ public void WildCardPatternShouldCorrectlyWorkForRelativeAssemblyPath(RunnerInfo [NetCoreTargetFrameworkDataSource] public void WildCardPatternShouldCorrectlyWorkOnMultipleFiles(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var testAssembly = BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll").Trim('\"'); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/FrameworkTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/FrameworkTests.cs index 17cf2cc511..9a143aa6cc 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/FrameworkTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/FrameworkTests.cs @@ -15,7 +15,7 @@ public class FrameworkTests : AcceptanceTestBase [NetCoreTargetFrameworkDataSource] public void FrameworkArgumentShouldWork(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments(GetSampleTestAssembly(), string.Empty, string.Empty, string.Empty, resultsDirectory: tempDir.Path); @@ -30,7 +30,7 @@ public void FrameworkArgumentShouldWork(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void FrameworkShortNameArgumentShouldWork(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments(GetSampleTestAssembly(), string.Empty, string.Empty, string.Empty, resultsDirectory: tempDir.Path); @@ -47,7 +47,7 @@ public void FrameworkShortNameArgumentShouldWork(RunnerInfo runnerInfo) //[NetCoreTargetFrameworkDataSource] public void OnWrongFrameworkPassedTestRunShouldNotRun(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments(GetSampleTestAssembly(), string.Empty, string.Empty, string.Empty, resultsDirectory: tempDir.Path); @@ -79,7 +79,7 @@ public void OnWrongFrameworkPassedTestRunShouldNotRun(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void RunSpecificTestsShouldWorkWithFrameworkInCompatibleWarning(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments(GetSampleTestAssembly(), string.Empty, string.Empty, string.Empty, resultsDirectory: tempDir.Path); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs index 69f4c60750..cca7de2df8 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/LoggerTests.cs @@ -19,7 +19,7 @@ public class LoggerTests : AcceptanceTestBase [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)] public void TrxLoggerWithFriendlyNameShouldProperlyOverwriteFile(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, tempDir.Path); @@ -41,7 +41,7 @@ public void TrxLoggerWithFriendlyNameShouldProperlyOverwriteFile(RunnerInfo runn [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)] public void HtmlLoggerWithFriendlyNameShouldProperlyOverwriteFile(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, tempDir.Path); @@ -62,7 +62,7 @@ public void HtmlLoggerWithFriendlyNameShouldProperlyOverwriteFile(RunnerInfo run [NetCoreTargetFrameworkDataSource] public void TrxLoggerWithExecutorUriShouldProperlyOverwriteFile(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, tempDir.Path); @@ -84,7 +84,7 @@ public void TrxLoggerWithExecutorUriShouldProperlyOverwriteFile(RunnerInfo runne [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)] public void TrxLoggerWithLogFilePrefixShouldGenerateMultipleTrx(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var trxFileNamePattern = "TestResults"; @@ -105,7 +105,7 @@ public void TrxLoggerWithLogFilePrefixShouldGenerateMultipleTrx(RunnerInfo runne [NetCoreTargetFrameworkDataSource] public void HtmlLoggerWithExecutorUriShouldProperlyOverwriteFile(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue, runnerInfo.InIsolationValue, tempDir.Path); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/MultitargetingTestHostTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/MultitargetingTestHostTests.cs index 4780485676..c3f55b84b9 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/MultitargetingTestHostTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/MultitargetingTestHostTests.cs @@ -17,7 +17,7 @@ public class MultitargetingTestHostTests : AcceptanceTestBase [NetFrameworkRunner(NETFX452_48)] public void RunningTestWithAFailingDebugAssertDoesNotCrashTheHostingProcess(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var assemblyPath = BuildMultipleAssemblyPath("MultitargetedNetFrameworkProject.dll").Trim('\"'); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/PortableNugetPackageTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/PortableNugetPackageTests.cs index 657970bfbf..a7c7296f5a 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/PortableNugetPackageTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/PortableNugetPackageTests.cs @@ -40,7 +40,7 @@ public static void ClassCleanup() [NetCoreTargetFrameworkDataSource] public void RunMultipleTestAssemblies(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var assemblyPaths = BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll").Trim('\"'); @@ -55,7 +55,7 @@ public void RunMultipleTestAssemblies(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void DiscoverAllTests(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); InvokeVsTestForDiscovery(GetSampleTestAssembly(), GetTestAdapterPath(), string.Empty, FrameworkArgValue); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs index 8f10458467..d851c8ba8b 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs @@ -24,7 +24,7 @@ public class RunsettingsTests : AcceptanceTestBase [NetCoreTargetFrameworkDataSource] public void CommandLineRunSettingsShouldWinAmongAllOptions(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var targetPlatform = "x86"; var testhostProcessName = new[] { "testhost.x86" }; @@ -61,7 +61,7 @@ public void CommandLineRunSettingsShouldWinAmongAllOptions(RunnerInfo runnerInfo [NetCoreTargetFrameworkDataSource] public void CLIRunsettingsShouldWinBetweenCLISwitchesAndCLIRunsettings(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var targetPlatform = "x86"; var testhostProcessName = new[] { "testhost.x86" }; @@ -217,7 +217,7 @@ public void RunSettingsWithParallelAndPlatformX64(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void RunSettingsWithInvalidValueShouldLogError(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var runConfigurationDictionary = new Dictionary @@ -239,7 +239,7 @@ public void RunSettingsWithInvalidValueShouldLogError(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void TestAdapterPathFromRunSettings(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var runConfigurationDictionary = new Dictionary @@ -263,7 +263,7 @@ public void TestAdapterPathFromRunSettings(RunnerInfo runnerInfo) [NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)] public void LegacySettingsWithPlatform(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var testAssemblyPath = GetAssetFullPath("LegacySettingsUnitTestProject.dll"); @@ -295,7 +295,7 @@ public void LegacySettingsWithPlatform(RunnerInfo runnerInfo) [NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)] public void LegacySettingsWithScripts(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var testAssemblyPath = GetAssetFullPath("LegacySettingsUnitTestProject.dll"); @@ -342,7 +342,7 @@ public void LegacySettingsWithScripts(RunnerInfo runnerInfo) [NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)] public void LegacySettingsWithDeploymentItem(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var testAssemblyPath = GetAssetFullPath("LegacySettingsUnitTestProject.dll"); @@ -379,7 +379,7 @@ public void LegacySettingsWithDeploymentItem(RunnerInfo runnerInfo) [NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)] public void LegacySettingsTestTimeout(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var testAssemblyPath = GetAssetFullPath("LegacySettingsUnitTestProject.dll"); @@ -407,7 +407,7 @@ public void LegacySettingsTestTimeout(RunnerInfo runnerInfo) [NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)] public void LegacySettingsAssemblyResolution(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var testAssemblyPath = GetAssetFullPath("LegacySettingsUnitTestProject.dll"); @@ -450,7 +450,7 @@ public void LegacySettingsAssemblyResolution(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void EnvironmentVariablesSettingsShouldSetEnvironmentVariables(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var testAssemblyPath = GetAssetFullPath("EnvironmentVariablesTestProject.dll"); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/SelfContainedAppTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/SelfContainedAppTests.cs index 3ffe39733b..fe1210c347 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/SelfContainedAppTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/SelfContainedAppTests.cs @@ -22,7 +22,7 @@ public void RunningApplicationThatIsBuiltAsSelfContainedWillNotFailToFindHostpol // properties, the testhost.exe executable is given a runtimeconfig that instructs it to find a hostpolicy.dll and hostfxr.dll next to it // that will fail if we run the testhost.exe from the .nuget location, but will work when we run it from the output folder // see https://github.com/dotnet/runtime/issues/3569#issuecomment-595820524 and below for description of how it works - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); // the app is published to win10-x64 because of the runtime identifier in the project diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TelemetryTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TelemetryTests.cs index b88b7f152a..8da937dc7b 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/TelemetryTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/TelemetryTests.cs @@ -24,7 +24,7 @@ public class TelemetryTests : AcceptanceTestBase [NetCoreTargetFrameworkDataSource] public void RunTestsShouldPublishMetrics(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); RunTests(runnerInfo.RunnerFramework); } diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TestCaseFilterTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TestCaseFilterTests.cs index 84bade3fa1..3c73b090d0 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/TestCaseFilterTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/TestCaseFilterTests.cs @@ -16,7 +16,7 @@ public class TestCaseFilterTests : AcceptanceTestBase [NetCoreTargetFrameworkDataSource] public void RunSelectedTestsWithAndOperatorTrait(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments( @@ -34,7 +34,7 @@ public void RunSelectedTestsWithAndOperatorTrait(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void RunSelectedTestsWithCategoryTraitInMixCase(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments( @@ -52,7 +52,7 @@ public void RunSelectedTestsWithCategoryTraitInMixCase(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void RunSelectedTestsWithClassNameTrait(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments( @@ -70,7 +70,7 @@ public void RunSelectedTestsWithClassNameTrait(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void RunSelectedTestsWithFullyQualifiedNameTrait(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments( @@ -90,7 +90,7 @@ public void RunSelectedTestsWithFullyQualifiedNameTrait(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void RunSelectedTestsWithNameTrait(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments( @@ -108,7 +108,7 @@ public void RunSelectedTestsWithNameTrait(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void RunSelectedTestsWithOrOperatorTrait(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments( @@ -126,7 +126,7 @@ public void RunSelectedTestsWithOrOperatorTrait(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void RunSelectedTestsWithPriorityTrait(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments( @@ -148,7 +148,7 @@ public void RunSelectedTestsWithPriorityTrait(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void TestCaseFilterShouldWorkIfOnlyPropertyValueGivenInExpression(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments( @@ -175,7 +175,7 @@ public void DiscoverMstestV1TestsWithAndOperatorTrait(RunnerInfo runnerInfo) return; } - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); var arguments = PrepareArguments( @@ -208,7 +208,7 @@ public void DiscoverTmiTestsWithOnlyPropertyValue(RunnerInfo runnerInfo) return; } - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); using var tempDir = new TempDirectory(); string testAssemblyPath = _testEnvironment.GetTestAsset("MstestV1UnitTestProject.dll"); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs index 336b9dc62d..6970ab1fc8 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs @@ -60,7 +60,7 @@ public void CleanUp() [NetCoreTargetFrameworkDataSource(useCoreRunner: false)] public void RunMultipleTestAssembliesWithCodeCoverage(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); var assemblyPaths = BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll").Trim('\"'); @@ -69,7 +69,7 @@ public void RunMultipleTestAssembliesWithCodeCoverage(RunnerInfo runnerInfo) ExitCodeEquals(1); // failing tests - var actualCoverageFile = CodeCoverageTests.GetCoverageFileNameFromTrx(trxFilePath, _resultsDirectory.Path); + var actualCoverageFile = GetCoverageFileNameFromTrx(trxFilePath, _resultsDirectory.Path); Console.WriteLine($@"Coverage file: {actualCoverageFile} Results directory: {_resultsDirectory} trxfile: {trxFilePath}"); Assert.IsTrue(File.Exists(actualCoverageFile), "Coverage file not found: {0}", actualCoverageFile); } diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunTestsWithFilterTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunTestsWithFilterTests.cs index 2da9be9081..f766d4d6fa 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunTestsWithFilterTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/RunTestsWithFilterTests.cs @@ -37,7 +37,7 @@ public void Cleanup() [NetCoreTargetFrameworkDataSource] public void RunTestsWithTestCaseFilter(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); Setup(); var sources = new List @@ -61,7 +61,7 @@ public void RunTestsWithTestCaseFilter(RunnerInfo runnerInfo) [NetCoreTargetFrameworkDataSource] public void RunTestsWithFastFilter(RunnerInfo runnerInfo) { - AcceptanceTestBase.SetTestEnvironment(_testEnvironment, runnerInfo); + SetTestEnvironment(_testEnvironment, runnerInfo); Setup(); var sources = new List diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Hosting/TestHostProviderManagerTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Hosting/TestHostProviderManagerTests.cs index 475b5b6a12..955c3fb259 100644 --- a/test/Microsoft.TestPlatform.Common.UnitTests/Hosting/TestHostProviderManagerTests.cs +++ b/test/Microsoft.TestPlatform.Common.UnitTests/Hosting/TestHostProviderManagerTests.cs @@ -196,12 +196,12 @@ public Task LaunchTestHostAsync(TestProcessStartInfo testHostStartInfo, Ca throw new NotImplementedException(); } - public void OnHostExited(HostProviderEventArgs e) + public void OnHostExited(HostProviderEventArgs _) { HostExited.Invoke(this, new HostProviderEventArgs("Error")); } - public void OnHostLaunched(HostProviderEventArgs e) + public void OnHostLaunched(HostProviderEventArgs _) { HostLaunched.Invoke(this, new HostProviderEventArgs("Error")); } @@ -264,12 +264,12 @@ public Task LaunchTestHostAsync(TestProcessStartInfo testHostStartInfo, Ca throw new NotImplementedException(); } - public void OnHostExited(HostProviderEventArgs e) + public void OnHostExited(HostProviderEventArgs _) { HostExited.Invoke(this, new HostProviderEventArgs("Error")); } - public void OnHostLaunched(HostProviderEventArgs e) + public void OnHostLaunched(HostProviderEventArgs _) { HostLaunched.Invoke(this, new HostProviderEventArgs("Error")); } diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/RunSettingsUtilitiesTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/RunSettingsUtilitiesTests.cs index bae6b0ceba..3d43bd56df 100644 --- a/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/RunSettingsUtilitiesTests.cs +++ b/test/Microsoft.TestPlatform.Common.UnitTests/Utilities/RunSettingsUtilitiesTests.cs @@ -111,5 +111,5 @@ public void Load(XmlReader reader) StringToVerify = reader.ReadOuterXml(); } - public static string StringToVerify = string.Empty; + public static string StringToVerify { get; private set; } = string.Empty; } diff --git a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs index db6fa58391..ee2e91f0dc 100644 --- a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs +++ b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs @@ -45,7 +45,7 @@ public class IntegrationTestBase private readonly string _xUnitTestAdapterRelativePath = @"xunit.runner.visualstudio\{0}\build\_common".Replace('\\', Path.DirectorySeparatorChar); private readonly string _chutzpahTestAdapterRelativePath = @"chutzpah\{0}\tools".Replace('\\', Path.DirectorySeparatorChar); - protected static readonly bool IsWindows = System.Environment.OSVersion.Platform.ToString().StartsWith("Win"); + protected static readonly bool IsWindows = Environment.OSVersion.Platform.ToString().StartsWith("Win"); public enum UnitTestFramework { @@ -365,8 +365,8 @@ public void ValidateDiscoveredTests(params string[] discoveredTestsList) var flag = _standardTestOutput.Contains(test) || _standardTestOutput.Contains(GetTestMethodName(test)); Assert.IsTrue(flag, $"Test {test} does not appear in discovered tests list." + - $"{System.Environment.NewLine}Std Output: {_standardTestOutput}" + - $"{System.Environment.NewLine}Std Error: { _standardTestError}"); + $"{Environment.NewLine}Std Output: {_standardTestOutput}" + + $"{Environment.NewLine}Std Error: { _standardTestError}"); } } @@ -381,8 +381,8 @@ public void ValidateTestsNotDiscovered(params string[] testsList) var flag = _standardTestOutput.Contains(test) || _standardTestOutput.Contains(GetTestMethodName(test)); Assert.IsFalse(flag, $"Test {test} should not appear in discovered tests list." + - $"{System.Environment.NewLine}Std Output: {_standardTestOutput}" + - $"{System.Environment.NewLine}Std Error: { _standardTestError}"); + $"{Environment.NewLine}Std Output: {_standardTestOutput}" + + $"{Environment.NewLine}Std Error: { _standardTestError}"); } } @@ -396,8 +396,8 @@ public void ValidateFullyQualifiedDiscoveredTests(string filePath, params string var flag = fileOutput.Contains(test) || fileOutput.Contains(GetTestMethodName(test)); Assert.IsTrue(flag, $"Test {test} does not appear in discovered tests list." + - $"{System.Environment.NewLine}Std Output: {_standardTestOutput}" + - $"{System.Environment.NewLine}Std Error: { _standardTestError}"); + $"{Environment.NewLine}Std Output: {_standardTestOutput}" + + $"{Environment.NewLine}Std Error: { _standardTestError}"); } } @@ -453,12 +453,12 @@ protected string GetTestAdapterPath(UnitTestFramework testFramework = UnitTestFr protected bool IsDesktopRunner() { - return _testEnvironment.RunnerFramework == IntegrationTestBase.DesktopRunnerFramework; + return _testEnvironment.RunnerFramework == DesktopRunnerFramework; } protected bool IsNetCoreRunner() { - return _testEnvironment.RunnerFramework == IntegrationTestBase.CoreRunnerFramework; + return _testEnvironment.RunnerFramework == CoreRunnerFramework; } /// diff --git a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs index 3f75454f0d..dc4fdbfdca 100644 --- a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs +++ b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestEnvironment.cs @@ -17,7 +17,7 @@ namespace Microsoft.TestPlatform.TestUtilities; /// public class IntegrationTestEnvironment { - public static string TestPlatformRootDirectory = + public static string TestPlatformRootDirectory { get; private set; } = Environment.GetEnvironmentVariable("TP_ROOT_DIR") ?? Path.GetFullPath(@"..\..\..\..\..".Replace('\\', Path.DirectorySeparatorChar)); diff --git a/test/Microsoft.TestPlatform.TestUtilities/PerfInstrumentation/PerfAnalyzer.cs b/test/Microsoft.TestPlatform.TestUtilities/PerfInstrumentation/PerfAnalyzer.cs index b610205851..5eab4275be 100644 --- a/test/Microsoft.TestPlatform.TestUtilities/PerfInstrumentation/PerfAnalyzer.cs +++ b/test/Microsoft.TestPlatform.TestUtilities/PerfInstrumentation/PerfAnalyzer.cs @@ -178,7 +178,7 @@ public long GetAdapterExecutedTests(string executorUri) if (key != null) { var task = _testPlatformTaskMap[key].Find(t => t.PayLoadProperties["executorUri"].Equals(executorUri)); - long.TryParse(task.PayLoadProperties["numberOfTests"], out totalTestsExecuted); + _ = long.TryParse(task.PayLoadProperties["numberOfTests"], out totalTestsExecuted); } #endif return totalTestsExecuted; diff --git a/test/TestAssets/AttachmentProcessorDataCollector/TestExtensionTypesAttribute.cs b/test/TestAssets/AttachmentProcessorDataCollector/TestExtensionTypesAttribute.cs index f103026253..b092e3f79e 100644 --- a/test/TestAssets/AttachmentProcessorDataCollector/TestExtensionTypesAttribute.cs +++ b/test/TestAssets/AttachmentProcessorDataCollector/TestExtensionTypesAttribute.cs @@ -32,7 +32,7 @@ internal sealed class TestExtensionTypesV2Attribute : Attribute public Type ExtensionImplementation { get; } public int Version { get; } - public TestExtensionTypesV2Attribute(string extensionType, string extensionIdentifier, Type extensionImplementation, int version, string unused = null) + public TestExtensionTypesV2Attribute(string extensionType, string extensionIdentifier, Type extensionImplementation, int version, string _ = null) { ExtensionType = extensionType; ExtensionIdentifier = extensionIdentifier; diff --git a/test/vstest.console.UnitTests/Processors/Utilities/ArgumentProcessorUtilitiesTests.cs b/test/vstest.console.UnitTests/Processors/Utilities/ArgumentProcessorUtilitiesTests.cs index 992de9f788..416391d56f 100644 --- a/test/vstest.console.UnitTests/Processors/Utilities/ArgumentProcessorUtilitiesTests.cs +++ b/test/vstest.console.UnitTests/Processors/Utilities/ArgumentProcessorUtilitiesTests.cs @@ -37,7 +37,7 @@ public void GetArgumentListShouldThrowErrorOnInvalidArgument(string argument) public void GetArgumentListShouldReturnCorrectArgumentList(string argument) { var argumentList = ArgumentProcessorUtilities.GetArgumentList(argument, ArgumentProcessorUtilities.SemiColonArgumentSeparator, "test exception."); - argumentList.SequenceEqual(new string[] { "abc.txt", "tracelevel=info", "newkey=newvalue" }); + Assert.IsTrue(argumentList.SequenceEqual(new string[] { "abc.txt", "tracelevel=info", "newkey=newvalue" })); } [TestMethod]