Merge remote-tracking branch 'refs/remotes/OpenCoverUI/master'

MITEK\mkoning · MITEK\mkoning · commit bab1013b773b · 2016-10-14T16:00:29.000+02:00
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
diff --git a/.nuget/NuGet.exe b/.nuget/NuGet.exe
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
diff --git a/OpenCover.UI.Framework/OpenCover.UI.Framework.csproj b/OpenCover.UI.Framework/OpenCover.UI.Framework.csproj
@@ -76,13 +76,6 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/OpenCover.UI.TestDiscoverer.TestResources/MSTest/TestFixtureWithTraits.cs b/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()
+        {
+
+        }
+    }
+}
diff --git a/OpenCover.UI.TestDiscoverer.TestResources/OpenCover.UI.TestDiscoverer.TestResources.csproj b/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" />
@@ -86,13 +87,6 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/OpenCover.UI.TestDiscoverer.Tests/DiscovererTestsBase.cs b/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);
+            }
         }
+
     }
 }
diff --git a/OpenCover.UI.TestDiscoverer.Tests/MSTest/MSTestDiscovererTests.cs b/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);
+        }
     }
 }
diff --git a/OpenCover.UI.TestDiscoverer.Tests/OpenCover.UI.TestDiscoverer.Tests.csproj b/OpenCover.UI.TestDiscoverer.Tests/OpenCover.UI.TestDiscoverer.Tests.csproj
@@ -88,13 +88,6 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/OpenCover.UI.TestDiscoverer/OpenCover.UI.TestDiscoverer.csproj b/OpenCover.UI.TestDiscoverer/OpenCover.UI.TestDiscoverer.csproj
@@ -82,13 +82,6 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/OpenCover.UI.Tests/OpenCover.UI.Tests.csproj b/OpenCover.UI.Tests/OpenCover.UI.Tests.csproj
@@ -86,13 +86,6 @@
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/OpenCover.UI/Glyphs/LineCoverageGlyphFactory.cs b/OpenCover.UI/Glyphs/LineCoverageGlyphFactory.cs
@@ -28,8 +28,7 @@ public class LineCoverageGlyphFactory : TextViewCoverageProviderBase, IGlyphFact
     {
         const double _glyphSize = 12.0;
         
-        //private static Brush _redBrush = new SolidColorBrush(Color.FromRgb(196, 64, 47));
-        private static Brush _redBrush = new LinearGradientBrush(Color.FromArgb(255,196, 64, 47),Color.FromArgb(50,196,64,47),0);
+        private static Brush _redBrush = new SolidColorBrush(Color.FromRgb(196, 64, 47));
         private static Brush _greenBrush = new SolidColorBrush(Color.FromRgb(88, 196, 84));
         private static Brush _orangeBrush = new SolidColorBrush(Color.FromRgb(196, 136, 41));
 
diff --git a/OpenCover.UI/OpenCover.UI.csproj b/OpenCover.UI/OpenCover.UI.csproj
@@ -377,13 +377,6 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,6 +4,8 @@ configuration: Release
 shallow_clone: true
 environment:
   DeployExtension: false
+before_build:
+- nuget restore
 build:
   project: OpenCover.UI.sln
   parallel: true
@@ -17,3 +19,6 @@ notifications:
   on_build_success: true
   on_build_failure: true
   on_build_status_changed: true
+test:
+  assemblies:
+    - '**\*.Tests.dll'

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ namespace OpenCover.UI.TestDiscoverer.Tests`
`10`	`10`	`[TestFixture]`
`11`	`11`	`abstract class DiscovererTestsBase`
`12`	`12`	`{`
`13`		`- protected void AssertDiscoveredMethod(Type testFixtureInAssemblyToDiscoverTestsIn, string expectedNameOfFirstTestMethod, TestType frameworkType)`
	`13`	`+ protected void AssertDiscoveredMethod(Type testFixtureInAssemblyToDiscoverTestsIn,`
	`14`	`+ string expectedNameOfFirstTestMethod, TestType frameworkType, string[] expectedTraits = null)`
`14`	`15`	`{`
`15`	`16`	`// Arrange`
`16`	`17`	`var discoverer = new Discoverer(new List<string> { testFixtureInAssemblyToDiscoverTestsIn.Assembly.Location });`
`@@ -30,6 +31,12 @@ protected void AssertDiscoveredMethod(Type testFixtureInAssemblyToDiscoverTestsI`
`30`	`31`	`var discoveredMethod = discoveredTestClass.TestMethods`
`31`	`32`	`.FirstOrDefault(x => x.Name == expectedNameOfFirstTestMethod);`
`32`	`33`	`discoveredMethod.Should().NotBeNull();`
	`34`	`+`
	`35`	`+ if (expectedTraits != null)`
	`36`	`+ {`
	`37`	`+ discoveredMethod.Traits.ShouldAllBeEquivalentTo(expectedTraits);`
	`38`	`+ }`
`33`	`39`	`}`
	`40`	`+`
`34`	`41`	`}`
`35`	`42`	`}`