Fixed up stylecop issues

Osiris.Extended.ruleset

@@ -55,5 +55,6 @@
     <Rule Id="SA1623" Action="None" />
     <Rule Id="SA1633" Action="None" />
     <Rule Id="SA1649" Action="None" />
+    <Rule Id="SA0001" Action="None" />
   </Rules>
 </RuleSet>

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)
         {

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;

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("<notestsfound/>");
 
@@ -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);

src/NUnitTestAdapter/TestConverter.cs

@@ -154,6 +154,7 @@ public struct TestResultSet
         #endregion
 
         #region Helper Methods
+
         /// <summary>
         /// 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<XmlNode> 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);
         }
 
         /// <summary>
@@ -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)

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()
         {

src/NUnitTestAdapterTests/Fakes/FakeRunSettings.cs

@@ -64,5 +64,4 @@ public FakeRunSettingsForWhere(string where)
         }
         public override string SettingsXml => $"<RunSettings><NUnit><Where>{_where}</Where></NUnit></RunSettings>";
     }
-
 }

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<ITestFilterBuilder>();
             filterService.GetTestFilterBuilder().Returns(testFilterBuilder);
             sut.FilterByWhere(where);
-            testFilterBuilder.Received().SelectWhere(Arg.Is<string>(x=>x==where));
+            testFilterBuilder.Received().SelectWhere(Arg.Is<string>(x => x == where));
         }
     }
 }

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));

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")]