diff --git a/Osiris.Extended.ruleset b/Osiris.Extended.ruleset index 85ad4988..baf0aa7c 100644 --- a/Osiris.Extended.ruleset +++ b/Osiris.Extended.ruleset @@ -55,5 +55,6 @@ + \ No newline at end of file diff --git a/src/NUnit.TestAdapter.Tests.Acceptance/TestSourceWithCustomNames.cs b/src/NUnit.TestAdapter.Tests.Acceptance/TestSourceWithCustomNames.cs index 6ce6b517..08cbb118 100644 --- a/src/NUnit.TestAdapter.Tests.Acceptance/TestSourceWithCustomNames.cs +++ b/src/NUnit.TestAdapter.Tests.Acceptance/TestSourceWithCustomNames.cs @@ -83,7 +83,7 @@ public class Case } [Test] - [TestCase("net48")] //test code requires ValueTuple support, so can't got to net35 + [TestCase("net48")] // test code requires ValueTuple support, so can't got to net35 [TestCase("netcoreapp2.1")] public static void Single_target_csproj(string targetFramework) { diff --git a/src/NUnitTestAdapter/AdapterSettings.cs b/src/NUnitTestAdapter/AdapterSettings.cs index 2a0fa706..60b63c9b 100644 --- a/src/NUnitTestAdapter/AdapterSettings.cs +++ b/src/NUnitTestAdapter/AdapterSettings.cs @@ -106,7 +106,7 @@ public enum VsTestCategoryType public class AdapterSettings : IAdapterSettings { private const string RANDOM_SEED_FILE = "nunit_random_seed.tmp"; - private TestLogger _logger; + private readonly TestLogger _logger; #region Constructor @@ -191,8 +191,8 @@ public AdapterSettings(TestLogger logger) public string DomainUsage { get; private set; } public bool ShowInternalProperties { get; private set; } - public bool UseParentFQNForParametrizedTests { get; private set; } // Default is false. True can fix certain test name patterns, but may have side effects. - public bool UseNUnitIdforTestCaseId { get; private set; } // default is false. + public bool UseParentFQNForParametrizedTests { get; private set; } // Default is false. True can fix certain test name patterns, but may have side effects. + public bool UseNUnitIdforTestCaseId { get; private set; } // default is false. public VsTestCategoryType VsTestCategoryType { get; private set; } = VsTestCategoryType.NUnit; diff --git a/src/NUnitTestAdapter/NUnitTestFilterBuilder.cs b/src/NUnitTestAdapter/NUnitTestFilterBuilder.cs index fb623cbd..7164b973 100644 --- a/src/NUnitTestAdapter/NUnitTestFilterBuilder.cs +++ b/src/NUnitTestAdapter/NUnitTestFilterBuilder.cs @@ -30,7 +30,7 @@ namespace NUnit.VisualStudio.TestAdapter { public class NUnitTestFilterBuilder { - private ITestFilterService _filterService; + private readonly ITestFilterService _filterService; public static readonly TestFilter NoTestsFound = new TestFilter(""); @@ -43,13 +43,13 @@ public TestFilter ConvertTfsFilterToNUnitFilter(ITfsTestFilter tfsFilter, IList< { var filteredTestCases = tfsFilter.CheckFilter(loadedTestCases); var testCases = filteredTestCases as TestCase[] ?? filteredTestCases.ToArray(); - //TestLog.Info(string.Format("TFS Filter detected: LoadedTestCases {0}, Filtered Test Cases {1}", loadedTestCases.Count, testCases.Count())); + // TestLog.Info(string.Format("TFS Filter detected: LoadedTestCases {0}, Filtered Test Cases {1}", loadedTestCases.Count, testCases.Count())); return testCases.Any() ? FilterByList(testCases) : NoTestsFound; } public TestFilter FilterByWhere(string where) { - if (string.IsNullOrEmpty(where)) + if (string.IsNullOrEmpty(where)) return TestFilter.Empty; var filterBuilder = _filterService.GetTestFilterBuilder(); filterBuilder.SelectWhere(where); diff --git a/src/NUnitTestAdapter/TestConverter.cs b/src/NUnitTestAdapter/TestConverter.cs index 727215d5..f707700e 100644 --- a/src/NUnitTestAdapter/TestConverter.cs +++ b/src/NUnitTestAdapter/TestConverter.cs @@ -154,6 +154,7 @@ public struct TestResultSet #endregion #region Helper Methods + /// /// Makes a TestCase from an NUnit test, adding /// navigation data if it can be found. @@ -189,10 +190,9 @@ private TestCase MakeTestCaseFromXmlNode(XmlNode testNode) { fullyQualifiedName = parameterizedTestFullName; } - } } - + var testCase = new TestCase( fullyQualifiedName, new Uri(NUnitTestAdapter.ExecutorUri), @@ -305,8 +305,9 @@ private static void FillResultFromOutputNodes(IEnumerable outputNodes, : TestResultMessage.StandardOutCategory, output.InnerText)); } - bool IsErrorStream(string stream) => "error".Equals(stream, StringComparison.OrdinalIgnoreCase); - bool IsProgressStream(string stream) => "progress".Equals(stream, StringComparison.OrdinalIgnoreCase); + static bool IsErrorStream(string stream) => "error".Equals(stream, StringComparison.OrdinalIgnoreCase); + + static bool IsProgressStream(string stream) => "progress".Equals(stream, StringComparison.OrdinalIgnoreCase); } /// @@ -353,21 +354,16 @@ private AttachmentSet ParseAttachments(XmlNode resultNode) // Public for testing public static TestOutcome GetTestOutcome(XmlNode resultNode) { - switch (resultNode.GetAttribute("result")) + return resultNode.GetAttribute("result") switch { - case "Passed": - return TestOutcome.Passed; - case "Failed": - return TestOutcome.Failed; - case "Skipped": - return resultNode.GetAttribute("label") == "Ignored" - ? TestOutcome.Skipped - : TestOutcome.None; - case "Warning": - return TestOutcome.Skipped; - default: - return TestOutcome.None; - } + "Passed" => TestOutcome.Passed, + "Failed" => TestOutcome.Failed, + "Skipped" => resultNode.GetAttribute("label") == "Ignored" +? TestOutcome.Skipped +: TestOutcome.None, + "Warning" => TestOutcome.Skipped, + _ => TestOutcome.None, + }; } TestOutcome GetAssertionOutcome(XmlNode assertion) diff --git a/src/NUnitTestAdapterTests/AdapterSettingsTests.cs b/src/NUnitTestAdapterTests/AdapterSettingsTests.cs index 49d5037e..979c45fa 100644 --- a/src/NUnitTestAdapterTests/AdapterSettingsTests.cs +++ b/src/NUnitTestAdapterTests/AdapterSettingsTests.cs @@ -365,7 +365,7 @@ public void LiveUnitTestingDataCollector() Assert.That(_settings.NumberOfTestWorkers, Is.Zero); Assert.True(_settings.InProcDataCollectorsAvailable); } - + [Test] public void WhereCanBeSet() { diff --git a/src/NUnitTestAdapterTests/Fakes/FakeRunSettings.cs b/src/NUnitTestAdapterTests/Fakes/FakeRunSettings.cs index d46c5481..e9c23396 100644 --- a/src/NUnitTestAdapterTests/Fakes/FakeRunSettings.cs +++ b/src/NUnitTestAdapterTests/Fakes/FakeRunSettings.cs @@ -64,5 +64,4 @@ public FakeRunSettingsForWhere(string where) } public override string SettingsXml => $"{_where}"; } - } diff --git a/src/NUnitTestAdapterTests/Filtering/NUnitTestFilterBuilderTests.cs b/src/NUnitTestAdapterTests/Filtering/NUnitTestFilterBuilderTests.cs index 41bc6865..67b44736 100644 --- a/src/NUnitTestAdapterTests/Filtering/NUnitTestFilterBuilderTests.cs +++ b/src/NUnitTestAdapterTests/Filtering/NUnitTestFilterBuilderTests.cs @@ -21,12 +21,11 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // *********************************************************************** - using System.Collections.Generic; -using NUnit.Framework; +using Microsoft.VisualStudio.TestPlatform.ObjectModel; using NSubstitute; using NUnit.Engine; -using Microsoft.VisualStudio.TestPlatform.ObjectModel; +using NUnit.Framework; namespace NUnit.VisualStudio.TestAdapter.Tests.Filtering { @@ -52,7 +51,7 @@ public void ThatWhereFilterIsAdded() var testFilterBuilder = Substitute.For(); filterService.GetTestFilterBuilder().Returns(testFilterBuilder); sut.FilterByWhere(where); - testFilterBuilder.Received().SelectWhere(Arg.Is(x=>x==where)); + testFilterBuilder.Received().SelectWhere(Arg.Is(x => x == where)); } } } diff --git a/src/NUnitTestAdapterTests/TestDiscoveryTests.cs b/src/NUnitTestAdapterTests/TestDiscoveryTests.cs index 39eafa27..d4715981 100644 --- a/src/NUnitTestAdapterTests/TestDiscoveryTests.cs +++ b/src/NUnitTestAdapterTests/TestDiscoveryTests.cs @@ -90,8 +90,8 @@ public void VerifyTestCaseCount() [TestCase("MockTest3", "NUnit.Tests.Assemblies.MockTestFixture.MockTest3")] [TestCase("MockTest4", "NUnit.Tests.Assemblies.MockTestFixture.MockTest4")] [TestCase("ExplicitlyRunTest", "NUnit.Tests.Assemblies.MockTestFixture.ExplicitlyRunTest")] - [TestCase("MethodWithParameters(9,11)", "NUnit.Tests.FixtureWithTestCases.MethodWithParameters",true)] - public void VerifyTestCaseIsFound(string name, string fullName,bool parentFQN = false) + [TestCase("MethodWithParameters(9,11)", "NUnit.Tests.FixtureWithTestCases.MethodWithParameters", true)] + public void VerifyTestCaseIsFound(string name, string fullName, bool parentFQN = false) { var testCase = testCases.Find(tc => tc.DisplayName == name); Assert.That(testCase.FullyQualifiedName, Is.EqualTo(fullName)); diff --git a/src/NUnitTestAdapterTests/TestExecutionTests.cs b/src/NUnitTestAdapterTests/TestExecutionTests.cs index e7be8371..40888cd4 100644 --- a/src/NUnitTestAdapterTests/TestExecutionTests.cs +++ b/src/NUnitTestAdapterTests/TestExecutionTests.cs @@ -65,11 +65,11 @@ private int GetCount(TestOutcome outcome) [Category("TestExecution")] public class TestFilteringTests { - private string MockAssemblyPath; + private string mockAssemblyPath; [OneTimeSetUp] public void LoadMockassembly() { - MockAssemblyPath = Path.Combine(TestContext.CurrentContext.TestDirectory, "mock-assembly.dll"); + mockAssemblyPath = Path.Combine(TestContext.CurrentContext.TestDirectory, "mock-assembly.dll"); // Sanity check to be sure we have the correct version of mock-assembly.dll Assert.That(MockAssembly.TestsAtRuntime, Is.EqualTo(MockAssembly.Tests), @@ -95,14 +95,12 @@ public void TestsWhereShouldFilter(string filter, int expectedCount) var fakeFramework = new FakeFrameworkHandle(); var executor = TestAdapterUtils.CreateExecutor(); - executor.RunTests(new[] { MockAssemblyPath }, context, fakeFramework); + executor.RunTests(new[] { mockAssemblyPath }, context, fakeFramework); var completedRuns = fakeFramework.Events.Where(e => e.EventType == FakeFrameworkHandle.EventType.RecordEnd); Assert.That(completedRuns, Has.Exactly(expectedCount).Items); - } - } [Category("TestExecution")]