Added mstest checks for trait discovery

OpenCover.UI.TestDiscoverer.TestResources/MSTest/TestFixtureWithTraits.cs

@@ -0,0 +1,27 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace OpenCover.UI.TestDiscoverer.TestResources.MSTest
+{
+    [TestClass]
+    public class TestFixtureWithTraits
+    {
+        [TestMethod]
+        [TestCategory("Category_TestMethod_TestFixtureWithTraits")]
+        public void TestMethod_TestFixtureWithTraits()
+        {
+
+        }
+    }
+
+    [TestClass]
+    public class TestFixtureInheritingTraitMethods : TestFixtureWithTraits
+    {
+        [TestMethod]
+        [TestCategory("Category_TestMethod_TestFixtureInheritingTraitMethods_1")]
+        [TestCategory("Category_TestMethod_TestFixtureInheritingTraitMethods_2")]
+        public void TestMethod_TestFixtureInheritingTraitMethods()
+        {
+
+        }
+    }
+}

OpenCover.UI.TestDiscoverer.TestResources/OpenCover.UI.TestDiscoverer.TestResources.csproj

@@ -68,6 +68,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MSTest\RegularTestFixture.cs" />
+    <Compile Include="MSTest\TestFixtureWithTraits.cs" />
     <Compile Include="NUnit\TestFixtureWithNestedTestClasses.cs" />
     <Compile Include="NUnit\TestFixtureWithoutExplicitTextFixtureAttribute.cs" />
     <Compile Include="NUnit\RegularTestFixture.cs" />

OpenCover.UI.TestDiscoverer.Tests/DiscovererTestsBase.cs

@@ -10,7 +10,8 @@ namespace OpenCover.UI.TestDiscoverer.Tests
     [TestFixture]
     abstract class DiscovererTestsBase
     {
-        protected void AssertDiscoveredMethod(Type testFixtureInAssemblyToDiscoverTestsIn, string expectedNameOfFirstTestMethod, TestType frameworkType)
+        protected void AssertDiscoveredMethod(Type testFixtureInAssemblyToDiscoverTestsIn,
+            string expectedNameOfFirstTestMethod, TestType frameworkType, string[] expectedTraits = null)
         {
             // Arrange
             var discoverer = new Discoverer(new List<string> { testFixtureInAssemblyToDiscoverTestsIn.Assembly.Location });
@@ -30,6 +31,12 @@ protected void AssertDiscoveredMethod(Type testFixtureInAssemblyToDiscoverTestsI
             var discoveredMethod = discoveredTestClass.TestMethods
                 .FirstOrDefault(x => x.Name == expectedNameOfFirstTestMethod);
             discoveredMethod.Should().NotBeNull();
+
+            if (expectedTraits != null)
+            {
+                discoveredMethod.Traits.ShouldAllBeEquivalentTo(expectedTraits);
+            }
         }
+
     }
 }

OpenCover.UI.TestDiscoverer.Tests/MSTest/MSTestDiscovererTests.cs

@@ -21,5 +21,25 @@ public void Discover_Finds_Sub_Test_Fixtures_And_Methods(Type testFixtureInAssem
             AssertDiscoveredMethod(testFixtureInAssemblyToDiscoverTestsIn, expectedNameOfFirstTestMethod, TestType.MSTest);
         }
 
+        [Ignore("MsTest Discoverer doesn't find base class methods yet"), 
+            TestCase(typeof(TestFixtureInheritingTraitMethods), 
+            "TestMethod_TestFixtureWithTraits", 
+            new[] { "Category_TestMethod_TestFixtureWithTraits" })]
+        public void Discover_Finds_Inherited_Fixtures_And_Methods_With_Traits(Type testFixtureInAssemblyToDiscoverTestsIn, string expectedNameOfFirstTestMethod, string[] expectedTraits)
+        {
+            AssertDiscoveredMethod(testFixtureInAssemblyToDiscoverTestsIn, expectedNameOfFirstTestMethod, TestType.MSTest, expectedTraits);
+        }
+
+        [TestCase(typeof(TestFixtureWithTraits), 
+            "TestMethod_TestFixtureWithTraits", 
+            new[] { "Category_TestMethod_TestFixtureWithTraits" })]
+        [TestCase(typeof(TestFixtureInheritingTraitMethods), 
+            "TestMethod_TestFixtureInheritingTraitMethods", 
+            new[] { "Category_TestMethod_TestFixtureInheritingTraitMethods_1",
+                    "Category_TestMethod_TestFixtureInheritingTraitMethods_2" })]
+        public void Discover_Finds_Fixtures_And_Methods_With_Traits(Type testFixtureInAssemblyToDiscoverTestsIn, string expectedNameOfFirstTestMethod, string[] expectedTraits)
+        {
+            AssertDiscoveredMethod(testFixtureInAssemblyToDiscoverTestsIn, expectedNameOfFirstTestMethod, TestType.MSTest, expectedTraits);
+        }
     }
 }